View Invoice from Customer side

Additional Cost, and Confirm Recharge
fix get attributes
2024-03-14 13:40:44 +07:00 · 2024-03-14 12:14:11 +07:00 · 2024-03-14 11:38:32 +07:00 · 2024-03-14 10:28:36 +07:00 · 2024-03-13 16:59:12 +07:00 · 2024-03-13 16:33:06 +07:00
148 changed files with 1730 additions and 1782 deletions
--- a/.htaccess_firewall
+++ b/.htaccess_firewall
@ -0,0 +1,9 @@
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
+
+<Files index.php>
+    Order Allow,Deny
+    Allow from all
+</Files>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,59 @@

 # CHANGELOG

+## 2024.3.14
+
+- Add Note to Invoices
+- Add Additional Bill
+- View Invoice from Customer side
+
+## 2024.3.13
+
+- Postpaid System
+- Additional Cost
+
+## 2024.3.12
+
+- Check if Validity Period, so calculate price will not affected other validity
+- Add firewall using .htaccess for apache only
+- Multiple Payment Gateway by @Focuslinkstech
+- Fix Logic Multiple Payment gateway
+- Fix delete Attribute
+- Allow Delete Payment Gateway
+- Allow Delete Plugin
+
+## 2024.3.6
+
+- change attributes view
+
+## 2024.3.4
+
+- add [[username]] for reminder
+- fix agent show when editing
+- fix password admin when sending notification
+- add file exists for pages
+
+## 2024.3.3
+
+- Change loading button by @Focuslinkstech
+- Add Customer Announcements by @Gerandonk
+- Add PPPOE Period Validity by @Gerandonk
+
+## 2024.2.29
+
+- Fix Hook Functionality
+- Change Customer Menu
+
+## 2024.2.28
+
+- Fix Buy Plan with Balance
+- Add Expired date for reminder
+
+## 2024.2.27
+
+- fix path notification
+- redirect to dashboard if already login
+
 ## 2024.2.26

 - Clean Unused JS and CSS
