fix 1 account can have 1 pppoe and 1 hotspot in 1 router

system/autoload/Package.php

@@ -80,8 +80,14 @@ class Package
             return true;
         }
 
-
+        /**
-        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('routers', $router_name)->find_one();
+         * 1 Customer only can have 1 PPPOE and 1 Hotspot Plan
+         */
+        $b = ORM::for_table('tbl_user_recharges')
+            ->where('customer_id', $id_customer)
+            ->where('routers', $router_name)
+            ->where('Type', $p['type'])
+            ->find_one();
 
         $mikrotik = Mikrotik::info($router_name);
         if ($p['validity_unit'] == 'Months') {
@@ -124,9 +130,7 @@ class Package
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
 
@@ -164,9 +168,7 @@ class Package
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
 
@@ -231,9 +233,7 @@ class Package
                     Radius::customerAddPlan($c, $p, "$date_exp $time");
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
                     Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
                     Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
@@ -271,9 +271,7 @@ class Package
                     Radius::customerAddPlan($c, $p, "$date_exp $time");
                 }else{
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
                     Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
                     Mikrotik::removePpoeActive($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
@@ -335,34 +333,26 @@ class Package
                 if (!$p['is_radius']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                 }
             } else {
                 if (!$p['is_radius']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::removeHotspotActiveUser($client, $c['username']);
-                    Mikrotik::removePpoeActive($client, $c['username']);
                 }
             }
         } else {
             if ($b) {
                 if (!$p['is_radius']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
                     Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
                     Mikrotik::removePpoeActive($client, $c['username']);
                 }
             } else {
                 if (!$p['is_radius']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
                     Mikrotik::removePpoeUser($client, $c['username']);
-                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
                     Mikrotik::removePpoeActive($client, $c['username']);
                 }
             }

ui/ui/user-dashboard.tpl

@@ -103,11 +103,20 @@
                     </tr>
                 {/if}
             </table>
+        </div>
         {if $_bills}
+            <div class="box box-primary box-solid">
                 {foreach $_bills as $_bill}
                     {if $_bill['routers'] != 'radius'}
                         <div class="box-header">
                             <h3 class="box-title">{$_bill['routers']}</h3>
+                            <div class="btn-group pull-right">
+                                {if $_bill['type'] != 'Hotspot'}
+                                    {if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}
+                                {else}
+                                    {if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}
+                                {/if}
+                            </div>
                         </div>
                     {else}
                         <div class="box-header">
@@ -163,8 +172,8 @@
                         {/if}
                     </table>
                 {/foreach}
-            {/if}
             </div>
+        {/if}
         {if $_c['disable_voucher'] == 'yes'}
             <div class="box-footer">
                 {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }

ui/ui/user-orderPlan.tpl

@@ -37,13 +37,19 @@
                                     </div>
                                     <div class="box-body">
                                         <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                            <a href="{$_url}order/buy/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                            <a href="{$_url}order/buy/radius/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                             {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/pay/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                <a href="{$_url}order/pay/radius/{$plan['id']}"
+                                                    onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                    class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                             {/if}
                                         </div>
                                         {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                        <a href="{$_url}order/send/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                            <a href="{$_url}order/send/radius/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                         {/if}
                                     </div>
                                 </div>
@@ -82,13 +88,19 @@
                                     </div>
                                     <div class="box-body">
                                         <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                            <a href="{$_url}order/buy/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                            <a href="{$_url}order/buy/radius/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                             {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/pay/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                <a href="{$_url}order/pay/radius/{$plan['id']}"
+                                                    onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                    class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                             {/if}
                                         </div>
                                         {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                        <a href="{$_url}order/send/radius/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                            <a href="{$_url}order/send/radius/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                         {/if}
                                     </div>
                                 </div>
@@ -127,13 +139,19 @@
                                     </div>
                                     <div class="box-body">
                                         <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                            <a href="{$_url}order/buy/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                            <a href="{$_url}order/buy/pppoe/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')"
+                                                class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                             {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/pay/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                <a href="{$_url}order/pay/pppoe/{$plan['id']}"
+                                                    onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')"
+                                                    class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                             {/if}
                                         </div>
                                         {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                        <a href="{$_url}order/send/pppoe/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                            <a href="{$_url}order/send/pppoe/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                         {/if}
                                     </div>
                                 </div>
@@ -170,13 +188,19 @@
                                     </div>
                                     <div class="box-body">
                                         <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                            <a href="{$_url}order/buy/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                            <a href="{$_url}order/buy/hotspot/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this? your active package will be overwritten')}')"
+                                                class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                             {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/pay/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                <a href="{$_url}order/pay/hotspot/{$plan['id']}"
+                                                    onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwritten')}')"
+                                                    class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                             {/if}
                                         </div>
                                         {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                        <a href="{$_url}order/send/hotspot/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                            <a href="{$_url}order/send/hotspot/{$plan['id']}"
+                                                onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                         {/if}
                                     </div>
                                 </div>
@@ -196,7 +220,8 @@
                         </div>
                     {/if}
                     {if $_user['service_type'] == 'Hotspot' && Validator::countRouterPlan($plans_hotspot, $router['name'])>0}
-            <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</div>
+                        <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}
+                        </div>
                         <div class="box-body row">
                             {foreach $plans_hotspot as $plan}
                                 {if $router['name'] eq $plan['routers']}
@@ -223,13 +248,19 @@
                                             </div>
                                             <div class="box-body">
                                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                                     {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                                     {/if}
                                                 </div>
                                                 {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                 {/if}
                                             </div>
                                         </div>
@@ -266,13 +297,19 @@
                                             </div>
                                             <div class="box-body">
                                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                                     {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                                     {/if}
                                                 </div>
                                                 {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                 {/if}
                                             </div>
                                         </div>
@@ -282,7 +319,8 @@
                         </div>
                     {/if}
                     {if $_user['service_type'] == 'Others' || $_user['service_type'] == '' && (Validator::countRouterPlan($plans_hotspot, $router['name'])>0 || Validator::countRouterPlan($plans_pppoe, $router['name'])>0)}
-            <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}</div>
+                        <div class="box-header text-white">{if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}
+                        </div>
                         <div class="box-body row">
                             {foreach $plans_hotspot as $plan}
                                 {if $router['name'] eq $plan['routers']}
@@ -309,13 +347,19 @@
                                             </div>
                                             <div class="box-body">
                                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                                     {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                                     {/if}
                                                 </div>
                                                 {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                 {/if}
                                             </div>
                                         </div>
@@ -350,13 +394,19 @@
                                             </div>
                                             <div class="box-body">
                                                 <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
                                                     {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')" class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
                                                     {/if}
                                                 </div>
                                                 {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
-                            <a href="{$_url}order/send/{$router['id']}/{$plan['id']}" onclick="return confirm('{Lang::T('Buy this for friend account?')}')" class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                 {/if}
                                             </div>
                                         </div>