diff --git a/system/autoload/Package.php b/system/autoload/Package.php index 25810f4d..a81a3dab 100644 --- a/system/autoload/Package.php +++ b/system/autoload/Package.php @@ -34,8 +34,8 @@ class Package $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one(); $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one(); - if($c['status'] != 'Active'){ - _alert(Lang::T('This account status').' : '.Lang::T($c['status']),'danger', ""); + if ($c['status'] != 'Active') { + _alert(Lang::T('This account status') . ' : ' . Lang::T($c['status']), 'danger', ""); } $add_cost = 0; @@ -197,28 +197,29 @@ class Package if ($plan_id != $b['plan_id']) { $isChangePlan = true; } - if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') { - // if it same internet plan, expired will extend - 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']; - } else if ($p['validity_unit'] == 'Hrs') { - $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours'))); - $date_exp = $datetime[0]; - $time = $datetime[1]; - } else if ($p['validity_unit'] == 'Mins') { - $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes'))); - $date_exp = $datetime[0]; - $time = $datetime[1]; + if ($config['extend_expiry'] === 'yes') { + if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') { + // if it same internet plan, expired will extend + 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']; + } else if ($p['validity_unit'] == 'Hrs') { + $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours'))); + $date_exp = $datetime[0]; + $time = $datetime[1]; + } else if ($p['validity_unit'] == 'Mins') { + $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes'))); + $date_exp = $datetime[0]; + $time = $datetime[1]; + } } } - if ($isChangePlan || $b['status'] == 'off') { if ($p['is_radius']) { Radius::customerAddPlan($c, $p, "$date_exp $time"); @@ -398,25 +399,27 @@ class Package if ($plan_id != $b['plan_id']) { $isChangePlan = true; } - if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') { - // if it same internet plan, expired will extend - 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']; - } else if ($p['validity_unit'] == 'Hrs') { - $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours'))); - $date_exp = $datetime[0]; - $time = $datetime[1]; - } else if ($p['validity_unit'] == 'Mins') { - $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes'))); - $date_exp = $datetime[0]; - $time = $datetime[1]; + if ($config['extend_expiry'] === 'yes') { + if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') { + // if it same internet plan, expired will extend + 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']; + } else if ($p['validity_unit'] == 'Hrs') { + $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours'))); + $date_exp = $datetime[0]; + $time = $datetime[1]; + } else if ($p['validity_unit'] == 'Mins') { + $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes'))); + $date_exp = $datetime[0]; + $time = $datetime[1]; + } } } @@ -804,4 +807,11 @@ class Package $ui->assign('whatsapp', urlencode("```$invoice```")); $ui->assign('in', $in); } + public static function tax($price, $tax_rate = 1) + { + // Convert tax rate to decimal + $tax_rate_decimal = $tax_rate / 100; + $tax = $price * $tax_rate_decimal; + return $tax; + } } diff --git a/system/controllers/order.php b/system/controllers/order.php index c2109b86..0e25677d 100644 --- a/system/controllers/order.php +++ b/system/controllers/order.php @@ -131,7 +131,7 @@ switch ($action) { $router = Mikrotik::info($trx['routers']); $plan = ORM::for_table('tbl_plans')->find_one($trx['plan_id']); $bandw = ORM::for_table('tbl_bandwidth')->find_one($plan['id_bw']); - $invoice = ORM::for_table('tbl_transactions')->where("invoice",$trx['trx_invoice'])->find_one(); + $invoice = ORM::for_table('tbl_transactions')->where("invoice", $trx['trx_invoice'])->find_one(); $ui->assign('invoice', $invoice); $ui->assign('trx', $trx); $ui->assign('router', $router); @@ -148,9 +148,6 @@ switch ($action) { r2(U . "voucher/invoice/"); die(); } - if($user['status'] != 'Active'){ - _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', ""); - } $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']); if (empty($plan)) { r2(U . "order/package", 'e', Lang::T("Plan Not found")); @@ -163,30 +160,48 @@ switch ($action) { } else { $router_name = $plan['routers']; } + list($bills, $add_cost) = User::getBills($id_customer); - if ($plan && $plan['enabled'] && $user['balance'] >= $plan['price']) { + + // Tax calculation start + $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; + $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; + + if ($tax_rate_setting === 'custom') { + $tax_rate = $custom_tax_rate; + } else { + $tax_rate = $tax_rate_setting; + } + + if ($tax_enable === 'yes') { + $tax = Package::tax($plan['price'], $tax_rate); + } else { + $tax = 0; + } + // Tax calculation stop + + if ($plan && $plan['enabled'] && $user['balance'] >= $plan['price'] + $tax) { if (Package::rechargeUser($user['id'], $router_name, $plan['id'], 'Customer', 'Balance')) { // if success, then get the balance - Balance::min($user['id'], $plan['price'] + $add_cost); + Balance::min($user['id'], $plan['price'] + $add_cost + $tax); App::setToken($_GET['stoken'], "success"); r2(U . "voucher/invoice/", 's', Lang::T("Success to buy package")); } else { r2(U . "order/package", 'e', Lang::T("Failed to buy package")); Message::sendTelegram("Buy Package with Balance Failed\n\n#u$c[username] #buy \n" . $plan['name_plan'] . "\nRouter: " . $router_name . - "\nPrice: " . $p['price']); + "\nPrice: " . $plan['price'] + $tax); } } else { r2(U . "home", 'e', 'Plan is not exists'); } break; + case 'send': if ($config['enable_balance'] != 'yes') { r2(U . "order/package", 'e', Lang::T("Balance not enabled")); } - if($user['status'] != 'Active'){ - _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', ""); - } $ui->assign('_title', Lang::T('Buy for friend')); $ui->assign('_system_menu', 'package'); $plan = ORM::for_table('tbl_plans')->find_one($routes['3']); @@ -201,6 +216,27 @@ switch ($action) { } else { $router_name = $plan['routers']; } + $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; + + if ($tax_rate_setting === 'custom') { + $tax_rate = $custom_tax_rate; + } else { + $tax_rate = $tax_rate_setting; + } + + $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; + + if ($tax_enable === 'yes') { + $tax = Package::tax($plan['price'], $tax_rate); + $ui->assign('tax', $tax); + } else { + $tax = 0; + } + + // Add tax to plan price + $plan['price'] += $tax; + if (isset($_POST['send']) && $_POST['send'] == 'plan') { $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one(); list($bills, $add_cost) = User::getBills($target['id']); @@ -209,6 +245,7 @@ switch ($action) { $ui->assign('add_cost', $add_cost); $plan['price'] += $add_cost; } + if (!$target) { r2(U . 'home', 'd', Lang::T('Username not found')); } @@ -269,15 +306,22 @@ switch ($action) { $d->save(); r2(U . "order/view/$trx_id", 's', Lang::T("Success to send package")); } else { - r2(U . "order/package", 'e', Lang::T("Failed to Send package")); - Message::sendTelegram("Send Package with Balance Failed\n\n#u$user[username] #send \n" . $plan['name_plan'] . + $errorMessage = "Send Package with Balance Failed\n\n#u$user[username] #send \n" . $plan['name_plan'] . "\nRouter: " . $router_name . - "\nPrice: " . $plan['price']); + "\nPrice: " . $plan['price']; + + if ($tax_enable === 'yes') { + $errorMessage .= "\nTax: " . $tax; + } + + r2(U . "order/package", 'e', Lang::T("Failed to Send package")); + Message::sendTelegram($errorMessage); } } $ui->assign('username', $_GET['u']); $ui->assign('router', $router_name); $ui->assign('plan', $plan); + $ui->assign('tax', $tax); $ui->display('user-sendPlan.tpl'); break; case 'gateway': @@ -286,6 +330,16 @@ switch ($action) { if (strpos($user['email'], '@') === false) { r2(U . 'accounts/profile', 'e', Lang::T("Please enter your email address")); } + $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; + $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; + if ($tax_rate_setting === 'custom') { + $tax_rate = $custom_tax_rate; + } else { + $tax_rate = $tax_rate_setting; + } + $plan = ORM::for_table('tbl_plans')->find_one($routes['3']); + $tax = Package::tax($plan['price'], $tax_rate); $pgs = array_values(explode(',', $config['payment_gateway'])); if (count($pgs) == 0) { sendTelegram("Payment Gateway not set, please set it in Settings"); @@ -294,11 +348,12 @@ switch ($action) { } if (count($pgs) > 1) { $ui->assign('pgs', $pgs); - //$ui->assign('pgs', $pgs); + if ($tax_enable === 'yes') { + $ui->assign('tax', $tax); + } $ui->assign('route2', $routes[2]); $ui->assign('route3', $routes[3]); - - //$ui->assign('plan', $plan); + $ui->assign('plan', $plan); $ui->display('user-selectGateway.tpl'); break; } else { @@ -317,9 +372,6 @@ switch ($action) { } else if (!empty($gateway)) { $_SESSION['gateway'] = $gateway; } - if($user['status'] != 'Active'){ - _alert(Lang::T('This account status').' : '.Lang::T($user['status']),'danger', ""); - } if (empty($gateway)) { r2(U . 'order/gateway/' . $routes[2] . '/' . $routes[3], 'w', Lang::T("Please select Payment Gateway")); } @@ -357,9 +409,23 @@ switch ($action) { } } $add_cost = 0; + $tax = 0; if ($router['name'] != 'balance') { list($bills, $add_cost) = User::getBills($id_customer); } + // Tax calculation start + $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; + $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; + if ($tax_rate_setting === 'custom') { + $tax_rate = $custom_tax_rate; + } else { + $tax_rate = $tax_rate_setting; + } + if ($tax_enable === 'yes') { + $tax = Package::tax($plan['price'], $tax_rate); + } + // Tax calculation stop if (empty($id)) { $d = ORM::for_table('tbl_payment_gateway')->create(); $d->username = $user['username']; @@ -372,12 +438,12 @@ switch ($action) { // Postpaid price from field $add_inv = User::getAttribute("Invoice", $id_customer); if (empty($add_inv) or $add_inv == 0) { - $d->price = ($plan['price'] + $add_cost); + $d->price = ($plan['price'] + $add_cost + $tax); } else { - $d->price = ($add_inv + $add_cost); + $d->price = ($add_inv + $add_cost + $tax); } } else { - $d->price = ($plan['price'] + $add_cost); + $d->price = ($plan['price'] + $add_cost + $tax); } //$d->price = ($plan['price'] + $add_cost); $d->created_date = date('Y-m-d H:i:s'); @@ -395,12 +461,12 @@ switch ($action) { // Postpaid price from field $add_inv = User::getAttribute("Invoice", $id_customer); if (empty($add_inv) or $add_inv == 0) { - $d->price = ($plan['price'] + $add_cost); + $d->price = ($plan['price'] + $add_cost + $tax); } else { - $d->price = ($add_inv + $add_cost); + $d->price = ($add_inv + $add_cost + $tax); } } else { - $d->price = ($plan['price'] + $add_cost); + $d->price = ($plan['price'] + $add_cost + $tax); } //$d->price = ($plan['price'] + $add_cost); $d->created_date = date('Y-m-d H:i:s'); diff --git a/system/controllers/services.php b/system/controllers/services.php index dadfb0cf..a0f85ec2 100644 --- a/system/controllers/services.php +++ b/system/controllers/services.php @@ -244,37 +244,6 @@ switch ($action) { $rate = $b['rate_up'] . $unitup . "/" . $b['rate_down'] . $unitdown; $radiusRate = $b['rate_up'] . $radup . '/' . $b['rate_down'] . $raddown . '/' . $b['burst']; $rate = trim($rate . " " . $b['burst']); - - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } - // Create new plan $d = ORM::for_table('tbl_plans')->create(); $d->name_plan = $name; @@ -391,37 +360,6 @@ switch ($action) { Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired); } } - - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } - $d->name_plan = $name; $d->id_bw = $id_bw; $d->price = $price_with_tax; // Set price with or without tax based on configuration @@ -578,38 +516,6 @@ switch ($action) { $rate = $b['rate_up'] . $unitup . "/" . $b['rate_down'] . $unitdown; $radiusRate = $b['rate_up'] . $radup . '/' . $b['rate_down'] . $raddown . '/' . $b['burst']; $rate = trim($rate . " " . $b['burst']); - - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } - - $d = ORM::for_table('tbl_plans')->create(); $d->type = 'PPPOE'; $d->name_plan = $name; @@ -712,37 +618,6 @@ switch ($action) { Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K'); } } - - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } - $d->name_plan = $name; $d->id_bw = $id_bw; $d->price = $price_with_tax; @@ -822,35 +697,6 @@ switch ($action) { } run_hook('edit_ppoe'); #HOOK if ($msg == '') { - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } $d->name_plan = $name; $d->price = $price_with_tax; $d->enabled = $enabled; @@ -881,38 +727,6 @@ switch ($action) { } run_hook('add_ppoe'); #HOOK if ($msg == '') { - - // Check if tax is enabled in config - $tax_enable = isset($config['enable_tax']) ? $config['enable_tax'] : 'no'; - - // Default tax rate - $default_tax_rate = 0.01; // Default tax rate 1% - - // Check if tax rate is set to custom in config - $tax_rate_setting = isset($config['tax_rate']) ? $config['tax_rate'] : $default_tax_rate; - - // Check if tax rate is custom - if ($tax_rate_setting === 'custom') { - // Check if custom tax rate is set in config - $custom_tax_rate = isset($config['custom_tax_rate']) ? (float)$config['custom_tax_rate'] : $default_tax_rate; - // Convert custom tax rate to decimal - $custom_tax_rate_decimal = $custom_tax_rate / 100; - $tax_rate = $custom_tax_rate_decimal; - } else { - // Use tax rate - $tax_rate = $tax_rate_setting; - } - - - // Calculate the new price with tax if tax is enabled - if ($tax_enable === 'yes') { - $price_with_tax = $price + ($price * $tax_rate); - } else { - // If tax is not enabled, use the original price - $price_with_tax = $price; - } - - $d = ORM::for_table('tbl_plans')->create(); $d->type = 'Balance'; $d->name_plan = $name; diff --git a/system/controllers/settings.php b/system/controllers/settings.php index 5575ebdd..4419720f 100644 --- a/system/controllers/settings.php +++ b/system/controllers/settings.php @@ -132,34 +132,6 @@ switch ($action) { $d->save(); } } - - // Handle tax system separately - $enable_tax = isset($_POST['enable_tax']) ? $_POST['enable_tax'] : 'no'; - $tax_rate = isset($_POST['tax_rate']) ? $_POST['tax_rate'] : '0.01'; // Default tax rate 1% - - // Save or update tax system settings - $d_tax_enable = ORM::for_table('tbl_appconfig')->where('setting', 'enable_tax')->find_one(); - if ($d_tax_enable) { - $d_tax_enable->value = $enable_tax; - $d_tax_enable->save(); - } else { - $d_tax_enable = ORM::for_table('tbl_appconfig')->create(); - $d_tax_enable->setting = 'enable_tax'; - $d_tax_enable->value = $enable_tax; - $d_tax_enable->save(); - } - - $d_tax_rate = ORM::for_table('tbl_appconfig')->where('setting', 'tax_rate')->find_one(); - if ($d_tax_rate) { - $d_tax_rate->value = $tax_rate; - $d_tax_rate->save(); - } else { - $d_tax_rate = ORM::for_table('tbl_appconfig')->create(); - $d_tax_rate->setting = 'tax_rate'; - $d_tax_rate->value = $tax_rate; - $d_tax_rate->save(); - } - //checkbox $checks = ['hide_mrc', 'hide_tms', 'hide_aui', 'hide_al', 'hide_uet', 'hide_vs', 'hide_pg']; foreach ($checks as $check) { diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index c47db57e..eb3e92dc 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -602,9 +602,21 @@

{Lang::T('The method which OTP will be sent to user')}

+
+ +
+ +
+

{Lang::T('If user buy same internet plan, expiry date will extend')}

+
- {*
+
-
+
+
+
{Lang::T('Package Details')}
+ +
{Lang::T('Summary')}
+ +
+
+ {Lang::T('Cancel')} +
diff --git a/ui/ui/user-sendPlan.tpl b/ui/ui/user-sendPlan.tpl index c2ab0e4b..fb3ac4e3 100644 --- a/ui/ui/user-sendPlan.tpl +++ b/ui/ui/user-sendPlan.tpl @@ -13,20 +13,29 @@ {$plan['type']} {if $add_cost>0} - {foreach $bills as $k => $v} - - {$k} - {Lang::moneyFormat($v)} - - {/foreach} - - {Lang::T('Additional Cost')} - {Lang::moneyFormat($add_cost)} - + {foreach $bills as $k => $v} + + {$k} + {Lang::moneyFormat($v)} + + {/foreach} + + {Lang::T('Additional Cost')} + {Lang::moneyFormat($add_cost)} + + {/if} + {if $tax > 0} + + {Lang::T('Tax')} + {Lang::moneyFormat($tax)} + {/if} - {Lang::T('Price')}{if $add_cost>0} + {Lang::T('Additional Cost')}{/if} - {Lang::moneyFormat($plan['price'])} + {Lang::T('Price')}{if $add_cost>0} + {Lang::T('Additional Cost')}{/if}{if + $tax>0} + {Lang::T('Tax')}{/if} + + {Lang::moneyFormat($plan['price'])} {Lang::T('Validity')} @@ -39,15 +48,17 @@
- +
- +
-

{Lang::T('If your friend have Additional Cost, you will pay for that too')}

+

{Lang::T('If your friend have Additional Cost, you will pay for + that too')}