--- a/init.php
+++ b/init.php
@ -76,10 +76,10 @@ if ($_app_stage != 'Live') {
 define('U', APP_URL . '/index.php?_route=');

 // notification message
-if (file_exists($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . "notifications.json")) {
-    $_notifmsg = json_decode(file_get_contents($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.json'), true);
+if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . "notifications.json")) {
+    $_notifmsg = json_decode(file_get_contents($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.json'), true);
 }
-$_notifmsg_default = json_decode(file_get_contents($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.default.json'), true);
+$_notifmsg_default = json_decode(file_get_contents($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.default.json'), true);

 //register all plugin
 foreach (glob(File::pathFixer($PLUGIN_PATH . DIRECTORY_SEPARATOR . '*.php')) as $filename) {
@ -96,6 +96,7 @@ $result = ORM::for_table('tbl_appconfig')->find_many();
 foreach ($result as $value) {
    $config[$value['setting']] = $value['value'];
 }
+$_c =  $config;
 if (empty($http_proxy) && !empty($config['http_proxy'])) {
    $http_proxy = $config['http_proxy'];
    if (empty($http_proxyauth) && !empty($config['http_proxyauth'])) {
@ -237,7 +238,7 @@ function r2($to, $ntype = 'e', $msg = '')
    exit;
 }

-function _alert($text, $type = 'success', $url = "home")
+function _alert($text, $type = 'success', $url = "home", $time = 3)
 {
    global $ui;
    if (!isset($ui)) return;
@ -250,8 +251,10 @@ function _alert($text, $type = 'success', $url = "home")
    }
    $ui->assign('text', $text);
    $ui->assign('type', $type);
+    $ui->assign('time', $time);
    $ui->assign('url', $url);
    $ui->display('alert.tpl');
+    die();
 }


--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@ -91,7 +91,7 @@ CREATE TABLE `tbl_plans` (
  `data_limit` int(10) UNSIGNED DEFAULT NULL,
  `data_unit` enum('MB','GB') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
  `validity` int(10) NOT NULL,
-  `validity_unit` enum('Mins','Hrs','Days','Months') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `validity_unit` enum('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  `shared_users` int(10) DEFAULT NULL,
  `routers` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  `is_radius` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 is radius',
@ -142,7 +142,7 @@ CREATE TABLE `tbl_users` (
  `username` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
  `fullname` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
  `password` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `user_type` enum('Admin','Sales') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `user_type` enum('SuperAdmin','Admin','Report','Agent','Sales') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
  `status` enum('Active','Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'Active',
  `last_login` datetime DEFAULT NULL,
  `creationdate` datetime NOT NULL
@ -309,11 +309,12 @@ CREATE TABLE tbl_customers_fields (

 ALTER TABLE `tbl_voucher` ADD `generated_by` INT NOT NULL DEFAULT '0' COMMENT 'id admin' AFTER `status`;
 ALTER TABLE `tbl_users` ADD `root` INT NOT NULL DEFAULT '0' COMMENT 'for sub account' AFTER `id`;
-ALTER TABLE `tbl_users` CHANGE `user_type` `user_type` ENUM('SuperAdmin','Admin','Report','Agent','Sales') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;
 ALTER TABLE `tbl_users` CHANGE `password` `password` VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;
 ALTER TABLE `tbl_users` ADD `phone` VARCHAR(32) NOT NULL DEFAULT '' AFTER `password`, ADD `email` VARCHAR(128) NOT NULL DEFAULT '' AFTER `phone`, ADD `city` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'kota' AFTER `email`, ADD `subdistrict` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'kecamatan' AFTER `city`, ADD `ward` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'kelurahan' AFTER `subdistrict`;
 ALTER TABLE `tbl_customers` ADD `created_by` INT NOT NULL DEFAULT '0' AFTER `auto_renewal`;
 ALTER TABLE `tbl_plans` ADD `list_expired` VARCHAR(32) NOT NULL DEFAULT '' COMMENT 'address list' AFTER `pool_expired`;
 ALTER TABLE `tbl_bandwidth` ADD `burst` VARCHAR(128) NOT NULL DEFAULT '' AFTER `rate_up_unit`;
 ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
-ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
+ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;
+ALTER TABLE `tbl_plans` CHANGE `allow_purchase` `prepaid` ENUM('yes','no') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT 'is prepaid';
+ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;
--- a/pages_template/Announcement.html
+++ b/pages_template/Announcement.html
@ -1 +1,3 @@
-Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br>
+Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br><br>
+<br>
+This Announcement is for Login Page.
--- a/pages_template/Announcement_Customer.html
+++ b/pages_template/Announcement_Customer.html
@ -0,0 +1,8 @@
+Pengumuman Pelanggan!!<br>
+Besok libur<br>
+<br>
+Customer Announcement!!<br>
+Tomorrow holiday<br>
+<br>
+<br>
+This Announcement is for Customer Dashboard
--- a/system/.htaccess
+++ b/system/.htaccess
@ -0,0 +1,19 @@
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
+
+<Files cron.php>
+    Order Allow,Deny
+    Allow from all
+</Files>
+
+<Files api.php>
+    Order Allow,Deny
+    Allow from all
+</Files>
+
+<Files cron_reminder.php>
+    Order Allow,Deny
+    Allow from all
+</Files>
--- a/system/autoload/Admin.php
+++ b/system/autoload/Admin.php
@ -51,7 +51,7 @@ class Admin
        if ($id) {
            return ORM::for_table('tbl_users')->find_one($id);
        } else {
-            return [];
+            return null;
        }
    }
 }
--- a/system/autoload/Hookers.php
+++ b/system/autoload/Hookers.php
@ -38,6 +38,7 @@ function register_menu($name, $admin, $function, $position, $icon = '', $label =
 $hook_registered = array();

 function register_hook($action, $function){
+    global $hook_registered;
    $hook_registered[] = [
        'action' => $action,
        'function' => $function
--- a/system/autoload/Message.php
+++ b/system/autoload/Message.php
@ -60,25 +60,30 @@ class Message
        global $config;
        run_hook('send_whatsapp'); #HOOK
        if (!empty($config['wa_url'])) {
-            $waurl = str_replace('[number]', urlencode($phone), $config['wa_url']);
+            $waurl = str_replace('[number]', urlencode(Lang::phoneFormat($phone)), $config['wa_url']);
            $waurl = str_replace('[text]', urlencode($txt), $waurl);
            return Http::getData($waurl);
        }
    }

-    public static function sendPackageNotification($phone, $name, $package, $price, $message, $via)
+    public static function sendPackageNotification($customer, $package, $price, $message, $via)
    {
-        $msg = str_replace('[[name]]', $name, $message);
+        global $u;
+        $msg = str_replace('[[name]]', $customer['fullname'], $message);
+        $msg = str_replace('[[username]]', $customer['username'], $msg);
        $msg = str_replace('[[package]]', $package, $msg);
        $msg = str_replace('[[price]]', $price, $msg);
+        if($u){
+            $msg = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($u['expiration'], $u['time']), $msg);
+        }
        if (
-            !empty($phone) && strlen($phone) > 5
+            !empty($customer['phonenumber']) && strlen($customer['phonenumber']) > 5
            && !empty($message) && in_array($via, ['sms', 'wa'])
        ) {
            if ($via == 'sms') {
-                Message::sendSMS($phone, $msg);
+                Message::sendSMS($customer['phonenumber'], $msg);
            } else if ($via == 'wa') {
-                Message::sendWhatsapp($phone, $msg);
+                Message::sendWhatsapp($customer['phonenumber'], $msg);
            }
        }
        return "$via: $msg";
@ -118,8 +123,11 @@ class Message
        $textInvoice = str_replace('[[plan_name]]', $trx['plan_name'], $textInvoice);
        $textInvoice = str_replace('[[plan_price]]',  Lang::moneyFormat($trx['price']), $textInvoice);
        $textInvoice = str_replace('[[name]]', $cust['fullname'], $textInvoice);
+        $textInvoice = str_replace('[[note]]', $cust['note'], $textInvoice);
        $textInvoice = str_replace('[[user_name]]', $trx['username'], $textInvoice);
        $textInvoice = str_replace('[[user_password]]', $cust['password'], $textInvoice);
+        $textInvoice = str_replace('[[username]]', $trx['username'], $textInvoice);
+        $textInvoice = str_replace('[[password]]', $cust['password'], $textInvoice);
        $textInvoice = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($trx['expiration'], $trx['time']), $textInvoice);
        $textInvoice = str_replace('[[footer]]', $config['note'], $textInvoice);

--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@ -17,9 +17,9 @@ class Package
     * @param string $channel channel payment gateway
     * @return boolean
     */
-    public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel)
+    public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel, $note = '')
    {
-        global $config, $admin;
+        global $config, $admin, $c, $p, $b, $t, $d, $zero;
        $date_now = date("Y-m-d H:i:s");
        $date_only = date("Y-m-d");
        $time_only = date("H:i:s");
@ -30,11 +30,59 @@ class Package
        }

        $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
-        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
+
+        // Additional cost
+        $add_cost = 0;
+        $add_rem = User::getAttribute("Additional Remaining", $id_customer);
+        // if empty then it doesnt have cycle, if zero then it finish
+        if ($add_rem != 0) {
+            $add_cost = User::getAttribute("Additional Cost", $id_customer);
+            if (empty($add_cost)) {
+                $add_cost = 0;
+            }
+        }
+        if ($add_cost > 0 && $router_name != 'balance') {
+            $bills = User::getAttributes("Bill", $id_customer);
+            foreach ($bills as $k => $v) {
+                $note .= $k . " : " . Lang::moneyFormat($v) . "\n";
+            }
+        }
+
+        // Zero cost recharge
+        if (isset($zero) && $zero == 1) {
+            $p['price'] = 0;
+            $add_cost = 0;
+        }
+
+        if (!$p['enabled']) {
+            if (!isset($admin) || !isset($admin['id']) || empty($admin['id'])) {
+                r2(U . 'home', 'e', Lang::T('Plan Not found'));
+            }
+            if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
+                r2(U . 'dashboard', 'e', Lang::T('Plan Not found'));
+            }
+        }
+
+        if ($p['validity_unit'] == 'Period') {
+            $day_exp = User::getAttribute("Expired Date", $c['id']); //ORM::for_table('tbl_customers_fields')->where('field_name', 'Expired Date')->where('customer_id', $c['id'])->find_one();
+            if (!$day_exp) {
+                $day_exp = 20;
+                // $day_exp = date('d', strtotime($c['created_at']));
+                // if (empty($day_exp) || $day_exp > 28) {
+                //     $day_exp = 1;
+                // }
+                $f = ORM::for_table('tbl_customers_fields')->create();
+                $f->customer_id = $c['id'];
+                $f->field_name = 'Expired Date';
+                $f->field_value = $day_exp;
+                $f->save();
+            }
+        }

        if ($router_name == 'balance') {
            // insert table transactions
-            $inv = "INV-" . Package::_raid(5);
+            $inv = "INV-" . Package::_raid();
            $t = ORM::for_table('tbl_transactions')->create();
            $t->invoice = $inv;
            $t->username = $c['username'];
@ -48,8 +96,8 @@ class Package
            $t->routers = $router_name;
            $t->type = "Balance";
            if ($admin) {
-                $t->admin_id = $admin['id'];
-            }else{
+                $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+            } else {
                $t->admin_id = '0';
            }
            $t->save();
@ -86,17 +134,49 @@ class Package
        }

        /**
-         * 1 Customer only can have 1 PPPOE and 1 Hotspot Plan
+         * 1 Customer only can have 1 PPPOE and 1 Hotspot Plan, 1 prepaid and 1 postpaid
         */
        $b = ORM::for_table('tbl_user_recharges')
+            ->select('tbl_user_recharges.id', 'id')
+            ->select('customer_id')
+            ->select('username')
+            ->select('plan_id')
+            ->select('namebp')
+            ->select('recharged_on')
+            ->select('recharged_time')
+            ->select('expiration')
+            ->select('time')
+            ->select('status')
+            ->select('method')
+            ->select('tbl_user_recharges.routers', 'routers')
+            ->select('tbl_user_recharges.type', 'type')
+            ->select('admin_id')
+            ->select('prepaid')
            ->where('customer_id', $id_customer)
-            ->where('routers', $router_name)
-            ->where('Type', $p['type'])
+            ->where('tbl_user_recharges.routers', $router_name)
+            ->where('tbl_user_recharges.Type', $p['type'])
+            ->where('prepaid', $p['prepaid'])
+            ->join('tbl_plans', array('tbl_plans.id', '=', 'tbl_user_recharges.plan_id'))
            ->find_one();

+        run_hook("recharge_user");
+
+
        $mikrotik = Mikrotik::info($router_name);
        if ($p['validity_unit'] == 'Months') {
            $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' month'));
+        } else if ($p['validity_unit'] == 'Period') {
+            $date_tmp = date("Y-m-$day_exp", strtotime('+' . $p['validity'] . ' month'));
+            $dt1 = new DateTime("$date_only");
+            $dt2 = new DateTime("$date_tmp");
+            $diff = $dt2->diff($dt1);
+            $sum =  $diff->format("%a"); // => 453
+            if ($sum >= 35) {
+                $date_exp = date("Y-m-$day_exp", strtotime('+0 month'));
+            } else {
+                $date_exp = date("Y-m-$day_exp", strtotime('+' . $p['validity'] . ' month'));
+            };
+            $time = date("23:59:00");
        } else if ($p['validity_unit'] == 'Days') {
            $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' day'));
        } else if ($p['validity_unit'] == 'Hrs') {
@ -116,6 +196,9 @@ class Package
                    if ($p['validity_unit'] == 'Months') {
                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Period') {
+                        $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                        $time = date("23:59:00");
                    } else if ($p['validity_unit'] == 'Days') {
                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
                        $time = $b['time'];
@ -152,31 +235,55 @@ class Package
                $b->routers = $router_name;
                $b->type = "Hotspot";
                if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
+                    $b->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $b->admin_id = '0';
                }
                $b->save();

                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid(5);
+                $t->invoice = "INV-" . Package::_raid();
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
-                $t->price = $p['price'];
+                $t->price = $p['price'] + $add_cost;
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
                $t->routers = $router_name;
+                $t->note = $note;
                $t->type = "Hotspot";
                if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $t->admin_id = '0';
                }
                $t->save();
+
+                if ($p['validity_unit'] == 'Period') {
+                    // insert to fields
+                    $fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+                    if (!$fl) {
+                        $fl = ORM::for_table('tbl_customers_fields')->create();
+                        $fl->customer_id = $c['id'];
+                        $fl->field_name = 'Invoice';
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    } else {
+                        $fl->customer_id = $c['id'];
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    }
+                }
+
+
+                Message::sendTelegram("#u$c[username] $c[fullname] #recharge #Hotspot \n" . $p['name_plan'] .
+                    "\nRouter: " . $router_name .
+                    "\nGateway: " . $gateway .
+                    "\nChannel: " . $channel .
+                    "\nPrice: " . Lang::moneyFormat($p['price']));
            } else {
                if ($p['is_radius']) {
                    Radius::customerAddPlan($c, $p, "$date_exp $time");
@ -201,37 +308,73 @@ class Package
                $d->routers = $router_name;
                $d->type = "Hotspot";
                if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
-                    $b->admin_id = '0';
+                    $d->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
+                    $d->admin_id = '0';
                }
                $d->save();

                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid(5);
+                $t->invoice = "INV-" . Package::_raid();
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
-                $t->price = $p['price'];
+                if ($p['validity_unit'] == 'Period' && $p['price'] != 0) {
+                    // Calculating Price
+                    $sd = new DateTime("$date_only");
+                    $ed = new DateTime("$date_exp");
+                    $td = $ed->diff($sd);
+                    $fd = $td->format("%a");
+                    $gi = ($p['price'] / 30) * $fd;
+                    if ($gi > $p['price']) {
+                        $t->price = $p['price'] + $add_cost;
+                    } else {
+                        $t->price = $gi + $add_cost;
+                    }
+                } else {
+                    $t->price = $p['price'] + $add_cost;
+                }
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
                $t->routers = $router_name;
+                $t->note = $note;
                $t->type = "Hotspot";
                if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $t->admin_id = '0';
                }
                $t->save();
+
+                if ($p['validity_unit'] == 'Period' && $p['price'] != 0) {
+                    // insert to fields
+                    $fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+                    if (!$fl) {
+                        $fl = ORM::for_table('tbl_customers_fields')->create();
+                        $fl->customer_id = $c['id'];
+                        $fl->field_name = 'Invoice';
+                        if ($gi > $p['price']) {
+                            $fl->field_value = $p['price'];
+                        } else {
+                            $fl->field_value = $gi;
+                        }
+                        $fl->save();
+                    } else {
+                        $fl->customer_id = $c['id'];
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    }
+                }
+
+                Message::sendTelegram("#u$c[username] $c[fullname] #buy #Hotspot \n" . $p['name_plan'] .
+                    "\nRouter: " . $router_name .
+                    "\nGateway: " . $gateway .
+                    "\nChannel: " . $channel .
+                    "\nPrice: " . Lang::moneyFormat($p['price']));
            }
-            Message::sendTelegram("#u$c[username] #buy #Hotspot \n" . $p['name_plan'] .
-                "\nRouter: " . $router_name .
-                "\nGateway: " . $gateway .
-                "\nChannel: " . $channel .
-                "\nPrice: " . Lang::moneyFormat($p['price']));
        } else {

            if ($b) {
@ -240,6 +383,9 @@ class Package
                    if ($p['validity_unit'] == 'Months') {
                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Period') {
+                        $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                        $time = date("23:59:00");
                    } else if ($p['validity_unit'] == 'Days') {
                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
                        $time = $b['time'];
@ -276,31 +422,54 @@ class Package
                $b->routers = $router_name;
                $b->type = "PPPOE";
                if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
+                    $b->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $b->admin_id = '0';
                }
                $b->save();

                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid(5);
+                $t->invoice = "INV-" . Package::_raid();
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
-                $t->price = $p['price'];
+                $t->price = $p['price'] + $add_cost;
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
                $t->routers = $router_name;
+                $t->note = $note;
                $t->type = "PPPOE";
                if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $t->admin_id = '0';
                }
                $t->save();
+
+                if ($p['validity_unit'] == 'Period' && $p['price'] != 0) {
+                    // insert to fields
+                    $fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+                    if (!$fl) {
+                        $fl = ORM::for_table('tbl_customers_fields')->create();
+                        $fl->customer_id = $c['id'];
+                        $fl->field_name = 'Invoice';
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    } else {
+                        $fl->customer_id = $c['id'];
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    }
+                }
+
+                Message::sendTelegram("#u$c[username] $c[fullname] #recharge #PPPOE \n" . $p['name_plan'] .
+                    "\nRouter: " . $router_name .
+                    "\nGateway: " . $gateway .
+                    "\nChannel: " . $channel .
+                    "\nPrice: " . Lang::moneyFormat($p['price']));
            } else {
                if ($p['is_radius']) {
                    Radius::customerAddPlan($c, $p, "$date_exp $time");
@ -325,39 +494,78 @@ class Package
                $d->routers = $router_name;
                $d->type = "PPPOE";
                if ($admin) {
-                    $d->admin_id = $admin['id'];
-                }else{
+                    $d->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $d->admin_id = '0';
                }
                $d->save();

                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
-                $t->invoice = "INV-" . Package::_raid(5);
+                $t->invoice = "INV-" . Package::_raid();
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
-                $t->price = $p['price'];
+                if ($p['validity_unit'] == 'Period' && $p['price'] != 0) {
+                    // Calculating Price
+                    $sd = new DateTime("$date_only");
+                    $ed = new DateTime("$date_exp");
+                    $td = $ed->diff($sd);
+                    $fd = $td->format("%a");
+                    $gi = ($p['price'] / 30) * $fd;
+                    if ($gi > $p['price']) {
+                        $t->price = $p['price'] + $add_cost;
+                    } else {
+                        $t->price = $gi + $add_cost;
+                    }
+                } else {
+                    $t->price = $p['price'] + $add_cost;
+                }
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
+                $t->note = $note;
                $t->routers = $router_name;
                if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                    $t->admin_id = '0';
                }
                $t->type = "PPPOE";
                $t->save();
-            }
-            Message::sendTelegram("#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
-                "\nRouter: " . $router_name .
-                "\nGateway: " . $gateway .
-                "\nChannel: " . $channel .
-                "\nPrice: " . Lang::moneyFormat($p['price']));
-        }

+                if ($p['validity_unit'] == 'Period' && $p['price'] != 0) {
+                    // insert to fields
+                    $fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+                    if (!$fl) {
+                        $fl = ORM::for_table('tbl_customers_fields')->create();
+                        $fl->customer_id = $c['id'];
+                        $fl->field_name = 'Invoice';
+                        if ($gi > $p['price']) {
+                            $fl->field_value = $p['price'];
+                        } else {
+                            $fl->field_value = $gi;
+                        }
+                        $fl->save();
+                    } else {
+                        $fl->customer_id = $c['id'];
+                        $fl->field_value = $p['price'];
+                        $fl->save();
+                    }
+                }
+
+                Message::sendTelegram("#u$c[username] $c[fullname] #buy #PPPOE \n" . $p['name_plan'] .
+                    "\nRouter: " . $router_name .
+                    "\nGateway: " . $gateway .
+                    "\nChannel: " . $channel .
+                    "\nPrice: " . Lang::moneyFormat($p['price']));
+            }
+        }
+        if ($add_rem > 0) {
+            User::setAttribute('Additional Remaining', ($add_rem - 1), $id_customer);
+        }
+        run_hook("recharge_user_finish");
        Message::sendInvoice($c, $t);
        return true;
    }
