From 0295ab44e58d58d852ad548efc18d78efe2905b8 Mon Sep 17 00:00:00 2001
From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:13:56 +0100
Subject: [PATCH 1/4] send welcome email bug

fixed welcome email sending bug
---
 system/controllers/customers.php | 2 +-
 ui/ui/customers-add.tpl          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index 98e52762..96188b68 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -523,7 +523,7 @@ switch ($action) {
                         'args' => [$d['phonenumber'], $welcomeMessage]
                     ],
                     'email' => [
-                        'enabled' => isset($_POST['email']),
+                        'enabled' => isset($_POST['mail']),
                         'method' => 'Message::sendEmail',
                         'args' => [$d['email'], $emailSubject, $welcomeMessage, $d['email']]
                     ]
diff --git a/ui/ui/customers-add.tpl b/ui/ui/customers-add.tpl
index cc2ff88c..e9df3f7d 100644
--- a/ui/ui/customers-add.tpl
+++ b/ui/ui/customers-add.tpl
@@ -115,7 +115,7 @@
                         <label class="col-md-3 control-label">Remote IP <span class="label label-danger" id="warning_ip"></span></label>
                         <div class="col-md-9">
                             <input type="text" class="form-control" id="pppoe_ip" name="pppoe_ip" onkeyup="checkIP(this, '0')">
-                            <span class="help-block">{Lang::T('Not Working for freeradius')}</span>
+                            <span class="help-block">{Lang::T('Also Working for freeradius')}</span>
                         </div>
                     </div>
                     <span class="help-block">
@@ -139,7 +139,7 @@
                             {Lang::T('SMS')}</label>
                         <label class="col-md-2 control-label"><input type="checkbox" name="wa" value="1">
                             {Lang::T('WA')}</label>
-                        <label class="col-md-2 control-label"><input type="checkbox" name="email" value="1">
+                        <label class="col-md-2 control-label"><input type="checkbox" name="mail" value="1">
                             {Lang::T('Email')}</label>
                     </div>
                 </div>

From 1b7f449d96f2f5d4ae583fdca66934cdf25c945b Mon Sep 17 00:00:00 2001
From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:13:26 +0100
Subject: [PATCH 2/4] Update app-settings.tpl

replace footer not with callout to make it more decent
---
 ui/ui/app-settings.tpl | 44 +++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index ca4c213f..bf9fa177 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -1049,32 +1049,28 @@
     </div>
 </form>
 
-<div class="well well-sm">
-    <legend>{Lang::T('Settings For Mikrotik')}</legend>
-    <pre>/ip hotspot walled-garden
-    add dst-host={$_domain}
-    add dst-host=*.{$_domain}</pre>
-
-    <legend>{Lang::T('Settings For Cron Expired')}</legend>
-    <pre>
-    # {Lang::T('Expired Cronjob Every 5 Minutes')}
-    */5 * * * * cd {$dir} && {$php} cron.php
-</pre>
-    {Lang::T('Choose one, above or below')}
-    <pre>
-    # {Lang::T('Expired Cronjob Every 1 Hour')}
-    0 * * * * cd {$dir} && {$php} cron.php
-</pre>
-
-    <legend>{Lang::T('Settings For Cron Reminder')}</legend>
-    <pre>
-    # {Lang::T('Reminder Cronjob Every 7 AM')}
-    0 7 * * * cd {$dir} && {$php} cron_reminder.php
-</pre>
+<div class="bs-callout bs-callout-info" id="callout-navbar-role">
+    <h4><b>{Lang::T('Settings For Mikrotik')}</b></h4>
+    <p>/ip hotspot walled-garden <br>
+        add dst-host={$_domain} <br>
+        add dst-host=*.{$_domain}
+    </p>
+    <br>
+    <h4><b>{Lang::T('Settings For Cron Expired')}</b></h4>
+    <p>
+        # {Lang::T('Expired Cronjob Every 5 Minutes')}<br>
+        */5 * * * * cd {$dir} && {$php} cron.php
+    </p>
+    <br>
+    <h4><b>{Lang::T('Settings For Cron Reminder')}</b></h4>
+    <p>
+        # {Lang::T('Reminder Cronjob Every 7 AM')}<br>
+        0 7 * * * cd {$dir} && {$php} cron_reminder.php
+        # {Lang::T('Reminder Cronjob Every 1 Hour')}
+        0 * * * * cd {$dir} && {$php} cron_reminder.php
+    </p>
 </div>
 
