From a5a959eade16fa1ced31bbab2a6b0f60cf507037 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 14 Aug 2023 14:16:56 +0700
Subject: [PATCH] Add Notification Message for Buy Balance

---
 CHANGELOG.md                              | 14 +++++++++++
 system/autoload/Balance.php               | 20 +++++++++++++++
 system/lan/english/common.lan.php         | 18 ++++++++------
 system/uploads/notifications.default.json |  9 ++++++-
 ui/ui/app-notifications.tpl               | 30 ++++++++++++++++++++---
 5 files changed, 78 insertions(+), 13 deletions(-)
 create mode 100644 system/autoload/Balance.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e65825bc..5badae51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,26 @@
 
 # CHANGELOG
 
+## 2023.8
+
+- Fix PPPOE Delete User
+- Fix Header Admin and User
+- Fix PDF Export by Period
+- Add pppoe_password for user, this pppoe_password only admin can change
+- Country Code Number Settings
+- User Meta Table for Custom Fields
+- Fix Add and Edit Customer Form for admin
+- add Notification Message Editor
+- cron reminder
+
+
 ## 2023.8.1
 
 - Add Update file script, one click updating PHPNuxBill
 - Add Custom UI folder, to custome your own template
 - Delete debug text
 - Fix Vendor JS
+
 ## 2023.7.28
 
 - Fix link buy Voucher
diff --git a/system/autoload/Balance.php b/system/autoload/Balance.php
new file mode 100644
index 00000000..99595f23
--- /dev/null
+++ b/system/autoload/Balance.php
@@ -0,0 +1,20 @@
+<?php
+/**
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+* This script is for managing user balance
+**/
+
+class Balance {
+
+    public static function add($customer, $amount, $note){
+
+    }
+
+    public static function transfer($customer, $phoneTarget){
+
+    }
+
+    public static function pay($customer, $amount, $note){
+
+    }
+}
\ No newline at end of file
diff --git a/system/lan/english/common.lan.php b/system/lan/english/common.lan.php
index 89a725d8..2efded68 100644
--- a/system/lan/english/common.lan.php
+++ b/system/lan/english/common.lan.php
@@ -345,11 +345,13 @@ $_L['Country_Code_Phone'] = 'Country Code Phone';
 $_L['Voucher_activation_menu_will_be_hidden'] = 'Voucher activation menu will be hidden';
 $_L['Customer_can_deposit_money_to_buy_voucher'] = 'Customer can deposit money to buy voucher';
 $_L['Allow_balance_transfer_between_customers'] = 'Allow balance transfer between customers';
