2024.3.19

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # CHANGELOG
 
+## 2024.3.19
+
+- Add Customer Type Personal or Bussiness by @pro-cms
+- Fix Broadcast Message by @Focuslinkstech
+- Add Customer Geolocation by @Focuslinkstech
+- Change Customer Menu
+
 ## 2024.3.18
 
 - Add Broadcasting SMS by @Focuslinkstech

install/phpnuxbill.sql

@@ -26,7 +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',
+  `coordinates` VARCHAR(50) NOT NULL DEFAULT '' 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',

system/lan/english.json

@@ -512,5 +512,14 @@
     "All_Customers": "All Customers",
     "New_Customers": "New Customers",
     "Expired_Customers": "Expired Customers",
-    "Active_Customers": "Active Customers"
+    "Active_Customers": "Active Customers",
+    "Map": "Map",
+    "Customer_Location": "Customer Location",
+    "Account_Type": "Account Type",
+    "Coordinates": "Coordinates",
+    "Latitude_and_Longitude_coordinates_for_map_must_be_separate_with_comma____": "Latitude and Longitude coordinates for map must be separate with comma ","",
+    "6_465422__3_406448": "6.465422, 3.406448",
+    "Customer_Geo_Location_Information": "Customer Geo Location Information",
+    "List": "List",
+    "Lists": "Lists"
 }

system/updates.json

@@ -80,8 +80,9 @@
         "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`;"
+        "ALTER TABLE `tbl_customers` ADD `coordinates` VARCHAR(50) NOT NULL DEFAULT '' COMMENT 'Latitude and Longitude coordinates' AFTER `email`;"
+    ],
+    "2024.3.19.1" : [
+        "ALTER TABLE `tbl_customers` ADD `account_type` ENUM('Business', 'Personal') DEFAULT 'Personal' COMMENT 'For selecting account type' AFTER `coordinates`;"
     ]
-    
-   
 }

ui/ui/map-customer.tpl

@@ -5,8 +5,20 @@
 
 {literal}
     <script>
-        window.onload = function() {
+        function getLocation() {
-        var map = L.map('map').setView([51.505, -0.09], 13);
+            if (navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(showPosition);
+            } else {
+                setupMap(51.505, -0.09);
+            }
+        }
+
+        function showPosition(position) {
+            setupMap(position.coords.latitude, position.coords.longitude);
+        }
+
+        function setupMap(lat, lon) {
+            var map = L.map('map').setView([lat, lon], 13);
             var group = L.featureGroup().addTo(map);
 
             var customers = {/literal}{$customers|json_encode}{literal};
@@ -41,6 +53,9 @@
 
             map.fitBounds(group.getBounds());
         }
+        window.onload = function() {
+            getLocation();
+        }
     </script>
 {/literal}
 

ui/ui/message-bulk.tpl

@@ -30,7 +30,8 @@
 					<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:')}

ui/ui/sections/header.tpl

@@ -158,11 +158,20 @@
                     </li>
                     {$_MENU_AFTER_DASHBOARD}
                     {if !in_array($_admin['user_type'],['Report'])}
-                    <li {if $_system_menu eq 'customers' }class="active" {/if}>
+                        <li class="{if in_array($_system_menu, ['customers', 'map'])}active{/if} treeview">
-                        <a href="{$_url}customers">
+                            <a href="#">
-                            <i class="fa fa-users"></i>
+                                <i class="fa fa-users"></i> <span>{Lang::T('Customer')}</span>
-                            <span>{Lang::T('Customer')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
                             </a>
+                            <ul class="treeview-menu">
+                                <li {if $_system_menu eq 'customers' }class="active" {/if}><a
+                                        href="{$_url}customers">{Lang::T('Lists')}</a></li>
+                                <li {if $_system_menu eq 'map' }class="active" {/if}><a
+                                        href="{$_url}map/customer">{Lang::T('Location')}</a></li>
+                                {$_MENU_CUSTOMERS}
+                            </ul>
                         </li>
                         {$_MENU_AFTER_CUSTOMERS}
                         <li class="{if $_system_menu eq 'plan'}active{/if} treeview">
@@ -234,20 +243,6 @@
                         </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>
@@ -424,4 +419,4 @@
                             }
                         });
                     </script>
-                {/if}
+{/if}

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.3.18"
+    "version": "2024.3.19"
 }