From fd920748be3b6ad2bd1e60dd1f873924d2e46122 Mon Sep 17 00:00:00 2001
From: iBNu Maksum <me@ibnux.net>
Date: Fri, 6 Dec 2024 15:30:43 +0700
Subject: [PATCH] Urgent Fix registration logic

---
 system/lan/english.json         |  7 +++-
 ui/ui/app-settings.tpl          | 15 +++------
 ui/ui/customer/register-otp.tpl | 58 +++++++++++++++------------------
 ui/ui/customer/register.tpl     | 47 ++++++++++++--------------
 version.json                    |  2 +-
 5 files changed, 58 insertions(+), 71 deletions(-)

diff --git a/system/lan/english.json b/system/lan/english.json
index 060d9165..d2ea4a1e 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -918,5 +918,10 @@
     "Email_Address": "Email Address",
     "Photo_Required": "Photo Required",
     "Customer_Registration_need_to_upload_their_photo": "Customer Registration need to upload their photo",
-    "Account_already_exists": "Account already exists"
+    "Account_already_exists": "Account already exists",
+    "Notify_Admin": "Notify Admin",
+    "Notify_Admin_upon_self_registration": "Notify Admin upon self registration",
+    "Registration_Mandatory_Fields": "Registration Mandatory Fields",
+    "Mikrotik_SMS_Command": "Mikrotik SMS Command",
+    "Mandatory_Fields": "Mandatory Fields"
 }
\ No newline at end of file
diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index 4a002bfd..59f8146e 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -385,28 +385,23 @@
                     </p>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-3 control-label">{Lang::T('Registration Mandatory Fields')}:</label><br>
+                    <label class="col-md-3 control-label">{Lang::T('Mandatory Fields')}:</label><br>
                     <label class="col-md-3 control-label">
-                        <input type="checkbox" name="man_fields_email" value="yes" 
+                        <input type="checkbox" name="man_fields_email" value="yes"
                             {if !isset($_c['man_fields_email']) || $_c['man_fields_email'] neq 'no'}checked{/if}>
                         {Lang::T('Email')}
                     </label>
                     <label class="col-md-3 control-label">
-                        <input type="checkbox" name="man_fields_fname" value="yes" 
+                        <input type="checkbox" name="man_fields_fname" value="yes"
                             {if !isset($_c['man_fields_fname']) || $_c['man_fields_fname'] neq 'no'}checked{/if}>
                         {Lang::T('Full Name')}
                     </label>
                     <label class="col-md-3 control-label">
-                        <input type="checkbox" name="man_fields_address" value="yes" 
+                        <input type="checkbox" name="man_fields_address" value="yes"
                             {if !isset($_c['man_fields_address']) || $_c['man_fields_address'] neq 'no'}checked{/if}>
                         {Lang::T('Address')}
                     </label>
-                    <label class="col-md-3 control-label">
-                        <input type="checkbox" name="man_fields_custom" value="yes" 
-                            {if !isset($_c['man_fields_custom']) || $_c['man_fields_custom'] neq 'no'}checked{/if}>
-                        {Lang::T('Custom Fields')}
-                    </label>
-                </div>                
+                </div>
                 <button class="btn btn-success btn-block" type="submit">
                     {Lang::T('Save Changes')}
                 </button>
diff --git a/ui/ui/customer/register-otp.tpl b/ui/ui/customer/register-otp.tpl
index 199eca6e..b4993a23 100644
--- a/ui/ui/customer/register-otp.tpl
+++ b/ui/ui/customer/register-otp.tpl
@@ -33,33 +33,27 @@
                                 placeholder="{Lang::T('Verification Code')}" name="otp_code">
                         </div>
                         {if $_c['photo_register'] == 'yes'}
-                        <div class="form-group">
-                            <label>{Lang::T('Photo')}</label>
-                            <input type="file" required class="form-control" id="photo" name="photo" accept="image/*">
-                        </div>
+                            <div class="form-group">
+                                <label>{Lang::T('Photo')}</label>
+                                <input type="file" required class="form-control" id="photo" name="photo" accept="image/*">
+                            </div>
                         {/if}
