Merge branch 'Development' into master

2024-03-19 09:46:08 +07:00 · 2024-03-19 09:46:08 +07:00 · 0dd12b717d
commit 0dd12b717d
parent 5b0e782efd d7d6709944
12 changed files with 364 additions and 216 deletions
--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@ -26,6 +26,7 @@ CREATE TABLE `tbl_customers` (
  `address` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
  `phonenumber` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0',
  `email` varchar(128) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1',
+  `coordinates` VARCHAR(50) NOT NULL DEFAULT '6.465422, 3.406448' COMMENT 'Latitude and Longitude coordinates',
  `balance` decimal(15,2) NOT NULL DEFAULT '0.00' COMMENT 'For Money Deposit',
  `service_type` ENUM('Hotspot','PPPoE','Others') DEFAULT 'Others' COMMENT 'For selecting user type',
  `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type',
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@ -330,6 +330,7 @@ switch ($action) {
        $phonenumber = _post('phonenumber');
        $service_type = _post('service_type');
        $account_type = _post('account_type');
+        $coordinates = _post('coordinates');
        //post Customers Attributes
        $custom_field_names = (array) $_POST['custom_field_name'];
        $custom_field_values = (array) $_POST['custom_field_value'];
@ -363,6 +364,7 @@ switch ($action) {
            $d->created_by = $admin['id'];
            $d->phonenumber = Lang::phoneFormat($phonenumber);
            $d->service_type = $service_type;
+            $d->coordinates = $coordinates;
            $d->save();

            // Retrieve the customer ID of the newly created customer
@ -399,6 +401,7 @@ switch ($action) {
        $address = _post('address');
        $phonenumber = Lang::phoneFormat(_post('phonenumber'));
        $service_type = _post('service_type');
+        $coordinates = _post('coordinates');
        run_hook('edit_customer'); #HOOK
        $msg = '';
        if (Validator::Length($username, 35, 2) == false) {
@ -459,6 +462,7 @@ switch ($action) {
            $d->address = $address;
            $d->phonenumber = $phonenumber;
            $d->service_type = $service_type;
+            $d->coordinates = $coordinates;
            $d->save();


--- a/system/controllers/map.php
+++ b/system/controllers/map.php
@ -0,0 +1,45 @@
+<?php
+
+/**
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ * by https://t.me/ibnux
+ **/
+
+ _admin();
+$ui->assign('_system_menu', 'map');
+
+$action = $routes['1'];
+$ui->assign('_admin', $admin);
+
+if (empty($action)) {
+    $action = 'customer';
+}
+
+switch ($action) {
+    case 'customer':
+
+        $c = ORM::for_table('tbl_customers')->find_many();
+        $customerData = [];
+
+        foreach ($c as $customer) {
+            $customerData[] = [
+                'id' => $customer->id,
+                'name' => $customer->fullname,
+                'balance' => $customer->balance,
+                'address' => $customer->address,
+                'info' => Lang::T("Username") . ": " . $customer->username .  " - "  . Lang::T("Full Name") . ": " . $customer->fullname . " - "  . Lang::T("Email") . ": " . $customer->email . " - "  . Lang::T("Phone") . ": " . $customer->phonenumber . " - "  . Lang::T("Service Type") . ": " . $customer->service_type,
+                'coordinates' => '[' . $customer->coordinates . ']',
+            ];
+        }
+
+        $ui->assign('customers', $customerData);
+        $ui->assign('xheader', '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">');
+        $ui->assign('_title', Lang::T('Customer Geo Location Information'));
+        $ui->assign('xfooter', '<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>');
+        $ui->display('map-customer.tpl');
+        break;
+
+    default:
+        r2(U . 'map/customer', 'e', 'action not defined');
+        break;
+}
--- a/system/controllers/message.php
+++ b/system/controllers/message.php
@ -40,8 +40,11 @@ document.addEventListener("DOMContentLoaded", function(event) {
 });
 </script>
 EOT;
-        $c = ORM::for_table('tbl_customers')->find_many();
-        $ui->assign('c', $c);
+        if (isset($routes['2']) && !empty($routes['2'])) {
+            $ui->assign('cust', ORM::for_table('tbl_customers')->find_one($routes['2']));
+        }
+        $id = $routes['2'];
+        $ui->assign('id', $id);
        $ui->assign('xfooter', $select2_customer);
        $ui->display('message.tpl');
        break;
--- a/system/updates.json
+++ b/system/updates.json
@ -78,5 +78,10 @@
    ],
    "2024.3.14" : [
        "ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;"
+    ],
+    "2024.3.19" : [
+        "ALTER TABLE `tbl_customers` ADD `coordinates` VARCHAR(50) NOT NULL DEFAULT '6.465422, 3.406448' COMMENT 'Latitude and Longitude coordinates' AFTER `email`;"
    ]
+    
+   
 }
--- a/ui/ui/customers-add.tpl
+++ b/ui/ui/customers-add.tpl
@ -51,8 +51,9 @@
                    <div class="form-group">
                        <label class="col-md-3 control-label">{Lang::T('Password')}</label>
                        <div class="col-md-9">
-                            <input type="password" class="form-control" autocomplete="off" required id="password" value="{rand(000000,999999)}"
-                                name="password" onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
+                            <input type="password" class="form-control" autocomplete="off" required id="password"
+                                value="{rand(000000,999999)}" name="password" onmouseleave="this.type = 'password'"
+                                onmouseenter="this.type = 'text'">
                        </div>
                    </div>
                    <div class="form-group">
@ -72,6 +73,17 @@
                            <textarea name="address" id="address" class="form-control"></textarea>
                        </div>
                    </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
+                        <div class="col-md-9">
+                            <input name="coordinates" id="coordinates" class="form-control" value=""
+                                placeholder="6.465422, 3.406448">
+                            <span class="help-block">
+                                <small>{Lang::T('Latitude and Longitude coordinates for map must be separate with comma
+                                    ","')}</small>
+                            </span>
+                        </div>
+                    </div>
                    <div class="form-group">
                        <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
                        <div class="col-md-9">
@ -120,12 +132,12 @@
    </center>
 </form>
 {literal}
-    <script type="text/javascript">
-        document.addEventListener("DOMContentLoaded", function() {
+<script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function () {
        var customFieldsContainer = document.getElementById('custom-fields-container');
        var addCustomFieldButton = document.getElementById('add-custom-field');

-            addCustomFieldButton.addEventListener('click', function() {
+        addCustomFieldButton.addEventListener('click', function () {
            var fieldIndex = customFieldsContainer.children.length;
            var newField = document.createElement('div');
            newField.className = 'form-group';
@ -143,14 +155,14 @@
            customFieldsContainer.appendChild(newField);
        });

-            customFieldsContainer.addEventListener('click', function(event) {
+        customFieldsContainer.addEventListener('click', function (event) {
            if (event.target.classList.contains('remove-custom-field')) {
                var fieldContainer = event.target.parentNode.parentNode;
                fieldContainer.parentNode.removeChild(fieldContainer);
            }
        });
    });
-    </script>
+</script>
 {/literal}


--- a/ui/ui/customers-edit.tpl
+++ b/ui/ui/customers-edit.tpl
@ -77,6 +77,16 @@
                            <textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
                        </div>
                    </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Coordinates')}</label>
+                        <div class="col-md-9">
+                            <input name="coordinates" id="coordinates" class="form-control" value="{$d['coordinates']}">
+                            <span class="help-block">
+                                <small>{Lang::T('Latitude and Longitude coordinates for map must be separate with comma
+                                    ","')}</small>
+                            </span>
+                        </div>
+                    </div>
                    <div class="form-group">
                        <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
                        <div class="col-md-9">
@ -117,7 +127,8 @@
                                id="{$customField.field_name}" value="{$customField.field_value}">
                        </div>
                        <label class="col-md-2">
-                                <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}"> Delete
+                            <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}">
+                            Delete
                        </label>
                    </div>
                    {/foreach}
@ -144,12 +155,12 @@
 </form>

 {literal}
-    <script type="text/javascript">
-        document.addEventListener("DOMContentLoaded", function() {
+<script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function () {
        var customFieldsContainer = document.getElementById('custom-fields-container');
        var addCustomFieldButton = document.getElementById('add-custom-field');

-            addCustomFieldButton.addEventListener('click', function() {
+        addCustomFieldButton.addEventListener('click', function () {
            var fieldIndex = customFieldsContainer.children.length;
            var newField = document.createElement('div');
            newField.className = 'form-group';
@ -167,14 +178,14 @@
            customFieldsContainer.appendChild(newField);
        });

-            customFieldsContainer.addEventListener('click', function(event) {
+        customFieldsContainer.addEventListener('click', function (event) {
            if (event.target.classList.contains('remove-custom-field')) {
                var fieldContainer = event.target.parentNode.parentNode;
                fieldContainer.parentNode.removeChild(fieldContainer);
            }
        });
    });
-    </script>
+</script>
 {/literal}

 {include file="sections/footer.tpl"}
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@ -37,6 +37,9 @@
                            onclick="this.select()">
                    </li>
                    {/if}
+                    <li class="list-group-item">
+                        <b>{Lang::T('Coordinates')}</b> <span class="pull-right">{Lang::T($d['coordinates'])}</span>
+                    </li>
                    <!--Customers Attributes view start -->
                    {if $customFields}
                    {foreach $customFields as $customField}
@ -104,7 +107,8 @@
                            class="pull-right">{Lang::dateAndTimeFormat($package['recharged_on'],$package['recharged_time'])}</span>
                    </li>
                    <li class="list-group-item">
-                        {Lang::T('Expires On')} <span class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
+                        {Lang::T('Expires On')} <span
+                            class="pull-right">{Lang::dateAndTimeFormat($package['expiration'],
                            $package['time'])}</span>
                    </li>
                    <li class="list-group-item">
@ -129,11 +133,15 @@
            <div class="col-xs-4">
                <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block">{Lang::T('Back')}</a>
            </div>
-            <div class="col-xs-8">
+            <div class="col-xs-4">
                <a href="{$_url}customers/sync/{$d['id']}"
                    onclick="return confirm('This will sync Customer to Mikrotik?')"
                    class="btn btn-info btn-sm btn-block">{Lang::T('Sync')}</a>
            </div>
+            <div class="col-xs-4">
+                <a href="{$_url}message/send/{$d['id']}" class="btn btn-success btn-sm btn-block">{Lang::T('Send
+                    Message')}</a>
+            </div>
        </div>
    </div>
    <div class="col-sm-8 col-md-8">
--- a/ui/ui/map-customer.tpl
+++ b/ui/ui/map-customer.tpl
@ -0,0 +1,46 @@
+{include file="sections/header.tpl"}
+
+<!-- Map container div -->
+<div id="map" style="width: 800px; height: 600px; margin: 20px auto"></div>
+
+{literal}
+<script>
+    window.onload = function() {
+        var map = L.map('map').setView([51.505, -0.09], 13);
+        var group = L.featureGroup().addTo(map);
+        
+        var customers = {/literal}{$customers|json_encode}{literal};
+
+        L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+            subdomains: 'abcd',
+            maxZoom: 20
+        }).addTo(map);
+
+        customers.forEach(function(customer) {
+            var name = customer.id;
+            var name = customer.name;
+            var info = customer.info;
+            var coordinates = customer.coordinates;
+            var balance = customer.balance;
+            var address = customer.address;
+
+            // Create a popup for the marker
+            var popupContent = "<strong>Customer Name</strong>: " + name + "<br>" +
+                               "<strong>Customer Info</strong>: " + info + "<br>" +
+                               "<strong>Customer Balance</strong>: " + balance + "<br>" +
+                               "<strong>Address</strong>: " + address + "<br>" +
+                               "<strong>Coordinates</strong>: " + coordinates + "<br>" +
+                               "<a href='{$_url}customers/view/"+ customer.id +"'>More Info</a><br>";
+
+            // Add marker to map
+            var marker = L.marker(JSON.parse(coordinates)).addTo(group);
+            marker.bindTooltip(name).bindPopup(popupContent);
+        });
+
+        map.fitBounds(group.getBounds());
+    }
+</script>
+{/literal}
+
+{include file="sections/footer.tpl"}
--- a/ui/ui/message-bulk.tpl
+++ b/ui/ui/message-bulk.tpl
@ -35,13 +35,13 @@
 						<p class="help-block col-md-4">
 							{Lang::T('Use placeholders:')}
 							<br>
-							<b>{Lang::T('[[name]]')}</b> - {Lang::T('Customer Name')}
+							<b>[[name]]</b> - {Lang::T('Customer Name')}
 							<br>
-							<b>{Lang::T('[[user_name]]')}</b> - {Lang::T('Customer Username')}
+							<b>[[user_name]]</b> - {Lang::T('Customer Username')}
 							<br>
-							<b>{Lang::T('[[phone]]')}</b> - {Lang::T('Customer Phone')}
+							<b>[[phone]]</b> - {Lang::T('Customer Phone')}
 							<br>
-							<b>{Lang::T('[[company_name]]')}</b> - {Lang::T('Your Company Name')}
+							<b>[[company_name]]</b> - {Lang::T('Your Company Name')}
 						</p>
 					</div>
 				
--- a/ui/ui/message.tpl
+++ b/ui/ui/message.tpl
@ -1,23 +1,21 @@
 {include file="sections/header.tpl"}

-		<div class="row">
+<div class="row">
 	<div class="col-sm-12 col-md-12">
 		<div class="panel panel-primary panel-hovered panel-stacked mb30">
 			<div class="panel-heading">{Lang::T('Send Personal Message')}</div>
 			<div class="panel-body">
-						<form class="form-horizontal" method="post" role="form" action="{$_url}message/send-post" >
+				<form class="form-horizontal" method="post" role="form" action="{$_url}message/send-post">
 					<div class="form-group">
 						<label class="col-md-2 control-label">{Lang::T('Customer')}</label>
 						<div class="col-md-6">
-									<select id="personSelect" class="form-control select2" name="id_customer" style="width: 100%" data-placeholder="Select a customer...">
-									<option></option>
-										{foreach $c as $cs}
-											{if $id eq $cs['id']}
-												<option value="{$cs['id']}" selected>{$cs['username']}</option>
-											{else}
-												<option value="{$cs['id']}">{$cs['username']}</option>
+							<select {if $cust}{else}id="personSelect" {/if} class="form-control select2"
+								name="id_customer" style="width: 100%"
+								data-placeholder="{Lang::T('Select a customer')}...">
+								{if $cust}
+								<option value="{$cust['id']}">{$cust['username']} &bull; {$cust['fullname']} &bull;
+									{$cust['email']}</option>
 								{/if}
-										{/foreach}
 							</select>
 						</div>
 					</div>
@ -34,18 +32,19 @@
 					<div class="form-group">
 						<label class="col-md-2 control-label">{Lang::T('Message')}</label>
 						<div class="col-md-6">
-									<textarea class="form-control" id="message" name="message" placeholder="{Lang::T('Compose your message...')}" rows="5"></textarea>
+							<textarea class="form-control" id="message" name="message"
+								placeholder="{Lang::T('Compose your message...')}" rows="5"></textarea>
 						</div>
 						<p class="help-block col-md-4">
 							{Lang::T('Use placeholders:')}
 							<br>
-									<b>{Lang::T('[[name]]')}</b> - {Lang::T('Customer Name')}
+							<b>[[name]]</b> - {Lang::T('Customer Name')}
 							<br>
-									<b>{Lang::T('[[user_name]]')}</b> - {Lang::T('Customer Username')}
+							<b>[[user_name]]</b> - {Lang::T('Customer Username')}
 							<br>
-									<b>{Lang::T('[[phone]]')}</b> - {Lang::T('Customer Phone')}
+							<b>[[phone]]</b> - {Lang::T('Customer Phone')}
 							<br>
-									<b>{Lang::T('[[company_name]]')}</b> - {Lang::T('Your Company Name')}
+							<b>[[company_name]]</b> - {Lang::T('Your Company Name')}
 						</p>
 					</div>

@ -59,7 +58,7 @@
 			</div>
 		</div>
 	</div>
-		</div>
+</div>


 {include file="sections/footer.tpl"}
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@ -234,6 +234,20 @@
                        </ul>
                    </li>
                    {$_MENU_AFTER_REPORTS}
+                    <li class="{if $_system_menu eq 'map'}active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-ios-location"></i> <span>{Lang::T('Map')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[1] eq 'customer' }class="active" {/if}><a
+                                    href="{$_url}map/customer">{Lang::T('Customer Location')}</a></li>
+                            {$_MENU_MAP}
+                        </ul>
+                    </li>
+                    {$_MENU_AFTER_MAP}
                    <li class="{if $_system_menu eq 'message'}active{/if} treeview">
                        <a href="#">
                            <i class="ion ion-android-chat"></i> <span>{Lang::T('Send Message')}</span>