From a54df9bdab4794663eccaa0e68e2ec58351f9342 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 16 Oct 2023 10:25:15 +0700
Subject: [PATCH] Expired Pool

---
 ui/ui/hotspot-add.tpl  | 28 +++++++++++++++++++---------
 ui/ui/hotspot-edit.tpl | 36 +++++++++++++++++++++++-------------
 ui/ui/pppoe-add.tpl    | 10 ++++++++--
 ui/ui/pppoe-edit.tpl   | 11 ++++++++++-
 4 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl
index 20ffa50d..5eb41ba5 100644
--- a/ui/ui/hotspot-add.tpl
+++ b/ui/ui/hotspot-add.tpl
@@ -143,16 +143,16 @@
                                 <p class="help-block">{Lang::T('Cannot be change after saved')}</p>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-2 control-label"><a
-                                    href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
-                            <div class="col-md-6">
-                                <select id="pool_expired" name="pool_expired" class="form-control select2">
-                                    <option value=''>{$_L['Select_Pool']}</option>
-                                </select>
-                            </div>
-                        </div>
                     </span>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label"><a
+                                href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+                        <div class="col-md-6">
+                            <select id="pool_expired" name="pool_expired" class="form-control select2">
+                                <option value=''>{$_L['Select_Pool']}</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-md-offset-2 col-md-10">
                             <button class="btn btn-success waves-effect waves-light"
@@ -177,6 +177,16 @@
                     $("#routerChoose").removeClass('hidden');
                 }
             }
+            setTimeout(() => {
+                $.ajax({
+                    url: "index.php?_route=autoload/pool",
+                    data: "routers=radius",
+                    cache: false,
+                    success: function(msg) {
+                        $("#pool_expired").html(msg);
+                    }
+                });
+            }, 2000);
         </script>
     {/literal}
 {/if}
diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl
index a0d9f669..5eeced2a 100644
--- a/ui/ui/hotspot-edit.tpl
+++ b/ui/ui/hotspot-edit.tpl
@@ -149,20 +149,20 @@
                                     value="{$d['routers']}" readonly>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <label class="col-md-2 control-label"><a
-                                    href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
-                            <div class="col-md-6">
-                                <select id="pool_expired" name="pool_expired" class="form-control select2">
-                                    <option value=''>{$_L['Select_Pool']}</option>
-                                    {foreach $p as $ps}
-                                        <option value="{$ps['pool_name']}" {if $d['pool_expired'] eq $ps['pool_name']}
-                                            selected {/if}>{$ps['pool_name']}</option>
-                                    {/foreach}
-                                </select>
-                            </div>
-                        </div>
                     </span>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label"><a
+                                href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+                        <div class="col-md-6">
+                            <select id="pool_expired" name="pool_expired" class="form-control select2">
+                                <option value=''>{$_L['Select_Pool']}</option>
+                                {foreach $p as $ps}
+                                    <option value="{$ps['pool_name']}" {if $d['pool_expired'] eq $ps['pool_name']} selected
+                                        {/if}>{$ps['pool_name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-md-offset-2 col-md-10">
                             <button class="btn btn-success waves-effect waves-light"
@@ -191,6 +191,16 @@
                     $("#routerChoose").removeClass('hidden');
                 }
             }
+            setTimeout(() => {
+                $.ajax({
+                    url: "index.php?_route=autoload/pool",
+                    data: "routers=radius",
+                    cache: false,
+                    success: function(msg) {
+                        $("#pool_expired").html(msg);
+                    }
+                });
+            }, 2000);
         </script>
     {/literal}
 {/if}
diff --git a/ui/ui/pppoe-add.tpl b/ui/ui/pppoe-add.tpl
index 32e045da..c24b3447 100644
--- a/ui/ui/pppoe-add.tpl
+++ b/ui/ui/pppoe-add.tpl
@@ -118,7 +118,6 @@
                 if (cek.checked) {
                     document.getElementById("routers").required = false;
                     document.getElementById("routers").disabled = true;
-                    document.getElementById("pool_expired").disabled = true;
                     $.ajax({
                         url: "index.php?_route=autoload/pool",
                         data: "routers=radius",
@@ -127,10 +126,17 @@
                             $("#pool_name").html(msg);
                         }
                     });
+                    $.ajax({
+                        url: "index.php?_route=autoload/pool",
+                        data: "routers=radius",
+                        cache: false,
+                        success: function(msg) {
+                            $("#pool_expired").html(msg);
+                        }
+                    });
                 } else {
                     document.getElementById("routers").required = true;
                     document.getElementById("routers").disabled = false;
-                    document.getElementById("pool_expired").disabled = false;
                 }
             }
         </script>
diff --git a/ui/ui/pppoe-edit.tpl b/ui/ui/pppoe-edit.tpl
index b963c964..2550adda 100644
--- a/ui/ui/pppoe-edit.tpl
+++ b/ui/ui/pppoe-edit.tpl
@@ -124,7 +124,16 @@
         <script>
             document.getElementById("routers").required = false;
             document.getElementById("routers").disabled = true;
-            document.getElementById("pool_expired").disabled = true;
+            setTimeout(() => {
+                $.ajax({
+                    url: "index.php?_route=autoload/pool",
+                    data: "routers=radius",
+                    cache: false,
+                    success: function(msg) {
+                        $("#pool_expired").html(msg);
+                    }
+                });
+            }, 2000);
         </script>
     {/literal}
 {/if}