@ -365,7 +573,7 @@ class Package
    public static function changeTo($username, $plan_id, $from_id)
    {
        $c = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
-        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
        $b = ORM::for_table('tbl_user_recharges')->find_one($from_id);
        if ($p['routers'] == $b['routers'] && $b['routers'] != 'radius') {
            $mikrotik = Mikrotik::info($p['routers']);
@ -442,9 +650,9 @@ class Package
    }


-    public static function _raid($l)
+    public static function _raid()
    {
-        return substr(str_shuffle(str_repeat('0123456789', $l)), 0, $l);
+        return ORM::for_table('tbl_transactions')->max('id') + 1;
    }

    /**
@ -477,7 +685,11 @@ class Package
        $invoice .= Lang::pads(Lang::T('Plan Name'), $in['plan_name'], ' ') . "\n";
        $invoice .= Lang::pads(Lang::T('Plan Price'), Lang::moneyFormat($in['price']), ' ') . "\n";
        $invoice .= Lang::pad($in['method'], ' ', 2) . "\n";
-
+        if(!empty($in['note'])){
+            $invoice .= Lang::pad("", '=') . "\n";
+            $invoice .= Lang::pad($in['note'], ' ', 2);
+        }
+        $invoice .= Lang::pad("", '=') . "\n";
        $invoice .= Lang::pads(Lang::T('Username'), $in['username'], ' ') . "\n";
        $invoice .= Lang::pads(Lang::T('Password'), '**********', ' ') . "\n";
        if ($in['type'] != 'Balance') {
@ -501,7 +713,11 @@ class Package
        $invoice .= Lang::pads(Lang::T('Plan Name'), $in['plan_name'], ' ') . "\n";
        $invoice .= Lang::pads(Lang::T('Plan Price'), Lang::moneyFormat($in['price']), ' ') . "\n";
        $invoice .= Lang::pad($in['method'], ' ', 2) . "\n";
-
+        if(!empty($in['note'])){
+            $invoice .= Lang::pad("", '=') . "\n";
+            $invoice .= Lang::pad($in['note'], ' ', 2);
+        }
+        $invoice .= Lang::pad("", '=') . "\n";
        $invoice .= Lang::pads(Lang::T('Username'), $in['username'], ' ') . "\n";
        $invoice .= Lang::pads(Lang::T('Password'), '**********', ' ') . "\n";
        if ($in['type'] != 'Balance') {
@ -511,6 +727,6 @@ class Package
        $invoice .= Lang::pad("", '=') . "\n";
        $invoice .= Lang::pad($config['note'], ' ', 2) . "\n";
        $ui->assign('whatsapp', urlencode("```$invoice```"));
-        $ui->assign('in',$in);
+        $ui->assign('in', $in);
    }
 }
--- a/system/autoload/User.php
+++ b/system/autoload/User.php
@ -8,15 +8,16 @@

 class User
 {
-    public static function getID(){
+    public static function getID()
+    {
        global $db_password;
-        if(isset($_SESSION['uid']) && !empty($_SESSION['uid'])){
+        if (isset($_SESSION['uid']) && !empty($_SESSION['uid'])) {
            return $_SESSION['uid'];
-        }else if(isset($_COOKIE['uid'])){
+        } else if (isset($_COOKIE['uid'])) {
            // id.time.sha1
-            $tmp = explode('.',$_COOKIE['uid']);
-            if(sha1($tmp[0].'.'.$tmp[1].'.'.$db_password)==$tmp[2]){
-                if(time()-$tmp[1] < 86400*30){
+            $tmp = explode('.', $_COOKIE['uid']);
+            if (sha1($tmp[0] . '.' . $tmp[1] . '.' . $db_password) == $tmp[2]) {
+                if (time() - $tmp[1] < 86400 * 30) {
                    $_SESSION['uid'] = $tmp[0];
                    return $tmp[0];
                }
@ -25,35 +26,120 @@ class User
        return 0;
    }

-    public static function setCookie($uid){
-        global $db_password;
-        if(isset($uid)){
-            $time = time();
-            setcookie('uid', $uid.'.'.$time.'.'.sha1($uid.'.'.$time.'.'.$db_password), time()+86400*30);
-        }
-    }
-
-    public static function removeCookie(){
-        if(isset($_COOKIE['uid'])){
-            setcookie('uid', '', time()-86400);
-        }
-    }
-
-    public static function _info()
+    public static function setAttribute($name, $value, $id = 0)
    {
-        $id = User::getID();
+        if (!$id) {
+            $id = User::getID();
+            if (!$id) {
+                return '';
+            }
+        }
+        $f = ORM::for_table('tbl_customers_fields')->where('field_name', $name)->where('customer_id', $id)->find_one();
+        if(!$f){
+            $f = ORM::for_table('tbl_customers_fields')->create();
+            $f->customer_id = $id;
+            $f->field_name = $name;
+            $f->field_value = $value;
+            $f->save();
+            $result = $f->id();
+            if ($result) {
+                return $result;
+            }
+        }else{
+            $f->field_value = $value;
+            $f->save();
+            return $f['id'];
+        }
+        return 0;
+    }
+
+    public static function getAttribute($name, $id = 0)
+    {
+        if (!$id) {
+            $id = User::getID();
+            if (!$id) {
+                return [];
+            }
+        }
+        $f = ORM::for_table('tbl_customers_fields')->where('field_name', $name)->where('customer_id', $id)->find_one();
+        if ($f) {
+            return $f['field_value'];
+        }
+        return '';
+    }
+
+    public static function getAttributes($endWith, $id = 0)
+    {
+        if (!$id) {
+            $id = User::getID();
+            if (!$id) {
+                return [];
+            }
+        }
+        $attrs = [];
+        $f = ORM::for_table('tbl_customers_fields')->where_like('field_name', "%$endWith")->where('customer_id', $id)->find_many();
+        if ($f) {
+            foreach ($f as $k) {
+                $attrs[$k['field_name']] = $k['field_value'];
+            }
+            return $attrs;
+        }
+        return [];
+    }
+
+    public static function setCookie($uid)
+    {
+        global $db_password;
+        if (isset($uid)) {
+            $time = time();
+            setcookie('uid', $uid . '.' . $time . '.' . sha1($uid . '.' . $time . '.' . $db_password), time() + 86400 * 30);
+        }
+    }
+
+    public static function removeCookie()
+    {
+        if (isset($_COOKIE['uid'])) {
+            setcookie('uid', '', time() - 86400);
+        }
+    }
+
+    public static function _info($id = 0)
+    {
+        if (!$id) {
+            $id = User::getID();
+        }
        $d = ORM::for_table('tbl_customers')->find_one($id);

-        if(empty($d['username'])){
+        if (empty($d['username'])) {
            r2(U . 'logout', 'd', '');
        }
        return $d;
    }

-    public static function _billing()
+    public static function _billing($id = 0)
    {
-        $id = User::getID();
-        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $id)->find_many();
+        if (!$id) {
+            $id = User::getID();
+        }
+        $d = ORM::for_table('tbl_user_recharges')
+            ->select('tbl_user_recharges.id', 'id')
+            ->select('customer_id')
+            ->select('username')
+            ->select('plan_id')
+            ->select('namebp')
+            ->select('recharged_on')
+            ->select('recharged_time')
+            ->select('expiration')
+            ->select('time')
+            ->select('status')
+            ->select('method')
+            ->select('tbl_user_recharges.routers', 'routers')
+            ->select('tbl_user_recharges.type', 'type')
+            ->select('admin_id')
+            ->select('prepaid')
+            ->where('customer_id', $id)
+            ->join('tbl_plans', array('tbl_plans.id', '=', 'tbl_user_recharges.plan_id'))
+            ->find_many();
        return $d;
    }
 }
--- a/system/boot.php
+++ b/system/boot.php
@ -78,9 +78,9 @@ $ui->assign('_domain', str_replace('www.', '', parse_url(APP_URL, PHP_URL_HOST))
 $ui->assign('_url', APP_URL . '/index.php?_route=');
 $ui->assign('_path', __DIR__);
 $ui->assign('_c', $config);
-$ui->assign('UPLOAD_PATH', $UPLOAD_PATH);
-$ui->assign('CACHE_PATH', $CACHE_PATH);
-$ui->assign('PAGES_PATH', $PAGES_PATH);
+$ui->assign('UPLOAD_PATH', str_replace($root_path, '',  $UPLOAD_PATH));
+$ui->assign('CACHE_PATH', str_replace($root_path, '',  $CACHE_PATH));
+$ui->assign('PAGES_PATH', str_replace($root_path, '',  $PAGES_PATH));
 $ui->assign('_system_menu', 'dashboard');

 function _msglog($type, $msg)
--- a/system/controllers/admin.php
+++ b/system/controllers/admin.php
@ -5,6 +5,10 @@
 *  by https://t.me/ibnux
 **/

+if(Admin::getID()){
+    r2(U.'dashboard');
+}
+
 if (isset($routes['1'])) {
    $do = $routes['1'];
 } else {
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@ -38,10 +38,18 @@ switch ($action) {
    case 'plan':
        $server = _post('server');
        $jenis = _post('jenis');
-        if($server=='radius'){
-            $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->where('enabled', '1')->find_many();
+        if(in_array($admin['user_type'], array('SuperAdmin', 'Admin'))){
+            if($server=='radius'){
+                $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->find_many();
+            }else{
+                $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->find_many();
+            }
        }else{
-            $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->where('enabled', '1')->find_many();
+            if($server=='radius'){
+                $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->where('enabled', '1')->find_many();
+            }else{
+                $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->where('enabled', '1')->find_many();
+            }
        }
        $ui->assign('d', $d);

--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@ -12,6 +12,9 @@ $ui->assign('_system_menu', 'customers');
 $action = $routes['1'];
 $ui->assign('_admin', $admin);

+if (empty($action)) {
+    $action = 'list';
+}

 switch ($action) {
    case 'list':
@ -45,7 +48,7 @@ switch ($action) {

    case 'csv':
        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $cs = ORM::for_table('tbl_customers')
            ->select('tbl_customers.id', 'id')
@ -83,29 +86,63 @@ switch ($action) {
        }
        break;
    case 'add':
-		if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        run_hook('view_add_customer'); #HOOK
        $ui->display('customers-add.tpl');
        break;
    case 'recharge':
-		if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $id_customer  = $routes['2'];
        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
        if ($b) {
-            if (Package::rechargeUser($id_customer, $b['routers'], $b['plan_id'], "Recharge", $admin['fullname'])) {
-                r2(U . 'customers/view/' . $id_customer, 's', 'Success Recharge Customer');
-            } else {
-                r2(U . 'customers/view/' . $id_customer, 'e', 'Customer plan is inactive');
+            $gateway = 'Recharge';
+            $channel = $admin['fullname'];
+            $cust = User::_info($id_customer);
+            $plan = ORM::for_table('tbl_plans')->find_one($b['plan_id']);
+            $add_cost = 0;
+            $add_rem = User::getAttribute("Additional Remaining", $id_customer);
+            if($add_rem != 0){
+                $add_cost = User::getAttribute("Additional Cost", $id_customer);
+                if (empty($add_cost)) {
+                    $add_cost = 0;
+                }
            }
+            if ($using == 'balance' && $config['enable_balance'] == 'yes') {
+                if (!$cust) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Customer not found'));
+                }
+                if (!$plan) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Plan not found'));
+                }
+                if ($cust['balance'] < ($plan['price'] + $add_cost)) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('insufficient balance'));
+                }
+                $gateway = 'Recharge Balance';
+            }
+            if ($using == 'zero') {
+                $zero = 1;
+                $gateway = 'Recharge Zero';
+            }
+            $bills = User::getAttributes("Bill", $id_customer);
+            $ui->assign('bills', $bills);
+            $ui->assign('add_cost', $add_cost);
+            $ui->assign('add_rem', $add_rem);
+            $ui->assign('cust', $cust);
+            $ui->assign('gateway', $gateway);
+            $ui->assign('channel', $channel);
+            $ui->assign('server', $b['routers']);
+            $ui->assign('using', 'cash');
+            $ui->assign('plan', $plan);
+            $ui->display('recharge-confirm.tpl');
        }
        r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
    case 'deactivate':
        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $id_customer  = $routes['2'];
        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
@ -212,8 +249,8 @@ switch ($action) {
        }
        break;
    case 'edit':
-		if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent'])) {
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $id  = $routes['2'];
        run_hook('edit_customer'); #HOOK
@ -233,7 +270,7 @@ switch ($action) {

    case 'delete':
        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-            _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $id  = $routes['2'];
        run_hook('delete_customer'); #HOOK
@ -274,7 +311,7 @@ switch ($action) {
                } catch (Throwable $e) {
                }
                try {
-                    $c->delete();
+                    if ($c) $c->delete();
                } catch (Exception $e) {
                } catch (Throwable $e) {
                }
@ -462,6 +499,7 @@ switch ($action) {
                    // Delete the Customers Attributes with the given field name
                    ORM::for_table('tbl_customers_fields')
                        ->where('field_name', $fieldName)
+                        ->where('customer_id', $id)
                        ->delete_many();
                }
            }
@ -495,7 +533,7 @@ switch ($action) {
                    }
                }
            }
-            r2(U . 'customers/list', 's', 'User Updated Successfully');
+            r2(U . 'customers/view/' . $id, 's', 'User Updated Successfully');
        } else {
            r2(U . 'customers/edit/' . $id, 'e', $msg);
        }
