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

fix postpaid invoice display from attributes

Browse Source
This commit is contained in:
gerandonk 2025-02-09 01:23:06 +07:00
parent e0884c0a5a
commit 685b325ef3
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/controllers/customers.php
View File

@ -176,6 +176,10 @@ switch ($action) {
$channel = $admin['fullname']; $channel = $admin['fullname'];
$cust = User::_info($id_customer); $cust = User::_info($id_customer);
$plan = ORM::for_table('tbl_plans')->find_one($b['plan_id']); $plan = ORM::for_table('tbl_plans')->find_one($b['plan_id']);
$add_inv = User::getAttribute("Invoice", $id_customer);
if (!empty($add_inv)) {
$plan['price'] = $add_inv;
}
$tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
$tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : null; $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : null;
$custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : null; $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : null;
@ -224,6 +228,7 @@ switch ($action) {
$ui->assign('channel', $channel); $ui->assign('channel', $channel);
$ui->assign('server', $b['routers']); $ui->assign('server', $b['routers']);
$ui->assign('plan', $plan); $ui->assign('plan', $plan);
$ui->assign('add_inv', $add_inv);
$ui->assign('csrf_token', Csrf::generateAndStoreToken()); $ui->assign('csrf_token', Csrf::generateAndStoreToken());
$ui->display('admin/plan/recharge-confirm.tpl'); $ui->display('admin/plan/recharge-confirm.tpl');
} else { } else {

4
system/controllers/order.php
View File

@ -410,6 +410,10 @@ switch ($action) {
if ($router['name'] != 'balance') { if ($router['name'] != 'balance') {
list($bills, $add_cost) = User::getBills($id_customer); list($bills, $add_cost) = User::getBills($id_customer);
} }
$add_inv = User::getAttribute("Invoice", $id_customer);
if (!empty($add_inv)) {
$plan['price'] = $add_inv;
}
if($config['enable_coupons']){ if($config['enable_coupons']){
if (!isset($_SESSION['coupon_attempts'])) { if (!isset($_SESSION['coupon_attempts'])) {

5
system/controllers/plan.php
View File

@ -107,6 +107,10 @@ switch ($action) {
$cust = User::_info($id_customer); $cust = User::_info($id_customer);
$plan = ORM::for_table('tbl_plans')->find_one($planId); $plan = ORM::for_table('tbl_plans')->find_one($planId);
list($bills, $add_cost) = User::getBills($id_customer); list($bills, $add_cost) = User::getBills($id_customer);
$add_inv = User::getAttribute("Invoice", $id_customer);
if (!empty($add_inv)) {
$plan['price'] = $add_inv;
}
// Tax calculation start // Tax calculation start
$tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no';
@ -160,6 +164,7 @@ switch ($action) {
$ui->assign('server', $server); $ui->assign('server', $server);
$ui->assign('using', $using); $ui->assign('using', $using);
$ui->assign('plan', $plan); $ui->assign('plan', $plan);
$ui->assign('add_inv', $add_inv);
$ui->display('admin/plan/recharge-confirm.tpl'); $ui->display('admin/plan/recharge-confirm.tpl');
} else { } else {
r2(getUrl('plan/recharge'), 'e', $msg); r2(getUrl('plan/recharge'), 'e', $msg);