diff --git a/CHANGELOG.md b/CHANGELOG.md index e477396..cd9cd2c 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/install/phpnuxbill.sql b/install/phpnuxbill.sql index 24439d2..1bfed1c 100644 --- a/install/phpnuxbill.sql +++ b/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', diff --git a/system/lan/english.json b/system/lan/english.json index 3219387..451a8d4 100644 --- a/system/lan/english.json +++ b/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" } \ No newline at end of file diff --git a/system/updates.json b/system/updates.json index 9a25dbb..002ad15 100644 --- a/system/updates.json +++ b/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`;" ] - - } \ No newline at end of file diff --git a/ui/ui/map-customer.tpl b/ui/ui/map-customer.tpl index 0744cd2..00c5ed9 100644 --- a/ui/ui/map-customer.tpl +++ b/ui/ui/map-customer.tpl @@ -5,41 +5,56 @@ {literal} {/literal} diff --git a/ui/ui/message-bulk.tpl b/ui/ui/message-bulk.tpl index ac5bfd6..7d1248a 100644 --- a/ui/ui/message-bulk.tpl +++ b/ui/ui/message-bulk.tpl @@ -30,7 +30,8 @@
- +

{Lang::T('Use placeholders:')} @@ -44,7 +45,7 @@ [[company_name]] - {Lang::T('Your Company Name')}

- +
@@ -52,11 +53,11 @@
- + -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl index 6eee53e..6ca248a 100644 --- a/ui/ui/sections/header.tpl +++ b/ui/ui/sections/header.tpl @@ -88,7 +88,7 @@ } {if isset($xheader)} - {$xheader} + {$xheader} {/if} @@ -158,62 +158,71 @@ {$_MENU_AFTER_DASHBOARD} {if !in_array($_admin['user_type'],['Report'])} -
  • - - - {Lang::T('Customer')} - -
    • - {$_MENU_AFTER_CUSTOMERS} -
  • - - {Lang::T('Services')} - - - - - -
    • +
  • + + {Lang::T('Customer')} + + + + + +
    • + {$_MENU_AFTER_CUSTOMERS} +
  • + + {Lang::T('Services')} + + + + + +
    • {/if} {$_MENU_AFTER_SERVICES} {if in_array($_admin['user_type'],['SuperAdmin','Admin'])} -
  • - - {Lang::T('Plans')} - - - - - -
    • +
  • + + {Lang::T('Plans')} + + + + + +
    • {/if} {$_MENU_AFTER_PLANS}
  • @@ -234,20 +243,6 @@
    • {$_MENU_AFTER_REPORTS} -
  • - - {Lang::T('Map')} - - - - - -
    • - {$_MENU_AFTER_MAP}
  • {Lang::T('Send Message')} @@ -265,64 +260,64 @@
    • {$_MENU_AFTER_MESSAGE} {if in_array($_admin['user_type'],['SuperAdmin','Admin'])} -
  • - - {Lang::T('Network')} - - - - - -
    • - {$_MENU_AFTER_NETWORKS} - {if $_c['radius_enable']} -
  • - - {Lang::T('Radius')} - - - - - -
    • - {/if} - {$_MENU_AFTER_RADIUS} -
  • - - {Lang::T("Static Pages")} - - - - - -
    • + {/if} + {$_MENU_AFTER_RADIUS} +
  • + + {Lang::T("Static Pages")} + + + + + +
    • {/if} {$_MENU_AFTER_PAGES}