kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotspotbilling:Development' into Development

Browse Source
This commit is contained in:
Ahmad Husein 2025-02-04 18:03:44 +07:00 committed by GitHub
commit c594cf28bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/controllers/autoload_user.php
View File

@ -79,5 +79,5 @@ switch ($action) {
} }
die(); die();
default: default:
$ui->display('404.tpl'); die();
} }

2
system/controllers/customers.php
View File

@ -225,7 +225,7 @@ switch ($action) {
$ui->assign('server', $b['routers']); $ui->assign('server', $b['routers']);
$ui->assign('plan', $plan); $ui->assign('plan', $plan);
$ui->assign('csrf_token', Csrf::generateAndStoreToken()); $ui->assign('csrf_token', Csrf::generateAndStoreToken());
$ui->display('recharge-confirm.tpl'); $ui->display('admin/plan/recharge-confirm.tpl');
} else { } else {
r2(getUrl('customers/view/') . $id_customer, 'e', 'Cannot find active plan'); r2(getUrl('customers/view/') . $id_customer, 'e', 'Cannot find active plan');
} }

4
system/controllers/plan.php
View File

@ -791,7 +791,7 @@ switch ($action) {
$ui->assign('from_id', 0); $ui->assign('from_id', 0);
$ui->assign('vpl', '3'); $ui->assign('vpl', '3');
$ui->assign('pagebreak', $voucherPerPage); $ui->assign('pagebreak', $voucherPerPage);
$ui->display('print-voucher.tpl'); $ui->display('admin/print/voucher.tpl');
} }
if ($numbervoucher == 1) { if ($numbervoucher == 1) {
@ -891,7 +891,7 @@ switch ($action) {
$content .= Lang::pad($config['note'], ' ', 2) . "\n"; $content .= Lang::pad($config['note'], ' ', 2) . "\n";
$ui->assign('_title', Lang::T('View')); $ui->assign('_title', Lang::T('View'));
$ui->assign('whatsapp', urlencode("```$content```")); $ui->assign('whatsapp', urlencode("```$content```"));
$ui->display('voucher-view.tpl'); $ui->display('admin/voucher/view.tpl');
} else { } else {
r2(getUrl('plan/voucher/'), 'e', Lang::T('Voucher Not Found')); r2(getUrl('plan/voucher/'), 'e', Lang::T('Voucher Not Found'));
} }

3
system/lan/english.json
View File

@ -1009,5 +1009,6 @@
"Payment_Date": "Payment Date", "Payment_Date": "Payment Date",
"Plan_Expiry_Date": "Plan Expiry Date", "Plan_Expiry_Date": "Plan Expiry Date",
"Make_Payment": "Make Payment", "Make_Payment": "Make Payment",
"Validity_Period": "Validity Period" "Validity_Period": "Validity Period",
"Buy_Balance_Package": "Buy Balance Package"
} }

2
version.json
View File

@ -1,3 +1,3 @@
{ {
"version": "2025.2.3" "version": "2025.2.4"
} }