--- a/system/controllers/dashboard.php
+++ b/system/controllers/dashboard.php
@ -16,13 +16,18 @@ $first_day_month = date('Y-m-01');
 $mdate = date('Y-m-d');
 $month_n = date('n');

-$iday = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->sum('price');
+$iday = ORM::for_table('tbl_transactions')
+    ->where('recharged_on', $mdate)
+    ->where_not_equal('method', 'Customer - Balance')
+    ->where_not_equal('method', 'Recharge Balance - Administrator') 
+    ->sum('price');
+
 if ($iday == '') {
    $iday = '0.00';
 }
 $ui->assign('iday', $iday);

-$imonth = ORM::for_table('tbl_transactions')->where_gte('recharged_on', $first_day_month)->where_lte('recharged_on', $mdate)->sum('price');
+$imonth = ORM::for_table('tbl_transactions')->where_not_equal('method', 'Customer - Balance')->where_not_equal('method', 'Recharge Balance - Administrator')->where_gte('recharged_on', $first_day_month)->where_lte('recharged_on', $mdate)->sum('price');
 if ($imonth == '') {
    $imonth = '0.00';
 }
@ -144,6 +149,8 @@ if (file_exists($cacheMSfile) && time() - filemtime($cacheMSfile) < 43200) {
        ->select_expr('MONTH(recharged_on)', 'month')
        ->select_expr('SUM(price)', 'total')
        ->where_raw("YEAR(recharged_on) = YEAR(CURRENT_DATE())") // Filter by the current year
+        ->where_not_equal('method', 'Customer - Balance')
+        ->where_not_equal('method', 'Recharge Balance - Administrator') 
        ->group_by_expr('MONTH(recharged_on)')
        ->find_many();

--- a/system/controllers/default.php
+++ b/system/controllers/default.php
@ -4,5 +4,10 @@
 *  by https://t.me/ibnux
 **/

-
-r2(APP_URL.'/index.php?_route=dashboard');
+if(Admin::getID()){
+    r2(U.'dashboard');
+}if(User::getID()){
+    r2(U.'home');
+}else{
+    r2(U.'login');
+}
--- a/system/controllers/export.php
+++ b/system/controllers/export.php
@ -62,10 +62,11 @@ switch ($action) {
        $title = ' Reports [' . $mdate . ']';
        $title = str_replace('-', ' ', $title);

+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
        if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
        } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
        }

        if ($x) {
@ -169,7 +170,7 @@ $style
 $html
 EOF;
            $mpdf->WriteHTML($nhtml);
-            $mpdf->Output(date('Y-m-d') . Package::_raid(4) . '.pdf', 'D');
+            $mpdf->Output(date('Ymd_His') . '.pdf', 'D');
        } else {
            echo 'No Data';
        }
@ -234,10 +235,12 @@ EOF;

        $title = ' Reports [' . $mdate . ']';
        $title = str_replace('-', ' ', $title);
+
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
        if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
        } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
        }

        if ($x) {
@ -341,7 +344,7 @@ $style
 $html
 EOF;
            $mpdf->WriteHTML($nhtml);
-            $mpdf->Output(date('Y-m-d') . Package::_raid(4) . '.pdf', 'D');
+            $mpdf->Output(date('Ymd_His') . '.pdf', 'D');
        } else {
            echo 'No Data';
        }
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@ -99,9 +99,6 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
            if(!$plan['enabled']){
                r2(U . "home", 'e', 'Plan is not exists');
            }
