diff --git a/system/controllers/order.php b/system/controllers/order.php
index 01dbf202..1d032da2 100644
--- a/system/controllers/order.php
+++ b/system/controllers/order.php
@@ -15,7 +15,7 @@ switch ($action) {
         $ui->assign('_system_menu', 'voucher');
         $ui->assign('_title', Lang::T('Order Voucher'));
         run_hook('customer_view_order'); #HOOK
-        $ui->display('customer/order.tpl');
+        $ui->display('user-ui/order.tpl');
         break;
     case 'history':
         $ui->assign('_system_menu', 'history');
@@ -24,7 +24,7 @@ switch ($action) {
         $ui->assign('d', $d);
         $ui->assign('_title', Lang::T('Order History'));
         run_hook('customer_view_order_history'); #HOOK
-        $ui->display('customer/orderHistory.tpl');
+        $ui->display('user-ui/orderHistory.tpl');
         break;
     case 'balance':
         if (strpos($user['email'], '@') === false) {
@@ -34,7 +34,7 @@ switch ($action) {
         $ui->assign('_system_menu', 'balance');
         $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('prepaid', 'yes')->find_many();
         $ui->assign('plans_balance', $plans_balance);
-        $ui->display('customer/orderBalance.tpl');
+        $ui->display('user-ui/orderBalance.tpl');
         break;
     case 'package':
         if (strpos($user['email'], '@') === false) {
@@ -127,7 +127,7 @@ switch ($action) {
         $ui->assign('plans_hotspot', $plans_hotspot);
         $ui->assign('plans_vpn', $plans_vpn);
         run_hook('customer_view_order_plan'); #HOOK
-        $ui->display('customer/orderPlan.tpl');
+        $ui->display('user-ui/orderPlan.tpl');
         break;
     case 'unpaid':
         $d = ORM::for_table('tbl_payment_gateway')
@@ -192,7 +192,7 @@ switch ($action) {
         $ui->assign('plan', $plan);
         $ui->assign('bandw', $bandw);
         $ui->assign('_title', 'TRX #' . $trxid);
-        $ui->display('customer/orderView.tpl');
+        $ui->display('user-ui/orderView.tpl');
         break;
     case 'pay':
         if ($config['enable_balance'] != 'yes') {
@@ -271,7 +271,8 @@ switch ($action) {
         if (!$plan['enabled']) {
             r2(U . "home", 'e', 'Plan is not exists');
         }
-		if ($plan['is_radius'] == '1') {
+        if ($routes['2'] == 'radius') {
+            $routes['2'] = 0;
             $router_name = 'radius';
         } else {
             $router_name = $plan['routers'];
@@ -333,7 +334,7 @@ switch ($action) {
                 $d->gateway = $target['username'];
                 $d->plan_id = $plan['id'];
                 $d->plan_name = $plan['name_plan'];
-                $d->routers_id = ($routes['2'] == 'radius') ? 0 : $routes['2'];
+                $d->routers_id = $routes['2'];
                 $d->routers = $router_name;
                 $d->price = $plan['price'];
                 $d->payment_method = "Balance";
@@ -352,7 +353,7 @@ switch ($action) {
                 $d->gateway = $user['username'];
                 $d->plan_id = $plan['id'];
                 $d->plan_name = $plan['name_plan'];
-                $d->routers_id = ($routes['2'] == 'radius') ? 0 : $routes['2'];
+                $d->routers_id = $routes['2'];
                 $d->routers = $router_name;
                 $d->price = $plan['price'];
                 $d->payment_method = "Balance";
@@ -382,7 +383,7 @@ switch ($action) {
         $ui->assign('router', $router_name);
         $ui->assign('plan', $plan);
         $ui->assign('tax', $tax);
-        $ui->display('customer/sendPlan.tpl');
+        $ui->display('user-ui/sendPlan.tpl');
         break;
     case 'gateway':
         $ui->assign('_title', Lang::T('Select Payment Gateway'));
@@ -420,7 +421,7 @@ switch ($action) {
             $ui->assign('add_cost', $add_cost);
             $ui->assign('bills', $bills);
             $ui->assign('plan', $plan);
-            $ui->display('customer/selectGateway.tpl');
+            $ui->display('user-ui/selectGateway.tpl');
             break;
         } else {
             sendTelegram("Payment Gateway not set, please set it in Settings");
diff --git a/system/lan/indonesia.json b/system/lan/indonesia.json
index 93b8f060..ad70c3c3 100644
--- a/system/lan/indonesia.json
+++ b/system/lan/indonesia.json
@@ -589,5 +589,23 @@
     "Customers": "Pelanggan",
     "Package_Name": "Nama Paket",
     "Routers_Offline": "Router Offline",
-    "Cron_appear_not_been_setup__please_check_your_cron_setup_": "Cron tampaknya belum disiapkan, silakan periksa pengaturan cron Anda."
+    "Cron_appear_not_been_setup__please_check_your_cron_setup_": "Cron tampaknya belum disiapkan, silakan periksa pengaturan cron Anda.",
+    "Buy": "Membeli",
+    "You_are_already_logged_in": "Anda sudah masuk",
+    "PPPOE_Package": "Paket PPPOE",
+    "Prepaid": "Prabayar",
+    "Postpaid": "Pascabayar",
+    "Enabled": "Diaktifkan",
+    "Disable": "Cacat",
+    "Create_expired_Internet_Plan": "Buat Paket Internet yang Kedaluwarsa",
+    "When_customer_expired__you_can_move_it_to_Expired_Internet_Plan": "Ketika pelanggan kedaluwarsa, Anda dapat memindahkannya ke Paket Internet Kedaluwarsa",
+    "Price_Before_Discount": "Harga Sebelum Diskon",
+    "For_Discount_Rate__this_is_price_before_get_discount__must_be_more_expensive_with_real_price": "Untuk Discount Rate, ini adalah harga sebelum mendapat diskon, pasti lebih mahal dari harga sebenarnya",
+    "on_login___on_up": "saat masuk \/ saat mendaftar",
+    "on_logout___on_down": "saat keluar \/ saat turun",
+    "Get_Directions": "Dapatkan Petunjuk Arah",
+    "Not_Working_with_Freeradius_Mysql": "Tidak Bekerja dengan Freeradius Mysql",
+    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_Customer_Credentials": "Pengguna tidak dapat mengubah ini, hanya admin. Jika Kosong, maka akan menggunakan Kredensial Pelanggan",
+    "Buy_this__your_active_package_will_be_overwritten": "Beli ini? Paket aktif Anda akan ditimpa",
+    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Bayar ini dengan Saldo? Paket aktif Anda akan ditimpa"
 }
\ No newline at end of file