diff --git a/CHANGELOG.md b/CHANGELOG.md index ab535414..0b585bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # CHANGELOG +## 2024.3.14 + +- Add Note to Invoices +- Add Additional Bill +- View Invoice from Customer side + ## 2024.3.13 - Postpaid System diff --git a/system/controllers/customers.php b/system/controllers/customers.php index c461be8c..b2624004 100644 --- a/system/controllers/customers.php +++ b/system/controllers/customers.php @@ -135,7 +135,7 @@ $ui->assign('gateway', $gateway); $ui->assign('channel', $channel); $ui->assign('server', $b['routers']); - $ui->assign('using', 'default'); + $ui->assign('using', 'cash'); $ui->assign('plan', $plan); $ui->display('recharge-confirm.tpl'); } diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php index e54139cf..a85c0a26 100644 --- a/system/controllers/voucher.php +++ b/system/controllers/voucher.php @@ -49,7 +49,11 @@ $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'); } diff --git a/system/lan/english.json b/system/lan/english.json index 01910dc9..ccf4128c 100644 --- a/system/lan/english.json +++ b/system/lan/english.json @@ -486,5 +486,6 @@ "Total": "Total", "Current_Cycle": "Current Cycle", "Additional_Cost": "Additional Cost", - "Remaining": "Remaining" + "Remaining": "Remaining", + "": "" } \ No newline at end of file diff --git a/ui/ui/invoice-customer.tpl b/ui/ui/invoice-customer.tpl new file mode 100644 index 00000000..beaf2527 --- /dev/null +++ b/ui/ui/invoice-customer.tpl @@ -0,0 +1,21 @@ +{include file="sections/user-header.tpl"} + +
+
+
+
{$in['invoice']}
+
+
+
{$invoice}
+ + {Lang::T('Finish')} + + WhatsApp +
+
+
+
+
+{include file="sections/user-footer.tpl"} \ No newline at end of file diff --git a/ui/ui/recharge-confirm.tpl b/ui/ui/recharge-confirm.tpl index f1496bcf..846ade3d 100644 --- a/ui/ui/recharge-confirm.tpl +++ b/ui/ui/recharge-confirm.tpl @@ -50,7 +50,7 @@ {$plan['validity_unit']}
  • - {Lang::T('Using')} {$using} + {Lang::T('Using')} {ucwords($using)}
  • {Lang::T('Total')}
    diff --git a/ui/ui/recharge.tpl b/ui/ui/recharge.tpl index c988f5dc..85f3ab8d 100644 --- a/ui/ui/recharge.tpl +++ b/ui/ui/recharge.tpl @@ -45,7 +45,7 @@