-            if($plan['allow_purchase'] != 'yes'){
-                r2(U . "home", 'e', 'Cannot recharge this plan');
-            }
            if ($user['balance'] > $plan['price']) {
                r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
            } else {
--- a/system/controllers/login.php
+++ b/system/controllers/login.php
@ -5,6 +5,10 @@
 *  by https://t.me/ibnux
 **/

+if(User::getID()){
+    r2(U.'home');
+}
+
 if (isset($routes['1'])) {
    $do = $routes['1'];
 } else {
--- a/system/controllers/order.php
+++ b/system/controllers/order.php
@ -37,7 +37,7 @@ switch ($action) {
        }
        $ui->assign('_title', 'Top Up');
        $ui->assign('_system_menu', 'balance');
-        $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('allow_purchase', 'yes')->find_many();
+        $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('prepaid', 'yes')->find_many();
        $ui->assign('plans_balance', $plans_balance);
        $ui->display('user-orderBalance.tpl');
        break;
@ -49,24 +49,24 @@ switch ($action) {
        $ui->assign('_system_menu', 'package');
        if (!empty($_SESSION['nux-router'])) {
            if ($_SESSION['nux-router'] == 'radius') {
-                $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
-                $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('allow_purchase', 'yes')->find_many();
+                $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+                $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
            } else {
                $routers = ORM::for_table('tbl_routers')->where('id', $_SESSION['nux-router'])->find_many();
                $rs = [];
                foreach ($routers as $r) {
                    $rs[] = $r['name'];
                }
-                $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
-                $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->where('allow_purchase', 'yes')->find_many();
+                $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+                $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
            }
        } else {
-            $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
-            $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('allow_purchase', 'yes')->find_many();
+            $radius_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+            $radius_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();

            $routers = ORM::for_table('tbl_routers')->find_many();
-            $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('allow_purchase', 'yes')->find_many();
-            $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('allow_purchase', 'yes')->find_many();
+            $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
+            $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
        }
        $ui->assign('routers', $routers);
        $ui->assign('radius_pppoe', $radius_pppoe);
@ -114,7 +114,7 @@ switch ($action) {
            run_hook('customer_check_payment_status'); #HOOK
            include $PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $trx['gateway'] . '.php';
            call_user_func($trx['gateway'] . '_validate_config');
-            call_user_func($config['payment_gateway'] . '_get_status', $trx, $user);
+            call_user_func($trx['gateway'] . '_get_status', $trx, $user);
        } else if ($routes['3'] == 'cancel') {
            run_hook('customer_cancel_payment'); #HOOK
            $trx->pg_paid_response = '{}';
@ -142,7 +142,7 @@ switch ($action) {
        $ui->display('user-orderView.tpl');
        break;
    case 'pay':
-        if ($_c['enable_balance'] != 'yes' && $config['allow_balance_transfer'] != 'yes') {
+        if ($config['enable_balance'] != 'yes') {
            r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
        }
        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
@ -152,9 +152,6 @@ switch ($action) {
        if (!$plan['enabled']) {
            r2(U . "home", 'e', 'Plan is not exists');
        }
-        if ($plan['allow_purchase'] != 'yes') {
-            r2(U . "home", 'e', 'Cannot recharge this plan');
-        }
        if ($routes['2'] == 'radius') {
            $router_name = 'radius';
        } else {
@ -176,7 +173,7 @@ switch ($action) {
        }
        break;
    case 'send':
-        if ($_c['enable_balance'] != 'yes') {
+        if ($config['enable_balance'] != 'yes') {
            r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
        }
        $ui->assign('_title', Lang::T('Buy for friend'));
@ -188,9 +185,6 @@ switch ($action) {
        if (!$plan['enabled']) {
            r2(U . "home", 'e', 'Plan is not exists');
        }
-        if ($plan['allow_purchase'] != 'yes') {
-            r2(U . "home", 'e', 'Cannot recharge this plan');
-        }
        if ($routes['2'] == 'radius') {
            $router_name = 'radius';
        } else {
@ -266,19 +260,49 @@ switch ($action) {
        $ui->assign('plan', $plan);
        $ui->display('user-sendPlan.tpl');
        break;
-    case 'buy':
+    case 'gateway':
+        $ui->assign('_title', Lang::T('Select Payment Gateway'));
+        $ui->assign('_system_menu', 'package');
        if (strpos($user['email'], '@') === false) {
            r2(U . 'accounts/profile', 'e', Lang::T("Please enter your email address"));
        }
-        if ($config['payment_gateway'] == 'none') {
-            r2(U . 'home', 'e', Lang::T("No Payment Gateway Available"));
+        $pgs = array_values(explode(',', $config['payment_gateway']));
+        if(count($pgs)==0){
+            sendTelegram("Payment Gateway not set, please set it in Settings");
+            _log(Lang::T("Payment Gateway not set, please set it in Settings"));
+            r2(U . "home", 'e', Lang::T("Failed to create Transaction.."));
        }
-        if (!file_exists($PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $config['payment_gateway'] . '.php')) {
-            r2(U . 'home', 'e', Lang::T("No Payment Gateway Available"));
+        if(count($pgs)>1){
+            $ui->assign('pgs',$pgs );
+            //$ui->assign('pgs', $pgs);
+            $ui->assign('route2', $routes[2]);
+            $ui->assign('route3', $routes[3]);
+
+            //$ui->assign('plan', $plan);
+            $ui->display('user-selectGateway.tpl');
+            break;
+        }else{
+            if(empty($pgs[0])){
+                sendTelegram("Payment Gateway not set, please set it in Settings");
+                _log(Lang::T("Payment Gateway not set, please set it in Settings"));
+                r2(U . "home", 'e', Lang::T("Failed to create Transaction.."));
+            }else{
+                $_POST['gateway'] = $pgs[0];
+            }
+        }
+    case 'buy':
+        $gateway = _post('gateway');
+        if (empty($gateway) && !empty($_SESSION['gateway'])) {
+            $gateway = $_SESSION['gateway'];
+        } else if (!empty($gateway)) {
+            $_SESSION['gateway'] = $gateway;
+        }
+        if (empty($gateway)) {
+            r2(U . 'order/gateway/' . $routes[2] . '/' . $routes[3], 'w', Lang::T("Please select Payment Gateway"));
        }
        run_hook('customer_buy_plan'); #HOOK
-        include $PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $config['payment_gateway'] . '.php';
-        call_user_func($config['payment_gateway'] . '_validate_config');
+        include $PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $gateway . '.php';
+        call_user_func($gateway . '_validate_config');

        if ($routes['2'] == 'radius') {
            $router['id'] = 0;
@ -289,7 +313,7 @@ switch ($action) {
            $router['id'] = 0;
            $router['name'] = 'balance';
        }
-        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->where('allow_purchase', 'yes')->find_one($routes['3']);
+        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
        if (empty($router) || empty($plan)) {
            r2(U . "order/package", 'e', Lang::T("Plan Not found"));
        }
@ -301,7 +325,7 @@ switch ($action) {
            if ($d['pg_url_payment']) {
                r2(U . "order/view/" . $d['id'], 'w', Lang::T("You already have unpaid transaction, cancel it or pay it."));
            } else {
-                if ($config['payment_gateway'] == $d['gateway']) {
+                if ($gateway == $d['gateway']) {
                    $id = $d['id'];
                } else {
                    $d->status = 4;
@ -312,7 +336,7 @@ switch ($action) {
        if (empty($id)) {
            $d = ORM::for_table('tbl_payment_gateway')->create();
            $d->username = $user['username'];
-            $d->gateway = $config['payment_gateway'];
+            $d->gateway = $gateway;
            $d->plan_id = $plan['id'];
            $d->plan_name = $plan['name_plan'];
            $d->routers_id = $router['id'];
@ -324,7 +348,7 @@ switch ($action) {
            $id = $d->id();
        } else {
            $d->username = $user['username'];
-            $d->gateway = $config['payment_gateway'];
+            $d->gateway = $gateway;
            $d->plan_id = $plan['id'];
            $d->plan_name = $plan['name_plan'];
            $d->routers_id = $router['id'];
@ -337,7 +361,7 @@ switch ($action) {
        if (!$id) {
            r2(U . "order/package/" . $d['id'], 'e', Lang::T("Failed to create Transaction.."));
        } else {
-            call_user_func($config['payment_gateway'] . '_create_transaction', $d, $user);
+            call_user_func($gateway . '_create_transaction', $d, $user);
        }
        break;
    default:
--- a/system/controllers/paymentgateway.php
+++ b/system/controllers/paymentgateway.php
@ -8,9 +8,35 @@
 _admin();
 $ui->assign('_system_menu', 'paymentgateway');

-$action = alphanumeric($routes['1']);
+$action = alphanumeric($routes[1]);
 $ui->assign('_admin', $admin);

+if ($action == 'delete') {
+    $pg = alphanumeric($routes[2]);
+    if (file_exists($PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $pg . '.php')) {
+        deleteFile($PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR, $pg);
+    }
+    r2(U . 'paymentgateway', 's', Lang::T('Payment Gateway Deleted'));
+}
+
+if (_post('save') == 'actives') {
+    $pgs = '';
+    if(is_array($_POST['pgs'])){
+        $pgs = implode(',', $_POST['pgs']);
+    }
+    $d = ORM::for_table('tbl_appconfig')->where('setting', 'payment_gateway')->find_one();
+    if ($d) {
+        $d->value = $pgs;
+        $d->save();
+    } else {
+        $d = ORM::for_table('tbl_appconfig')->create();
+        $d->setting = 'payment_gateway';
+        $d->value = $pgs;
+        $d->save();
+    }
+    r2(U . 'paymentgateway', 's', Lang::T('Payment Gateway saved successfully'));
+}
+
 if (file_exists($PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $action . '.php')) {
    include $PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $action . '.php';
    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
@ -36,22 +62,22 @@ if (file_exists($PAYMENTGATEWAY_PATH . DIRECTORY_SEPARATOR . $action . '.php'))
                $pgs[] = str_replace('.php', '', $file);
            }
        }
-        if (isset($_POST['payment_gateway'])) {
-            $payment_gateway = _post('payment_gateway');
-            $d = ORM::for_table('tbl_appconfig')->where('setting', 'payment_gateway')->find_one();
-            if ($d) {
-                $d->value = $payment_gateway;
-                $d->save();
-            } else {
-                $d = ORM::for_table('tbl_appconfig')->create();
-                $d->setting = 'payment_gateway';
-                $d->value = $payment_gateway;
-                $d->save();
-            }
-            r2(U . 'paymentgateway', 's', Lang::T('Payment Gateway saved successfully'));
-        }
        $ui->assign('_title', 'Payment Gateway Settings');
        $ui->assign('pgs', $pgs);
+        $ui->assign('actives', explode(',', $config['payment_gateway']));
        $ui->display('paymentgateway.tpl');
    }
 }
+
+
+function deleteFile($path, $name)
+{
+    $files = scandir($path);
+    foreach ($files as $file) {
+        if (is_file($path . $file) && strpos($file, $name) !== false) {
+            unlink($path . $file);
+        } else if (is_dir($path . $file) && !in_array($file, ['.', '..'])) {
+            deleteFile($path . $file . DIRECTORY_SEPARATOR, $name);
+        }
+    }
+}
--- a/system/controllers/pluginmanager.php
+++ b/system/controllers/pluginmanager.php
@ -32,9 +32,55 @@ if (file_exists($cache) && time() - filemtime($cache) < (24 * 60 * 60)) {
    file_put_contents($cache, $data);
    $json = json_decode($data, true);
 }
-
 switch ($action) {
+    case 'delete':
+        if (!is_writeable($CACHE_PATH)) {
+            r2(U . "pluginmanager", 'e', 'Folder cache/ is not writable');
+        }
+        if (!is_writeable($PLUGIN_PATH)) {
+            r2(U . "pluginmanager", 'e', 'Folder plugin/ is not writable');
+        }
+        set_time_limit(-1);
+        $tipe = $routes['2'];
+        $plugin = $routes['3'];
+        $file = $CACHE_PATH . DIRECTORY_SEPARATOR . $plugin . '.zip';
+        if (file_exists($file)) unlink($file);
+        if ($tipe == 'plugin') {
+            foreach ($json['plugins'] as $plg) {
+                if ($plg['id'] == $plugin) {
+                    $fp = fopen($file, 'w+');
+                    $ch = curl_init($plg['github'] . '/archive/refs/heads/master.zip');
+                    curl_setopt($ch, CURLOPT_POST, 0);
+                    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+                    curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+                    curl_setopt($ch, CURLOPT_FILE, $fp);
+                    curl_exec($ch);
+                    curl_close($ch);
+                    fclose($fp);

+                    $zip = new ZipArchive();
+                    $zip->open($file);
+                    $zip->extractTo($CACHE_PATH);
+                    $zip->close();
+                    $folder = $CACHE_PATH . File::pathFixer('/' . $plugin . '-main/');
+                    if (!file_exists($folder)) {
+                        $folder = $CACHE_PATH . File::pathFixer('/' . $plugin . '-master/');
+                    }
+                    if (!file_exists($folder)) {
+                        r2(U . "pluginmanager", 'e', 'Extracted Folder is unknown');
+                    }
+                    scanAndRemovePath($folder, $PLUGIN_PATH . DIRECTORY_SEPARATOR);
+                    File::deleteFolder($folder);
+                    unlink($file);
+                    r2(U . "pluginmanager", 's', 'Plugin ' . $plugin . ' has been deleted');
+                    break;
+                }
+            }
+            break;
+        }
+        break;
    case 'install':
        if (!is_writeable($CACHE_PATH)) {
            r2(U . "pluginmanager", 'e', 'Folder cache/ is not writable');
@ -45,7 +91,7 @@ switch ($action) {
        set_time_limit(-1);
        $tipe = $routes['2'];
        $plugin = $routes['3'];
-        $file = $CACHE_PATH . File::pathFixer('/') . $plugin . '.zip';
+        $file = $CACHE_PATH . DIRECTORY_SEPARATOR . $plugin . '.zip';
        if (file_exists($file)) unlink($file);
        if ($tipe == 'plugin') {
            foreach ($json['plugins'] as $plg) {
@ -127,3 +173,24 @@ switch ($action) {
        $ui->assign('pgs', $json['payment_gateway']);
        $ui->display('plugin-manager.tpl');
 }
+
+
+function scanAndRemovePath($source, $target)
+{
+    $files = scandir($source);
+    foreach ($files as $file) {
+        if (is_file($source . $file)) {
+            if(file_exists($target.$file)){
+                unlink($target . $file);
+            }
+        } else if (is_dir($source . $file) && !in_array($file, ['.', '..'])) {
+            scanAndRemovePath($source. $file. DIRECTORY_SEPARATOR, $target. $file. DIRECTORY_SEPARATOR);
+            if(file_exists($target.$file)){
+                rmdir($target . $file);
+            }
+        }
+    }
+    if(file_exists($target)){
+        rmdir($target);
+    }
+}
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@ -89,10 +89,6 @@ switch ($action) {
            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $ui->assign('xfooter', $select2_customer);
-        $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
-        $ui->assign('p', $p);
-        $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many();
-        $ui->assign('r', $r);
        if (isset($routes['2']) && !empty($routes['2'])) {
            $ui->assign('cust', ORM::for_table('tbl_customers')->find_one($routes['2']));
        }
@ -100,21 +96,63 @@ switch ($action) {
        $ui->display('recharge.tpl');
        break;

-    case 'recharge-user':
+    case 'recharge-confirm':
        if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
-        $id = $routes['2'];
-        $ui->assign('id', $id);
+        $id_customer = _post('id_customer');
+        $server = _post('server');
+        $planId = _post('plan');
+        $using = _post('using');

-        $c = ORM::for_table('tbl_customers')->find_many();
-        $ui->assign('c', $c);
-        $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
-        $ui->assign('p', $p);
-        $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many();
-        $ui->assign('r', $r);
-        run_hook('view_recharge_customer'); #HOOK
-        $ui->display('recharge-user.tpl');
+        $msg = '';
+        if ($id_customer == '' or $server == '' or $planId == '' or $using == '') {
+            $msg .= Lang::T('All field is required') . '<br>';
+        }
+
+        if ($msg == '') {
+            $gateway = 'Recharge';
+            $channel = $admin['fullname'];
+            $cust = User::_info($id_customer);
+            $plan = ORM::for_table('tbl_plans')->find_one($planId);
+            $add_cost = 0;
+            $add_rem = User::getAttribute("Additional Remaining", $id_customer);
+            if($add_rem != 0){
+                $add_cost = User::getAttribute("Additional Cost", $id_customer);
+                if (empty($add_cost)) {
+                    $add_cost = 0;
+                }
+            }
+            if ($using == 'balance' && $config['enable_balance'] == 'yes') {
+                if (!$cust) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Customer not found'));
+                }
+                if (!$plan) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Plan not found'));
+                }
+                if ($cust['balance'] < ($plan['price'] + $add_cost)) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('insufficient balance'));
+                }
+                $gateway = 'Recharge Balance';
+            }
+            if ($using == 'zero') {
+                $zero = 1;
+                $gateway = 'Recharge Zero';
+            }
+            $bills = User::getAttributes("Bill", $id_customer);
+            $ui->assign('bills', $bills);
+            $ui->assign('add_cost', $add_cost);
+            $ui->assign('add_rem', $add_rem);
+            $ui->assign('cust', $cust);
+            $ui->assign('gateway', $gateway);
+            $ui->assign('channel', $channel);
+            $ui->assign('server', $server);
+            $ui->assign('using', $using);
+            $ui->assign('plan', $plan);
+            $ui->display('recharge-confirm.tpl');
+        } else {
+            r2(U . 'prepaid/recharge', 'e', $msg);
+        }
        break;

    case 'recharge-post':
@ -122,24 +160,53 @@ switch ($action) {
            _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
        }
        $id_customer = _post('id_customer');
-        $type = _post('type');
        $server = _post('server');
-        $plan = _post('plan');
-        $date_only = date("Y-m-d");
-        $time = date("H:i:s");
+        $planId = _post('plan');
+        $using = _post('using');

        $msg = '';
-        if ($id_customer == '' or $type == '' or $server == '' or $plan == '') {
-            $msg .= 'All field is required' . '<br>';
+        if ($id_customer == '' or $server == '' or $planId == '' or $using == '') {
+            $msg .= Lang::T('All field is required') . '<br>';
        }

        if ($msg == '') {
-            if (Package::rechargeUser($id_customer, $server, $plan, "Recharge", $admin['fullname'])) {
-                $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
-                $in = ORM::for_table('tbl_transactions')->where('username', $c['username'])->order_by_desc('id')->find_one();
+            $gateway = 'Recharge';
+            $channel = $admin['fullname'];
+            $cust = User::_info($id_customer);
+            $add_cost = 0;
+            $add_rem = User::getAttribute("Additional Remaining", $id_customer);
+            if($add_rem != 0){
+                $add_cost = User::getAttribute("Additional Cost", $id_customer);
+                if (empty($add_cost)) {
+                    $add_cost = 0;
+                }
+            }
+            if ($using == 'balance' && $config['enable_balance'] == 'yes') {
+                $plan = ORM::for_table('tbl_plans')->find_one($planId);
+                if (!$cust) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Customer not found'));
+                }
+                if (!$plan) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('Plan not found'));
+                }
+                if ($cust['balance'] < ($plan['price'] + $add_cost)) {
+                    r2(U . 'prepaid/recharge', 'e', Lang::T('insufficient balance'));
+                }
+                $gateway = 'Recharge Balance';
+            }
+            if ($using == 'zero') {
+                $add_cost = 0;
+                $zero = 1;
+                $gateway = 'Recharge Zero';
+            }
+            if (Package::rechargeUser($id_customer, $server, $planId, $gateway, $channel)) {
+                if ($using == 'balance') {
+                    Balance::min($cust['id'], $plan['price'] + $add_cost);
+                }
+                $in = ORM::for_table('tbl_transactions')->where('username', $cust['username'])->order_by_desc('id')->find_one();
                Package::createInvoice($in);
                $ui->display('invoice.tpl');
-                _log('[' . $admin['username'] . ']: ' . 'Recharge ' . $c['username'] . ' [' . $in['plan_name'] . '][' . Lang::moneyFormat($in['price']) . ']', $admin['user_type'], $admin['id']);
+                _log('[' . $admin['username'] . ']: ' . 'Recharge ' . $cust['username'] . ' [' . $in['plan_name'] . '][' . Lang::moneyFormat($in['price']) . ']', $admin['user_type'], $admin['id']);
            } else {
                r2(U . 'prepaid/recharge', 'e', "Failed to recharge account");
            }
@ -193,7 +260,11 @@ switch ($action) {
        $d = ORM::for_table('tbl_user_recharges')->find_one($id);
        if ($d) {
            $ui->assign('d', $d);
-            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
+            if (in_array($admin['user_type'], array('SuperAdmin', 'Admin'))) {
+                $p = ORM::for_table('tbl_plans')->where_not_equal('type', 'Balance')->find_many();
+            } else {
+                $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
+            }
            $ui->assign('p', $p);
            run_hook('view_edit_customer_plan'); #HOOK
            $ui->assign('_title', 'Edit Plan');
@ -283,7 +354,7 @@ switch ($action) {
        break;

    case 'voucher':
-        $ui->assign('_title', Lang::T('Prepaid Vouchers'));
+        $ui->assign('_title', Lang::T('Vouchers'));
        $limit = 10;
        $page = _get('p', 0);
        $pageNow = $page * $limit;
@ -669,7 +740,11 @@ switch ($action) {
        }
        $ui->assign('_title', Lang::T('Refill Balance'));
        $ui->assign('xfooter', $select2_customer);
-        $ui->assign('p', ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->find_many());
+        if (in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
+            $ui->assign('p', ORM::for_table('tbl_plans')->where('type', 'Balance')->find_many());
+        } else {
+            $ui->assign('p', ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->find_many());
+        }
        run_hook('view_deposit'); #HOOK
        $ui->display('deposit.tpl');
        break;
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@ -201,7 +201,7 @@ switch ($action) {
        $pool_expired = _post('pool_expired');
        $list_expired = _post('list_expired');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');
+        $prepaid = _post('prepaid');

        $msg = '';
        if (Validator::UnsignedNumber($validity) == false) {
@ -269,7 +269,7 @@ switch ($action) {
            $d->pool_expired = $pool_expired;
            $d->list_expired = $list_expired;
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = $prepaid;
            $d->save();
            $plan_id = $d->id();

@ -309,7 +309,7 @@ switch ($action) {
        $pool_expired = _post('pool_expired');
        $list_expired = _post('list_expired');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');
+        $prepaid = _post('prepaid');
        $routers = _post('routers');
        $msg = '';
        if (Validator::UnsignedNumber($validity) == false) {
@ -374,7 +374,7 @@ switch ($action) {
            $d->pool_expired = $pool_expired;
            $d->list_expired = $list_expired;
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = $prepaid;
            $d->save();

            r2(U . 'services/hotspot', 's', Lang::T('Data Updated Successfully'));
@ -471,7 +471,7 @@ switch ($action) {
        $pool_expired = _post('pool_expired');
        $list_expired = _post('list_expired');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');
+        $prepaid = _post('prepaid');


        $msg = '';
@ -533,7 +533,7 @@ switch ($action) {
            $d->pool_expired = $pool_expired;
            $d->list_expired = $list_expired;
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = $prepaid;
            $d->save();
            $plan_id = $d->id();

@ -566,7 +566,7 @@ switch ($action) {
        $pool_expired = _post('pool_expired');
        $list_expired = _post('list_expired');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');
+        $prepaid = _post('prepaid');

        $msg = '';
        if (Validator::UnsignedNumber($validity) == false) {
@ -626,7 +626,7 @@ switch ($action) {
            $d->pool_expired = $pool_expired;
            $d->list_expired = $list_expired;
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = $prepaid;
            $d->save();

            r2(U . 'services/pppoe', 's', Lang::T('Data Updated Successfully'));
@ -678,7 +678,7 @@ switch ($action) {
        $name = _post('name');
        $price = _post('price');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');
+        $prepaid = _post('prepaid');

        $msg = '';
        if (Validator::UnsignedNumber($price) == false) {
@ -698,7 +698,7 @@ switch ($action) {
            $d->name_plan = $name;
            $d->price = $price;
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = 'yes';
            $d->save();

            r2(U . 'services/balance', 's', Lang::T('Data Updated Successfully'));
@ -710,7 +710,6 @@ switch ($action) {
        $name = _post('name');
        $price = _post('price');
        $enabled = _post('enabled');
-        $allow_purchase = _post('allow_purchase');

        $msg = '';
        if (Validator::UnsignedNumber($price) == false) {
@ -736,7 +735,7 @@ switch ($action) {
            $d->routers = '';
            $d->pool = '';
            $d->enabled = $enabled;
-            $d->allow_purchase = $allow_purchase;
+            $d->prepaid = 'yes';
            $d->save();

            r2(U . 'services/balance', 's', Lang::T('Data Created Successfully'));
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@ -30,15 +30,16 @@ switch ($action) {
            r2(U . "settings/app", 's', 'Test Telegram has been send<br>Result: ' . $result);
        }

+        $UPLOAD_URL_PATH = str_replace($root_path,'',  $UPLOAD_PATH);
        if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png')) {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
        } else {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
        }
        $ui->assign('logo', $logo);
-        if ($_c['radius_enable'] && empty($_c['radius_client'])) {
+        if ($config['radius_enable'] && empty($config['radius_client'])) {
            try {
-                $_c['radius_client'] = Radius::getClient();
+                $config['radius_client'] = Radius::getClient();
                $ui->assign('_c', $_c);
            } catch (Exception $e) {
                //ignore
@ -495,11 +496,11 @@ switch ($action) {
        $date_now = date("Y-m-d H:i:s");
        run_hook('add_admin'); #HOOK
        if ($msg == '') {
-            $password = Password::_crypt($password);
+            $passwordC = Password::_crypt($password);
            $d = ORM::for_table('tbl_users')->create();
            $d->username = $username;
            $d->fullname = $fullname;
-            $d->password = $password;
+            $d->password = $passwordC;
            $d->user_type = $user_type;
            $d->phone = $phone;
            $d->email = $email;
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@ -49,7 +49,11 @@ switch ($action) {
        $ui->display('user-activation-list.tpl');

        break;
-
+    case 'invoice':
+        $id = $routes[2];
+        $in = ORM::for_table('tbl_transactions')->where('username', $user['username'])->where('id', $id)->find_one();
+        Package::createInvoice($in);
+        $ui->display('invoice-customer.tpl');
    default:
        $ui->display('a404.tpl');
 }
--- a/system/cron.php
+++ b/system/cron.php
@ -24,7 +24,7 @@ echo "Found " . count($d) . " user(s)\n";
 run_hook('cronjob'); #HOOK

 foreach ($d as $ds) {
-    if ($ds['type'] == 'Hotspot') {
+    if ($ds['type'] == 'Hotspot') { # HOTSPOT
        $date_now = strtotime(date("Y-m-d H:i:s"));
        $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
        echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));
@ -54,14 +54,14 @@ foreach ($d as $ds) {
                }
                Mikrotik::removeHotspotActiveUser($client, $c['username']);
            }
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
+            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
            //update database user dengan status off
            $u->status = 'off';
            $u->save();

            // autorenewal from deposit
            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price'] && $p['allow_purchase'] == 'yes') {
+                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                        // if success, then get the balance
                        Balance::min($ds['customer_id'], $p['price']);
@ -82,7 +82,7 @@ foreach ($d as $ds) {
            }
        } else
            echo " : ACTIVE \r\n";
-    } else {
+    } else { # PPPOE
        $date_now = strtotime(date("Y-m-d H:i:s"));
        $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
        echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));
@ -109,14 +109,14 @@ foreach ($d as $ds) {
                }
                Mikrotik::removePpoeActive($client, $c['username']);
            }
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
+            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";

            $u->status = 'off';
            $u->save();

            // autorenewal from deposit
            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                if ($p && $p['enabled'] && $c['balance'] >= $p['price'] && $p['allow_purchase'] == 'yes') {
+                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                        // if success, then get the balance
                        Balance::min($ds['customer_id'], $p['price']);
--- a/system/cron_reminder.php
+++ b/system/cron_reminder.php
@ -40,11 +40,11 @@ foreach ($d as $ds) {
        $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
        $price = Lang::moneyFormat($p['price']);
        if ($ds['expiration'] == $day7) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
        } else if ($ds['expiration'] == $day3) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
        } else if ($ds['expiration'] == $day1) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
        }
    }
 }
--- a/system/lan/english.json
+++ b/system/lan/english.json
@ -384,7 +384,6 @@
    "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "After Customer activate voucher or login, customer will be redirected to this url",
    "Voucher_Prefix": "Voucher Prefix",
    "Voucher_activation_success__now_you_can_login": "Voucher activation success, now you can login",
-    "Client_Can_Purchase": "Client Can Purchase",
    "Buy_this__your_active_package_will_be_overwritten": "Buy this? your active package will be overwritten",
    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Pay this with Balance? your active package will be overwritten",
    "Buy_this__your_active_package_will_be_overwrite": "Buy this? your active package will be overwrite",
@ -456,5 +455,37 @@
    "Click_Here": "Click Here",
    "danger": "danger",
    "Logout_Successful": "Logout Successful",
-    "warning": "warning"
+    "warning": "warning",
+    "Users_Announcement": "Users Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
+    "Period": "Period",
+    "Add": "Add",
+    "Select_Payment_Gateway": "Select Payment Gateway",
+    "Available_Payment_Gateway": "Available Payment Gateway",
+    "Pay_Now": "Pay Now",
+    "Please_select_Payment_Gateway": "Please select Payment Gateway",
+    "Payment_Gateway_Deleted": "Payment Gateway Deleted",
+    "Payment_Gateway_not_set__please_set_it_in_Settings": "Payment Gateway not set, please set it in Settings",
+    "Failed_to_create_Transaction__": "Failed to create Transaction..",
+    "Show_To_Customer": "Type",
+    "Using": "Using",
+    "Default": "Default",
+    "Customer_Balance": "Customer Balance",
+    "Vouchers": "Vouchers",
+    "Refill_Customer": "Refill Customer",
+    "Recharge_Customer": "Recharge Customer",
+    "Plans": "Plans",
+    "PPPOE": "PPPOE",
+    "Bandwidth": "Bandwidth",
+    "Customers": "Customers",
+    "Actives": "Actives",
+    "Name": "Name",
+    "Confirm": "Confirm",
+    "Plan": "Plan",
+    "Total": "Total",
+    "Current_Cycle": "Current Cycle",
+    "Additional_Cost": "Additional Cost",
+    "Remaining": "Remaining",
+    "": ""
 }
--- a/system/updates.json
+++ b/system/updates.json
@ -69,5 +69,14 @@
    "2024.2.23" : [
        "ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;",
        "ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;"
+    ],
+    "2024.3.3" : [
+		"ALTER TABLE `tbl_plans` CHANGE `validity_unit` `validity_unit` ENUM('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;"
+    ],
+    "2024.3.12" : [
+        "ALTER TABLE `tbl_plans` CHANGE `allow_purchase` `prepaid` ENUM('yes','no') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT 'is prepaid';"
+    ],
+    "2024.3.14" : [
+        "ALTER TABLE `tbl_transactions` ADD `note` VARCHAR(256) NOT NULL DEFAULT '' COMMENT 'for note' AFTER `type`;"
    ]
 }
--- a/system/vendor/mpdf/mpdf/ttfonts/AboriginalSansREGULAR.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/AboriginalSansREGULAR.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Abyssinica_SIL.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Abyssinica_SIL.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Aegean.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Aegean.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/Aegyptus.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Aegyptus.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/Akkadian.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Akkadian.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/DBSILBR.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DBSILBR.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-Bold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-Bold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-BoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-BoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-Oblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans-Oblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSans.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansCondensed-Oblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansCondensed-Oblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-Bold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-Bold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-BoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-BoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-Oblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono-Oblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-Bold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-Bold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-BoldItalic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-BoldItalic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-Italic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif-Italic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerif.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerifCondensed-Italic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSerifCondensed-Italic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DejaVuinfo.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/DejaVuinfo.txt
@ -1,99 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. 
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
--- a/system/vendor/mpdf/mpdf/ttfonts/Dhyana-Bold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Dhyana-Bold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Dhyana-Regular.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Dhyana-Regular.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/DhyanaOFL.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/DhyanaOFL.txt
@ -1,94 +0,0 @@
-Copyright (c) 2010, Vernon Adams (vern@newtypography.co.uk),
-with Reserved Font Names "Dhyana".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeMono.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeMono.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeMonoBold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeMonoBold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeMonoBoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeMonoBoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeMonoOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeMonoOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSans.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSans.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSansBold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSansBold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSansBoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSansBoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSansOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSansOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSerif.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSerif.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSerifBold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSerifBold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSerifBoldItalic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSerifBoldItalic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/FreeSerifItalic.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/FreeSerifItalic.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/GNUFreeFontinfo.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/GNUFreeFontinfo.txt
@ -1,108 +0,0 @@
-*-text-*- 
-                          GNU FreeFont
-
-The GNU FreeFont project aims to provide a useful set of free scalable
-(i.e., OpenType) fonts covering as much as possible of the ISO 10646/Unicode
-UCS (Universal Character Set).
-
-Statement of Purpose
--------------------
-
-The practical reason for putting glyphs together in a single font face is
-to conveniently mix symbols and characters from different writing systems,
-without having to switch fonts.
-
-Coverage
--------
-
-FreeFont covers the following character sets
-
-* ISO 8859 parts 1-15
-* CEN MES-3 European Unicode Subset
-  http://www.evertype.com/standards/iso10646/pdf/cwa13873.pdf
-* IBM/Microsoft code pages 437, 850, 852, 1250, 1252 and more
-* Microsoft/Adobe Windows Glyph List 4 (WGL4)
-  http://www.microsoft.com/typography/otspec/WGL4.htm
-* KOI8-R and KOI8-RU
-* DEC VT100 graphics symbols
-* International Phonetic Alphabet
-* Arabic, Hebrew, Armenian, Georgian, Ethiopian and Thai alphabets,
-  including Arabic presentation forms A/B
-* mathematical symbols, including the whole TeX repertoire of symbols
-* APL symbols
-  etc.
-
-Editing
-------
-
-The free outline font editor, George Williams's FontForge
-<http://fontforge.sourceforge.net/> is used for editing the fonts.
-
-Design Issues
-------------
-
-Which font shapes should be made?  Historical style terms like Renaissance
-or Baroque letterforms cannot be applied beyond Latin/Cyrillic/Greek
-scripts to any greater extent than Kufi or Nashki can be applied beyond
-Arabic script; "italic" is really only meaningful for Latin letters. 
-
-However, most modern writing systems have typographic formulations for
-contrasting uniform and modulated character stroke widths, and have some
-history with "oblique", faces.  Since the advent of the typewriter, most
-have developed a typographic style with uniform-width characters.
-
-Accordingly, the FreeFont family has one monospaced - FreeMono - and two
-proportional faces (one with uniform stroke - FreeSans - and one with
-modulated stroke - FreeSerif).
-
-To make text from different writing systems look good side-by-side, each
-FreeFont face is meant to contain characters of similar style and weight.
-
-Licensing
---------
-
-Free UCS scalable fonts is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-The fonts are distributed in the hope that they will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-As a special exception, if you create a document which uses this font, and
-embed this font or unaltered portions of this font into the document, this
-font does not by itself cause the resulting document to be covered by the
-GNU General Public License. This exception does not however invalidate any
-other reasons why the document might be covered by the GNU General Public
-License. If you modify this font, you may extend this exception to your
-version of the font, but you are not obligated to do so.  If you do not
-wish to do so, delete this exception statement from your version.
-
-
-Files and their suffixes
------------------------
-
-The files with .sfd (Spline Font Database) are in FontForge's native format. 
-Please use these if you plan to modify the font files.
-
-TrueType fonts for immediate consumption are the files with the .ttf
-(TrueType Font) suffix.  These are ready to use in Xwindows based
-systems using FreeType, on Mac OS, and on older Windows systems.
-
-OpenType fonts (with suffix .otf) are for use in Windows Vista. 
-Note that although they can be installed on Linux, but many applications
-in Linux still don't support them.
-
-
--------------------------------------------------------------------------
-Primoz Peterlin, <primoz.peterlin@biofiz.mf.uni-lj.si>
-Steve White <stevan.white@googlemail.com>
-
-Free UCS scalable fonts: http://savannah.gnu.org/projects/freefont/
-$Id: README,v 1.6 2008/12/25 12:51:41 Stevan_White Exp $
--- a/system/vendor/mpdf/mpdf/ttfonts/Garuda-Bold.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Garuda-Bold.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Garuda-BoldOblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Garuda-BoldOblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Garuda-Oblique.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Garuda-Oblique.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Garuda.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Garuda.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Jomolhari-OFL.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/Jomolhari-OFL.txt
@ -1,98 +0,0 @@
-This Font Software is Copyright (c) 2006, Christopher J Fynn
-All Rights Reserved.
-
-"Jomolhari" is a Reserved Font Name for this Font Software.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.0.
-No modification of the license is permitted, only verbatim copy is allowed.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of cooperative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide an open
-framework in which fonts may be shared and improved in partnership with
-others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and sold with any software provided that the font
-names of derivative works are changed. The fonts and derivatives,
-however, cannot be released under any other type of license.
-
-DEFINITIONS
-"Font Software" refers to any and all of the following:
-	- font files
-	- data files
-	- source code
-	- build scripts
-	- documentation
-
-"Reserved Font Name" refers to the Font Software name as seen by
-users and any other names as specified after the copyright statement.
-
-"Standard Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder.
-
-"Modified Version" refers to any derivative font software made by
-adding to, deleting, or substituting -- in part or in whole --
-any of the components of the Standard Version, by changing formats
-or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Standard or Modified Versions, may be sold by itself.
-
-2) Standard or Modified Versions of the Font Software may be bundled,
-redistributed and sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s), in part or in whole, unless explicit written permission is
-granted by the Copyright Holder. This restriction applies to all 
-references stored in the Font Software, such as the font menu name and
-other font description fields, which are used to differentiate the
-font from others.
-
-4) The name(s) of the Copyright Holder or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed using this license, and may not be distributed
-under any other license.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/Jomolhari.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Jomolhari.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/KhmerOFL.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/KhmerOFL.txt
@ -1,93 +0,0 @@
-Copyright (c) 2010, Danh Hong (khmertype.blogspot.com),
-with Reserved Font Name Khmer.
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/KhmerOS.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/KhmerOS.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Lateef
+++ b/system/vendor/mpdf/mpdf/ttfonts/Lateef
@ -1,93 +0,0 @@
-Copyright (c) 2004-2011, SIL International (http://www.sil.org/),
-with Reserved Font Names "Scheherazade" and "SIL".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/LateefRegOT.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/LateefRegOT.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Lohit-Kannada.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Lohit-Kannada.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/LohitKannadaOFL.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/LohitKannadaOFL.txt
@ -1,94 +0,0 @@
-Copyright 2011-12 Lohit Fonts Project contributors
-  <http://fedorahosted.org/lohit>
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/Padauk-book.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Padauk-book.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Pothana2000.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Pothana2000.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Quivira.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Quivira.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/Sun-ExtA.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Sun-ExtA.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Sun-ExtB.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Sun-ExtB.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/SundaneseUnicode-1.0.5.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/SundaneseUnicode-1.0.5.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/SyrCOMEdessa.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/SyrCOMEdessa.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/SyrCOMEdessa_license.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/SyrCOMEdessa_license.txt
@ -1,61 +0,0 @@
-This license is derived from the Bigelow & Holmes Font License
-found at http://www.xfree86.org/current/LICENSE2.html
-
-The following reasonable modifications have been made to the
-Bigelow & Holmes Font License:
-
-* All references to Luxi have been replaced with Meltho
-
-* All references to Bigelow & Holmes Inc. and URW++ GmbH haven
-  been replaced with Beth Mardutho: The Syriac Institute
-  
-* The registered trademark notice belonging to Bigelow & Holmes
-  Inc. has been removed
-
-* Contact information has been modified to show that the
-  contact person for these fonts is the Director of the
-  Institute, George Kiraz.
-
-------------------------------------------------------------
-
-Meltho fonts and font code copyright © 2002 by Beth Mardutho: 
-The Syriac Institute. All Right Reserved.
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of these Fonts and associated documentation 
-files (the "Font Software"), to deal in the Font Software, 
-including without limitation the rights to use, copy, merge, 
-publish, distribute, sublicense, and/or sell copies of the 
-Font Software, and to permit persons to whom the Font Software 
-is furnished to do so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission 
-notice shall be included in all copies of one or more of the 
-Font Software.
-
-The Font Software may not be modified, altered, or added to, 
-and in particular the designs of glyphs or characters in the 
-Fonts may not be modified nor may additional glyphs or 
-characters be added to the Fonts. This License becomes null 
-and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY 
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE 
-AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER 
-RIGHT. IN NO EVENT SHALL BETH MARDUTHO: THE SYRIAC INSTITUTE BE 
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY 
-GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR 
-FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Beth Mardutho: 
-The Syriac Institute shall not be used in advertising or otherwise 
-to promote the sale, use or other dealings in this Font Software 
-without prior written authorization from Beth Mardutho: The 
-Syriac Institute.
-
-For further information, contact:
-George Kiraz, Director of Beth Mardutho
-gkiraz@bethmardutho.org
--- a/system/vendor/mpdf/mpdf/ttfonts/TaameyDavidCLM-LICENSE.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/TaameyDavidCLM-LICENSE.txt
@ -1,17 +0,0 @@
-This package is distributed under the terms of GNU General Public License
-version 2 (see file GNU-GPL).
---------------------------------------------------------------------
-
-"Taamey David CLM" fonts are copyright (C) 2010 by Yoram Gnat
-(gyoramg@users.sourceforge.net). All rights reserved.
-
-As a special exception, if you create a document which uses 
-this font, and embed this font or unaltered portions of this
-font into the document, this font does not by itself cause
-the resulting document to be covered by the 
-GNU General Public License. This exception does not however
-invalidate any other reasons why the document might be covered
-by the GNU General Public License. If you modify this font,
-you may extend this exception to your version of the font,
-but you are not obligated to do so. If you do not wish to do so,
-delete this exception statement from your version. 
--- a/system/vendor/mpdf/mpdf/ttfonts/TaameyDavidCLM-Medium.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/TaameyDavidCLM-Medium.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/TaiHeritagePro.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/TaiHeritagePro.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Tharlon-Regular.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Tharlon-Regular.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/TharlonOFL.txt
+++ b/system/vendor/mpdf/mpdf/ttfonts/TharlonOFL.txt
@ -1,93 +0,0 @@
-Copyright (c) 2010-2012, Sai Zin Di Di Zone (www.yunghkio.com/unicode|saiddzone@gmail.com), with Reserved Font Name 'Yunghkio'. Copyright (c) 2012, Google, Inc (http://code.google.com/p/googlefontdirectory/), with Reserved Font Name 'Arimo'. Copyright (c) 2012, Sun Tun, Ngwe Tun, Solveware Solution (http://code.google.com/p/tharlon-font|info@parabaik.info), with Reserved Font Name 'TharLon'.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/system/vendor/mpdf/mpdf/ttfonts/UnBatang_0613.ttf
+++ b/system/vendor/mpdf/mpdf/ttfonts/UnBatang_0613.ttf
--- a/system/vendor/mpdf/mpdf/ttfonts/Uthman.otf
+++ b/system/vendor/mpdf/mpdf/ttfonts/Uthman.otf
--- a/system/vendor/mpdf/mpdf/ttfonts/XB
+++ b/system/vendor/mpdf/mpdf/ttfonts/XB
--- a/system/vendor/mpdf/mpdf/ttfonts/XB
+++ b/system/vendor/mpdf/mpdf/ttfonts/XB
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibnu Maksum	68d3c9181c	View Invoice from Customer side	2024-03-14 13:40:44 +07:00
Ibnu Maksum	e206a583fd	Additional Cost, and Confirm Recharge	2024-03-14 12:14:11 +07:00
Ibnu Maksum	ca27c47b75	fix get attributes	2024-03-14 11:38:32 +07:00
Ibnu Maksum	2c67108cf1	add Additional Cycle and check if price is zero	2024-03-14 10:28:36 +07:00
Ibnu Maksum	dee4c78e93	Change Menu Names	2024-03-13 16:59:12 +07:00
Ibnu Maksum	a6c004e1cb	$day_exp	2024-03-13 16:33:06 +07:00
Ibnu Maksum	8318bb4e6b	Merge branch 'Development'	2024-03-13 16:29:44 +07:00
Ibnu Maksum	b27e0adca9	Fix onclick prepaid	2024-03-13 16:29:22 +07:00
Ibnu Maksum	2925d3a1e3	Merge branch 'Development'	2024-03-13 15:51:23 +07:00
iBNu Maksum	add28c2fca	Merge pull request #124 from Focuslinkstech/Development Update dashboard.php	2024-03-13 15:41:57 +07:00
Focuslinkstech	afbab3dd42	Update dashboard.php fix reporting	2024-03-13 09:34:57 +01:00
Ibnu Maksum	b68e4d2e68	2024.3.13	2024-03-13 14:54:36 +07:00
Ibnu Maksum	c8f4574984	Recharge with additional Cost	2024-03-13 14:53:33 +07:00
Ibnu Maksum	60c573821b	Additional Cost from Customer Attributes	2024-03-13 14:48:01 +07:00
Ibnu Maksum	e6e993cf21	Expired day postpaid	2024-03-13 14:40:47 +07:00
Ibnu Maksum	ca0edb4e17	Postpaid	2024-03-13 14:32:10 +07:00
Ibnu Maksum	ed9a411095	Fix install Plugin	2024-03-13 09:37:45 +07:00
Ibnu Maksum	c69fb1cae2	Merge branch 'Development'	2024-03-12 16:40:58 +07:00
Ibnu Maksum	d30aadc5e4	Expired Date by created date	2024-03-12 16:39:01 +07:00
Ibnu Maksum	b732cfd90e	Recharge with balance or zero cost	2024-03-12 16:39:01 +07:00
Ibnu Maksum	46a56c12e3	admin can recharge disabled plan	2024-03-12 16:39:01 +07:00
Ibnu Maksum	9b2d42610a	delete allow_purchase in cron	2024-03-12 16:39:01 +07:00
Ibnu Maksum	ef85bdb02f	Invoice number not Random	2024-03-12 16:39:01 +07:00
Ibnu Maksum	23763ed308	Period in hotspot	2024-03-12 16:39:00 +07:00
Ibnu Maksum	9fcdf04005	Show From Customer	2024-03-12 16:39:00 +07:00
Ibnu Maksum	60babfa7b5	Change button	2024-03-12 16:39:00 +07:00
Ibnu Maksum	4cdde32cb1	Multiple Payment gateway Fix	2024-03-12 16:39:00 +07:00
Ibnu Maksum	538850b323	delete button	2024-03-12 16:39:00 +07:00
Ibnu Maksum	47393b4da9	Delete Plugin	2024-03-12 16:39:00 +07:00
Ibnu Maksum	87167b7770	change path	2024-03-12 16:39:00 +07:00
Ibnu Maksum	81572a61a4	delete payment gateway	2024-03-12 16:39:00 +07:00
Ibnu Maksum	3412ecc7de	Fix Logic Multiple Payment gateway	2024-03-12 16:39:00 +07:00
Ibnu Maksum	3ab38897f9	change path to /gateway/	2024-03-12 16:39:00 +07:00
Ibnu Maksum	8c2471d1d2	delete none	2024-03-12 16:39:00 +07:00
Ibnu Maksum	b0937a424a	.htaccess Firewall	2024-03-12 16:39:00 +07:00
Ibnu Maksum	171b938d3a	Check if Period Validity	2024-03-12 16:39:00 +07:00
Focuslinkstech	61c1d25096	We are excited to introduce a new feature I am delighted to announce that a highly requested feature has been added to Nuxbill! We now support Multiple Payment Gateways, allowing customers to choose their preferred payment method. This update brings greater flexibility and convenience to our users.	2024-03-12 16:39:00 +07:00
Focuslinkstech	f885b8e8a3	Update dashboard.php Fix when user purchase services with his/her balance it wont be added as income because the balance has been added earlier	2024-03-12 16:39:00 +07:00
Ibnu Maksum	2bb664e241	Expired Date by created date	2024-03-12 15:28:32 +07:00
Ibnu Maksum	c9058769ce	Recharge with balance or zero cost	2024-03-12 15:09:00 +07:00
Ibnu Maksum	6d15437333	admin can recharge disabled plan	2024-03-12 13:58:42 +07:00
Ibnu Maksum	7c5958c8c1	delete allow_purchase in cron	2024-03-12 13:46:40 +07:00
Ibnu Maksum	1a4a0f2c10	Invoice number not Random	2024-03-12 12:12:36 +07:00
Ibnu Maksum	629d9e8ed4	Period in hotspot	2024-03-12 12:01:49 +07:00
Ibnu Maksum	b9e987570c	Show From Customer	2024-03-12 11:54:20 +07:00
Ibnu Maksum	b95788262d	Change button	2024-03-12 11:48:17 +07:00
Ibnu Maksum	3bb55320e3	Multiple Payment gateway Fix	2024-03-12 11:17:05 +07:00
Ibnu Maksum	7a9f937a9e	delete button	2024-03-12 10:43:34 +07:00
Ibnu Maksum	c00e51adda	Delete Plugin	2024-03-12 10:42:42 +07:00
Ibnu Maksum	0cc526e29a	change path	2024-03-12 10:00:40 +07:00
Ibnu Maksum	16f0642007	delete payment gateway	2024-03-12 10:00:28 +07:00
Ibnu Maksum	e1f7b324cb	Fix Logic Multiple Payment gateway	2024-03-12 09:33:45 +07:00
Ibnu Maksum	8f0ff3e786	change path to /gateway/	2024-03-12 09:24:16 +07:00
Ibnu Maksum	9023f89456	delete none	2024-03-12 09:23:59 +07:00
Ibnu Maksum	140b756994	.htaccess Firewall	2024-03-12 09:07:12 +07:00
Ibnu Maksum	ca59c89e1d	Check if Period Validity	2024-03-12 09:07:12 +07:00
iBNu Maksum	4e23918999	Merge pull request #122 from Focuslinkstech/Development We are excited to introduce a new feature	2024-03-12 09:06:43 +07:00
Focuslinkstech	758a0a99a9	We are excited to introduce a new feature I am delighted to announce that a highly requested feature has been added to Nuxbill! We now support Multiple Payment Gateways, allowing customers to choose their preferred payment method. This update brings greater flexibility and convenience to our users.	2024-03-11 09:34:25 +01:00
iBNu Maksum	b6cf9bec0b	Merge pull request #121 from Focuslinkstech/Development Update dashboard.php	2024-03-11 14:43:13 +07:00
Focuslinkstech	6e07c3ae85	Update dashboard.php Fix when user purchase services with his/her balance it wont be added as income because the balance has been added earlier	2024-03-10 22:41:48 +01:00
iBNu Maksum	ef76aadc16	Merge pull request #120 from hotspotbilling/Development fix delete customer attribute	2024-03-08 17:50:06 +07:00
iBNu Maksum	8e960107fc	Merge pull request #119 from Focuslinkstech/Development Bug Fix	2024-03-08 17:47:44 +07:00
Focuslinkstech	c4e702ee2f	Update customers.php Fix Delete the Customers Attributes with the given field name, it delete all from the table which belong to other customers	2024-03-08 10:43:07 +01:00
Focuslinkstech	08790e7295	Merge branch 'Development' of https://github.com/Focuslinkstech/phpnuxbill into Development	2024-03-08 09:37:56 +01:00
Ibnu Maksum	cfefd38a31	if ($p['validity_unit'] == 'Period') then add Expired Date	2024-03-06 12:03:24 +07:00
Ibnu Maksum	37a5ee8566	Change the view of Attributes Customer	2024-03-06 11:15:45 +07:00
Ibnu Maksum	e5c8aae758	2024.3.5	2024-03-05 16:20:18 +07:00
iBNu Maksum	99d393d0c0	Merge pull request #118 from gerandonk/Development change due date for period plan to customer field attribute	2024-03-05 16:18:32 +07:00
gerandonk	e6280d597b	change due date for period plan to customer field attribute admin can change expired date for period plan as wish before recharger customer	2024-03-05 16:08:33 +07:00
Ibnu Maksum	18db9cd280	hide if balance off	2024-03-05 11:15:38 +07:00
Ibnu Maksum	6aab647f48	Company name in login	2024-03-05 11:15:26 +07:00
Ibnu Maksum	b8b4623078	notification variable fix	2024-03-04 14:26:36 +07:00
Ibnu Maksum	6a79cff233	checkUserType when edit is neq	2024-03-04 11:30:09 +07:00
Ibnu Maksum	4c02283fd0	add full name in telegram notification	2024-03-04 10:06:19 +07:00
Ibnu Maksum	403de91fba	sendPackageNotification with customer variable	2024-03-04 10:02:23 +07:00
Ibnu Maksum	4ee3743cf3	Fix Password send to admin	2024-03-04 09:57:12 +07:00
Ibnu Maksum	77e48dae8b	add is file exists	2024-03-03 19:54:04 +07:00
Ibnu Maksum	0745532951	2024.3.3	2024-03-03 17:29:53 +07:00
Ibnu Maksum	b53116d22a	Customer Announcement	2024-03-03 17:24:01 +07:00
iBNu Maksum	f7df824145	Merge pull request #116 from gerandonk/Development Development	2024-03-03 17:11:38 +07:00
iBNu Maksum	f154322f99	Merge pull request #115 from Focuslinkstech/master improvement	2024-03-03 17:10:06 +07:00
gerandonk	a76ba6ee8b	update db for validity period	2024-03-03 11:30:34 +07:00
gerandonk	61b3f5b5f5	Add planwith validity period	2024-03-03 11:03:25 +07:00
gerandonk	b153e5b595	distinguish between announcements on the user dashboard and the login page	2024-03-03 11:00:42 +07:00
Focuslinkstech	9ab0b6a0fa	improvement just replace the save loading with css for better loading feature	2024-03-02 12:40:04 +01:00
iBNu Maksum	a7f191f058	damn, that curly bracket make error :))	2024-03-01 19:42:59 +07:00
iBNu Maksum	012a1ecfab	allow purchase = no, but can recharge	2024-03-01 16:10:01 +07:00
Ibnu Maksum	dc70a49f52	upload path	2024-03-01 13:44:46 +07:00
Ibnu Maksum	bc7380eab7	add variable to global	2024-03-01 10:36:24 +07:00
Ibnu Maksum	f4da09a26e	move hook before sending notification	2024-03-01 10:11:18 +07:00
Ibnu Maksum	de3312055a	add hook when recharge	2024-03-01 09:57:59 +07:00
Ibnu Maksum	699289662b	Fix Upload URL	2024-03-01 09:37:13 +07:00
Ibnu Maksum	bae079f71c	Fix Hook Functionality	2024-02-29 13:32:46 +07:00
Ibnu Maksum	28f4624e8d	change Customer menu	2024-02-29 11:37:54 +07:00
Ibnu Maksum	fbd215e741	Merge branch 'master' into Development	2024-02-29 09:26:19 +07:00
Ibnu Maksum	2437096473	$_c to $config in php file	2024-02-29 09:25:26 +07:00
iBNu Maksum	dfeee540cf	Fix variable $_c	2024-02-28 18:19:17 +07:00
Ibnu Maksum	a0b9e85f38	Add Expired date for reminder	2024-02-28 11:31:36 +07:00
Ibnu Maksum	08153e6ec1	Fix Buy Plan with Balance	2024-02-28 11:31:31 +07:00
Ibnu Maksum	2660f5d2d0	Dashboard 2 Column	2024-02-27 14:22:17 +07:00
Ibnu Maksum	82e67f0b83	fix Recharge	2024-02-27 13:12:53 +07:00
Ibnu Maksum	41dd0d86e7	Fix Recharge	2024-02-27 13:12:25 +07:00
Ibnu Maksum	c8004f1a27	fix update file	2024-02-27 13:10:06 +07:00
Ibnu Maksum	61edfb932a	fix wrong logic != to ==	2024-02-27 12:00:49 +07:00
Ibnu Maksum	747a67b691	2024.2.27	2024-02-27 10:39:21 +07:00
Ibnu Maksum	b938db9e5d	redirect after login	2024-02-27 10:37:41 +07:00
Ibnu Maksum	1ec8049068	fix path	2024-02-27 10:32:09 +07:00
iBNu Maksum	848dcb5caf	fix variable Admin.php	2024-02-27 07:12:02 +07:00
Focuslinkstech	afe6b34fd6	Update Package.php fix package recharge bug	2024-02-26 18:03:48 +01:00
Ibnu Maksum	fceb79bdc3	fix sql installer	2024-02-26 15:39:23 +07:00
Ibnu Maksum	83457fd9fc	Remove unused font, too big	2024-02-26 15:18:54 +07:00