-                        {if $_c['man_fields_fname'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Full Name')}</label>
-                            <input type="text" required class="form-control" id="fullname" value="{$fullname}"
-                                name="fullname">
+                            <input type="text" {if $_c['man_fields_fname'] neq 'no'}required{/if} class="form-control"
+                                id="fullname" value="{$fullname}" name="fullname">
                         </div>
-                        {/if}
-                        {if $_c['man_fields_address'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Email')}</label>
-                            <input type="text" class="form-control" placeholder="xxxxxx@xxx.xx" id="email"
-                                value="{$email}" name="email">
+                            <input type="text" class="form-control" {if $_c['man_fields_email'] neq 'no'}required{/if}
+                                placeholder="xxxxxx@xxx.xx" id="email" value="{$email}" name="email">
                         </div>
-                        {/if}
-                        {if $_c['man_fields_address'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Home Address')}</label>
-                            <input type="text" name="address" id="address" value="{$address}" class="form-control">
+                            <input type="text" name="address" {if $_c['man_fields_address'] neq 'no'}required{/if}
+                                id="address" value="{$address}" class="form-control">
                         </div>
-                        {if $_c['man_fields_custom'] neq 'no'}
                         {$customFields}
-                        {/if}
                     </div>
                 </div>
             </div>
@@ -121,21 +115,21 @@
     </div>
 </div>
 {if $_c['tawkto'] != ''}
-<!--Start of Tawk.to Script-->
-<script type="text/javascript">
-    var Tawk_API = Tawk_API || {},
-        Tawk_LoadStart = new Date();
-    (function () {
-        var s1 = document.createElement("script"),
-            s0 = document.getElementsByTagName("script")[0];
-        s1.async = true;
-        s1.src = 'https://embed.tawk.to/{$_c['tawkto']}';
-        s1.charset = 'UTF-8';
-        s1.setAttribute('crossorigin', '*');
-        s0.parentNode.insertBefore(s1, s0);
-    })();
-</script>
-<!--End of Tawk.to Script-->
+    <!--Start of Tawk.to Script-->
+    <script type="text/javascript">
+        var Tawk_API = Tawk_API || {},
+            Tawk_LoadStart = new Date();
+        (function() {
+            var s1 = document.createElement("script"),
+                s0 = document.getElementsByTagName("script")[0];
+            s1.async = true;
+            s1.src = 'https://embed.tawk.to/{$_c['tawkto']}';
+            s1.charset = 'UTF-8';
+            s1.setAttribute('crossorigin', '*');
+            s0.parentNode.insertBefore(s1, s0);
+        })();
+    </script>
+    <!--End of Tawk.to Script-->
 {/if}
 
-{include file="customer/footer-public.tpl"}
+{include file="customer/footer-public.tpl"}
\ No newline at end of file
diff --git a/ui/ui/customer/register.tpl b/ui/ui/customer/register.tpl
index c34ba622..ec144d0b 100644
--- a/ui/ui/customer/register.tpl
+++ b/ui/ui/customer/register.tpl
@@ -19,57 +19,50 @@
                         <div class="form-group">
                             <label>
                                 {if $_c['registration_username'] == 'phone'}
-                                {Lang::T('Phone Number')}
+                                    {Lang::T('Phone Number')}
                                 {elseif $_c['registration_username'] == 'email'}
-                                {Lang::T('Email')}
+                                    {Lang::T('Email')}
                                 {else}
-                                {Lang::T('Usernames')}
+                                    {Lang::T('Usernames')}
                                 {/if}
                             </label>
                             <div class="input-group">
                                 {if $_c['registration_username'] == 'phone'}
-                                <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-phone-alt"></i></span>
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-phone-alt"></i></span>
                                 {elseif $_c['registration_username'] == 'email'}
-                                <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-envelope"></i></span>
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-envelope"></i></span>
                                 {else}
-                                <span class="input-group-addon" id="basic-addon1"><i
-                                        class="glyphicon glyphicon-user"></i></span>
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username"
                                     placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Usernames')}{/if}">
                             </div>
                         </div>
                         {if $_c['photo_register'] == 'yes'}
-                        <div class="form-group">
-                            <label>{Lang::T('Photo')}</label>
-                            <input type="file" required class="form-control" id="photo" name="photo" accept="image/*">
-                        </div>
+                            <div class="form-group">
+                                <label>{Lang::T('Photo')}</label>
+                                <input type="file" required class="form-control" id="photo" name="photo" accept="image/*">
+                            </div>
                         {/if}
-                        {if $_c['man_fields_fname'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Full Name')}</label>
-                            <input type="text" required class="form-control" id="fullname" value="{$fullname}"
-                                name="fullname">
+                            <input type="text" {if $_c['man_fields_fname'] neq 'no'}required{/if} class="form-control"
+                                id="fullname" value="{$fullname}" name="fullname">
                         </div>
-                        {/if}
-                        {if $_c['man_fields_email'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Email')}</label>
-                            <input type="text" class="form-control" id="email" placeholder="xxxxxxx@xxxx.xx"
-                                value="{$email}" name="email">
+                            <input type="text" {if $_c['man_fields_email'] neq 'no'}required{/if} class="form-control"
+                                id="email" placeholder="xxxxxxx@xxxx.xx" value="{$email}" name="email">
                         </div>
-                        {/if}
-                        {if $_c['man_fields_address'] neq 'no'}
                         <div class="form-group">
                             <label>{Lang::T('Home Address')}</label>
-                            <input type="text" name="address" id="address" value="{$address}" class="form-control">
+                            <input type="text" {if $_c['man_fields_address'] neq 'no'}required{/if} name="address"
+                                id="address" value="{$address}" class="form-control">
                         </div>
-                        {/if}
-                        {if $_c['man_fields_custom'] neq 'no'}
                         {$customFields}
-                        {/if}
                     </div>
                 </div>
             </div>
@@ -108,4 +101,4 @@
         </div>
     </form>
 </div>
-{include file="customer/footer-public.tpl"}
+{include file="customer/footer-public.tpl"}
\ No newline at end of file
diff --git a/version.json b/version.json
index e4060def..82742c92 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.12.6"
+    "version": "2024.12.6.1"
 }
\ No newline at end of file