-$_L['Reminder_Notification'] = 'Reminder Notification';
-$_L['Invoice_Notification_Message'] = 'Invoice Notification Message';
-$_L['Reminder_Notification_Message'] = 'Reminder Notification Message';
-$_L['Reminder_7_days'] = 'Reminder 7 days';
-$_L['Reminder_3_days'] = 'Reminder 3 days';
-$_L['Reminder_1_day'] = 'Reminder 1 day';
-$_L['PPPOE_Password'] = 'PPPOE Password';
-$_L['User_Cannot_change_this_only_admin_if_it_Empty_it_will_use_user_password'] = 'User Cannot change this, only admin. if it Empty it will use user password';
+$_L['Reminder_Notification'] = 'Reminder Notification';
+$_L['Reminder_Notification_Message'] = 'Reminder Notification Message';
+$_L['Reminder_7_days'] = 'Reminder 7 days';
+$_L['Reminder_3_days'] = 'Reminder 3 days';
+$_L['Reminder_1_day'] = 'Reminder 1 day';
+$_L['PPPOE_Password'] = 'PPPOE Password';
+$_L['User_Cannot_change_this_only_admin_if_it_Empty_it_will_use_user_password'] = 'User Cannot change this, only admin. if it Empty it will use user password';
+$_L['Invoice_Balance_Message'] = 'Invoice Balance Message';
+$_L['Invoice_Notification_Payment'] = 'Invoice Notification Payment';
+$_L['Balance_Notification_Payment'] = 'Balance Notification Payment';
diff --git a/system/uploads/notifications.default.json b/system/uploads/notifications.default.json
index 5535ddc5..3cf8179c 100644
--- a/system/uploads/notifications.default.json
+++ b/system/uploads/notifications.default.json
@@ -1 +1,8 @@
-{"user_notification_expired_text":"Hello [[name]],\r\nyour internet package [[package]] has been expired.","invoice_paid":"*[[company_name]]*\r\n[[address]]\r\n[[phone]]\r\n\r\n\r\nINVOICE: *[[invoice]]*\r\nDate : [[date]]\r\n[[payment_gateway]] [[payment_channel]]\r\n\r\n\r\nType : *[[type]]*\r\nPackage : *[[plan_name]]*\r\nPrice : *[[plan_price]]*\r\n\r\nUsername : *[[user_name]]*\r\nPassword : ***********\r\n\r\nExpired : *[[expired_date]]*\r\n\r\n\r\nThank you...","reminder_7_day":"Hello *[[name]]*, \r\nyour internet package *[[package]]* will be expired in 7 days.","reminder_3_day":"Hello *[[name]]*, \r\nyour internet package *[[package]]* will be expired in 3 days.","reminder_1_day":"Hello *[[name]]*,\r\n your internet package *[[package]]* will be expired tomorrow."}
\ No newline at end of file
+{
+	"user_notification_expired_text": "Hello [[name]],\r\nyour internet package [[package]] has been expired.",
+	"invoice_paid": "*[[company_name]]*\r\n[[address]]\r\n[[phone]]\r\n\r\n\r\nINVOICE: *[[invoice]]*\r\nDate : [[date]]\r\n[[payment_gateway]] [[payment_channel]]\r\n\r\n\r\nType : *[[type]]*\r\nPackage : *[[plan_name]]*\r\nPrice : *[[plan_price]]*\r\n\r\nUsername : *[[user_name]]*\r\nPassword : ***********\r\n\r\nExpired : *[[expired_date]]*\r\n\r\n\r\nThank you...",
+	"invoice_balance": "*[[company_name]]*\r\n[[address]]\r\n[[phone]]\r\n\r\n\r\nINVOICE: *[[invoice]]*\r\nDate : [[date]]\r\n[[payment_gateway]] [[payment_channel]]\r\n\r\n\r\nType : *[[type]]*\r\nPackage : *[[plan_name]]*\r\nPrice : *[[plan_price]]*\r\n\r\nUsername : *[[user_name]]*\r\nPassword : ***********\r\n\r\nTransaction Date : *[[trx_date]]*\r\n\r\n\r\nThank you...",
+	"reminder_7_day": "Hello *[[name]]*, \r\nyour internet package *[[package]]* will be expired in 7 days.",
+	"reminder_3_day": "Hello *[[name]]*, \r\nyour internet package *[[package]]* will be expired in 3 days.",
+	"reminder_1_day": "Hello *[[name]]*,\r\n your internet package *[[package]]* will be expired tomorrow."
+}
diff --git a/ui/ui/app-notifications.tpl b/ui/ui/app-notifications.tpl
index 81b468fd..ce66edbc 100644
--- a/ui/ui/app-notifications.tpl
+++ b/ui/ui/app-notifications.tpl
@@ -63,14 +63,11 @@
                 </div>
                 <div class="panel-body">
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Invoice Notification Message')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Invoice Notification Payment')}</label>
                         <div class="col-md-6">
                             <textarea class="form-control" id="invoice_paid" name="invoice_paid"
                                 placeholder="Hello [[name]], your internet package [[package]] has been expired"
                                 rows="20">{Lang::htmlspecialchars($_json['invoice_paid'])}</textarea>
-                            <p class="help-block">
-                                {Lang::T('<b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name.')}
-                            </p>
                         </div>
                         <p class="col-md-4 help-block">
                             <b>[[company_name]]</b> Your Company Name at Settings.<br>
@@ -89,6 +86,31 @@
                         </p>
                     </div>
                 </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Balance Notification Payment')}</label>
+                        <div class="col-md-6">
+                            <textarea class="form-control" id="invoice_paid" name="invoice_paid"
+                                placeholder="Hello [[name]], your internet package [[package]] has been expired"
+                                rows="20">{Lang::htmlspecialchars($_json['invoice_paid'])}</textarea>
+                        </div>
+                        <p class="col-md-4 help-block">
+                            <b>[[company_name]]</b> Your Company Name at Settings.<br>
+                            <b>[[address]]</b> Your Company Address at Settings.<br>
+                            <b>[[phone]]</b> Your Company Phone at Settings.<br>
+                            <b>[[invoice]]</b> invoice number.<br>
+                            <b>[[date]]</b> Date invoice created.<br>
+                            <b>[[payment_gateway]]</b> Payment gateway user paid from.<br>
+                            <b>[[payment_channel]]</b> Payment channel user paid from.<br>
+                            <b>[[type]]</b> is Hotspot/PPPOE.<br>
+                            <b>[[plan_name]]</b> Internet Package.<br>
+                            <b>[[plan_price]]</b> Internet Package Prices.<br>
+                            <b>[[user_name]]</b> Username internet.<br>
+                            <b>[[user_password]]</b> User password.<br>
+                            <b>[[trx_date]]</b> Transaction datetime.
+                        </p>
+                    </div>
+                </div>
             </div>
 
             <div class="panel-body">