-
-
 <script>
     function testWa() {
         var target = prompt("Phone number\nSave First before Test", "");

From 949a3d27eba8e5ba076ac9a810733cae2a183858 Mon Sep 17 00:00:00 2001
From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:16:27 +0100
Subject: [PATCH 3/4] Update app-settings.tpl

fixed callout text
---
 ui/ui/app-settings.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index bf9fa177..b4d50f87 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -1060,14 +1060,15 @@
     <p>
         # {Lang::T('Expired Cronjob Every 5 Minutes')}<br>
         */5 * * * * cd {$dir} && {$php} cron.php
+        <br><br>
+        # {Lang::T('Expired Cronjob Every 1 Hour')}<br>
+        0 * * * * cd {$dir} && {$php} cron.php
     </p>
     <br>
     <h4><b>{Lang::T('Settings For Cron Reminder')}</b></h4>
     <p>
         # {Lang::T('Reminder Cronjob Every 7 AM')}<br>
         0 7 * * * cd {$dir} && {$php} cron_reminder.php
-        # {Lang::T('Reminder Cronjob Every 1 Hour')}
-        0 * * * * cd {$dir} && {$php} cron_reminder.php
     </p>
 </div>
 

From 2863d70214546709d2999072aaa6c7f6bba46b89 Mon Sep 17 00:00:00 2001
From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:32:08 +0100
Subject: [PATCH 4/4] Fix typo

fixed typo in device, change demo to Demo
---
 system/devices/MikrotikHotspot.php | 14 +++++++-------
 ui/ui/app-settings.tpl             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/devices/MikrotikHotspot.php b/system/devices/MikrotikHotspot.php
index 804c6892..7f115cb3 100644
--- a/system/devices/MikrotikHotspot.php
+++ b/system/devices/MikrotikHotspot.php
@@ -214,7 +214,7 @@ class MikrotikHotspot
     function getClient($ip, $user, $pass)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $iport = explode(":", $ip);
@@ -224,7 +224,7 @@ class MikrotikHotspot
     function removeHotspotUser($client, $username)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $printRequest = new RouterOS\Request(
@@ -242,7 +242,7 @@ class MikrotikHotspot
     function addHotspotUser($client, $plan, $customer)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $addRequest = new RouterOS\Request('/ip/hotspot/user/add');
@@ -310,7 +310,7 @@ class MikrotikHotspot
     function setHotspotUser($client, $user, $pass)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
@@ -327,7 +327,7 @@ class MikrotikHotspot
     function setHotspotUserPackage($client, $username, $plan_name)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
@@ -344,7 +344,7 @@ class MikrotikHotspot
     function removeHotspotActiveUser($client, $username)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $onlineRequest = new RouterOS\Request('/ip/hotspot/active/print');
@@ -360,7 +360,7 @@ class MikrotikHotspot
     function getIpHotspotUser($client, $username)
     {
         global $_app_stage;
-        if ($_app_stage == 'demo') {
+        if ($_app_stage == 'Demo') {
             return null;
         }
         $printRequest = new RouterOS\Request(
diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index b4d50f87..c75ff5ec 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -1058,7 +1058,7 @@
     <br>
     <h4><b>{Lang::T('Settings For Cron Expired')}</b></h4>
     <p>
-        # {Lang::T('Expired Cronjob Every 5 Minutes')}<br>
+        # {Lang::T('Expired Cronjob Every 5 Minutes [Recommended]')}<br>
         */5 * * * * cd {$dir} && {$php} cron.php
         <br><br>
         # {Lang::T('Expired Cronjob Every 1 Hour')}<br>