From 3833afb3beca1cbb3cc86f19c2d2fa036eea7be1 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Thu, 7 Sep 2023 09:20:31 +0700
Subject: [PATCH] Fix delete PPPOE

---
 system/autoload/Mikrotik.php     |  9 +++------
 system/controllers/customers.php |  8 ++++----
 system/controllers/prepaid.php   |  6 ++++--
 ui/ui/prepaid-edit.tpl           | 11 +++++++----
 ui/ui/prepaid.tpl                |  1 +
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/system/autoload/Mikrotik.php b/system/autoload/Mikrotik.php
index 76e90823..8d4f1802 100644
--- a/system/autoload/Mikrotik.php
+++ b/system/autoload/Mikrotik.php
@@ -252,15 +252,12 @@ class Mikrotik
     {
 
         $printRequest = new RouterOS\Request('/ppp/secret/print');
-        $printRequest->setArgument('.proplist', '.id');
+        //$printRequest->setArgument('.proplist', '.id');
         $printRequest->setQuery(RouterOS\Query::where('name', $username));
         $id = $client->sendSync($printRequest)->getProperty('.id');
-
         $removeRequest = new RouterOS\Request('/ppp/secret/remove');
-        $client(
-            $removeRequest
-                ->setArgument('numbers', $id)
-        );
+        $removeRequest->setArgument('numbers', $id);
+        $client->sendSync($removeRequest);
     }
 
     public static function addPpoeUser($client, $plan, $customer)
diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index c4c54603..c6dbc358 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -113,14 +113,14 @@ switch ($action) {
                 if ($c['type'] == 'Hotspot') {
                     if (!$config['radius_mode']) {
                         $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removeHotspotUser($client, $c['username']);
-                        Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                        Mikrotik::removeHotspotActiveUser($client, $d['username']);
+                        Mikrotik::removeHotspotUser($client, $d['username']);
                     }
                 } else {
                     if (!$config['radius_mode']) {
                         $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removePpoeUser($client, $c['username']);
-                        Mikrotik::removePpoeActive($client, $c['username']);
+                        Mikrotik::removePpoeActive($client, $d['username']);
+                        Mikrotik::removePpoeUser($client, $d['username']);
                     }
                 }
                 try {
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index e3910e1b..390fe013 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -146,14 +146,16 @@ switch ($action) {
             if ($d['type'] == 'Hotspot') {
                 if (!$config['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $d['username']);
+                    Mikrotik::removeHotspotUser($client, $d['username']);
                 }
 
                 $d->delete();
             } else {
                 if (!$config['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $d['username']);
+                    Mikrotik::removePpoeUser($client, $d['username']);
                 }
                 $d->delete();
             }
diff --git a/ui/ui/prepaid-edit.tpl b/ui/ui/prepaid-edit.tpl
index 8e46332e..f7d5d92a 100644
--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@@ -28,12 +28,15 @@
                             </select>
                         </div>
                     </div>
-
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Created_On']}</label>
-                        <div class="col-md-6">
-                            <input type="date" class="form-control" id="recharged_on" name="recharged_on" readonly
-                                value="{$d['recharged_on']} {$d['recharged_time']}">
+                        <div class="col-md-4">
+                            <input type="date" class="form-control" name="expiration" readonly
+                                value="{$d['recharged_on']}">
+                        </div>
+                        <div class="col-md-2">
+                            <input type="text" class="form-control" placeholder="00:00:00" readonly
+                                value="{$d['recharged_time']}">
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl
index 3a8ad2be..8a08197d 100644
--- a/ui/ui/prepaid.tpl
+++ b/ui/ui/prepaid.tpl
@@ -53,6 +53,7 @@
                                         <a href="{$_url}prepaid/edit/{$ds['id']}"
                                             class="btn btn-warning btn-xs">{$_L['Edit']}</a>
                                         <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}"
+                                        onclick="return confirm('{$_L['Delete']}?')"
                                             class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                     </td>
                                 </tr>