diff --git a/system/autoload/Message.php b/system/autoload/Message.php index 0ee68a6a..b493eea6 100644 --- a/system/autoload/Message.php +++ b/system/autoload/Message.php @@ -116,13 +116,14 @@ class Message $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); + $msg = str_replace('[[price]]', Lang::moneyFormat($price), $msg); list($bills, $add_cost) = User::getBills($customer['id']); if($add_cost>0){ $note = ""; foreach ($bills as $k => $v) { $note .= $k . " : " . Lang::moneyFormat($v) . "\n"; } + $note .= "Total : " . Lang::moneyFormat($add_cost+$price) . "\n"; $msg = str_replace('[[bills]]', $note, $msg); } if ($u) { diff --git a/system/cron.php b/system/cron.php index 398c3146..b9ed0529 100644 --- a/system/cron.php +++ b/system/cron.php @@ -34,7 +34,6 @@ foreach ($d as $ds) { $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one(); $m = Mikrotik::info($ds['routers']); $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one(); - $price = Lang::moneyFormat($p['price']); if ($p['is_radius']) { if (empty($p['pool_expired'])) { print_r(Radius::customerDeactivate($c['username'])); @@ -54,7 +53,7 @@ foreach ($d as $ds) { } Mikrotik::removeHotspotActiveUser($client, $c['username']); } - echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n"; + echo Message::sendPackageNotification($c, $u['namebp'], $p['price'], $textExpired, $config['user_notification_expired']) . "\n"; //update database user dengan status off $u->status = 'off'; $u->save(); @@ -98,7 +97,6 @@ foreach ($d as $ds) { $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one(); $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one(); $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one(); - $price = Lang::moneyFormat($p['price']); if ($p['is_radius']) { if (empty($p['pool_expired'])) { print_r(Radius::customerDeactivate($c['username'])); @@ -115,7 +113,7 @@ foreach ($d as $ds) { } Mikrotik::removePpoeActive($client, $c['username']); } - echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired']) . "\n"; + echo Message::sendPackageNotification($c, $u['namebp'], $p['price'], $textExpired, $config['user_notification_expired']) . "\n"; $u->status = 'off'; $u->save(); diff --git a/system/cron_reminder.php b/system/cron_reminder.php index af41ece8..c11e46ae 100644 --- a/system/cron_reminder.php +++ b/system/cron_reminder.php @@ -42,12 +42,12 @@ foreach ($d as $ds) { // Postpaid price from field $add_inv = User::getAttribute("Invoice", $ds['customer_id']); if (empty ($add_inv) or $add_inv == 0) { - $price = Lang::moneyFormat($p['price']); + $price = $p['price']; } else { - $price = Lang::moneyFormat($add_inv); + $price = $add_inv; } } else { - $price = Lang::moneyFormat($p['price']); + $price = $p['price']; } if ($ds['expiration'] == $day7) { echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";