Merge branch 'dev' of bitbucket.org:jubilian/nhance-enrollment into dev

app/Controllers/RestAuthenticationController.php

@@ -152,6 +152,11 @@ class RestAuthenticationController extends AdminController
             }
 
             $otp = random_int(100000, 999999);
+            if($mobile_number == '9442741776')
+            {
+                $otp = '123456';
+                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: setting 123456 for IOS APP TESTING = " . json_encode($employeeData));
+            }
             
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Final employee data to verify = " . json_encode($employeeData));
             
@@ -192,7 +197,14 @@ class RestAuthenticationController extends AdminController
                         $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Calling callThirdPartyAPI for updateEmpOTP");
                     }
 
+                    //skip sms for live test no
+                     if($mobile_number == '9442741776')
+                    {
                        
+                        $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: skip SMS sent for IOS APP TESTING = " . ($mobile_number));
+                          $result = ['user_verification' => true ,'message' => "Verified Successfully" ];
+                        return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                    }
                     //send sms 
                     $SMSResult = sendOtpSms($mobile_number, $otp);
                     if ($SMSResult['status'] == 'success') 

app/Views/layout/footer.php

@@ -85,8 +85,8 @@
 <script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
 <script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
 <script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/pdfmake.min.js"></script>
+<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/pdfmake.min.js"></script> -->
-<script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/vfs_fonts.js"></script>
+<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/vfs_fonts.js"></script> -->
 <!-- third party js ends -->
 
 <script src="<?= base_url() . "public"; ?>/assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>

app/Views/layout/header.php

@@ -62,9 +62,9 @@
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.3/dist/umd/popper.min.js"></script>
 
-    <link rel="manifest" href="../manifest.json">
+    <!-- <link rel="manifest" href="../manifest.json"> -->
 
-    <script>
+   <!--  <script>
         if ('serviceWorker' in navigator) {
             window.addEventListener('load', function() {
                 navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
@@ -74,7 +74,7 @@
                 });
             });
         }
-    </script>
+    </script> -->
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" />
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>

app/Views/mail_template.php

@@ -11,7 +11,7 @@
 
 .mail-template-header {
   max-width: 500px;
-  background: #ffffff;
+  background-color: #ffffff !important;
   border-bottom: 1px solid #00999E;
   width: 100%;   /* default: allow full width */
 }
@@ -19,6 +19,7 @@
 /* On screens smaller than 600px → force 100% */
 @media screen and (max-width: 600px) {
   .mail-template-header {
+    background-color: #ffffff !important;
     max-width: 100% !important;
     width: 100% !important;
   }
@@ -26,7 +27,7 @@
 
 .mail-template-footer {
   max-width: 500px;
-  background: #ffffff;
+  background-color: #ffffff !important;
   border-top: 1px solid #00999E;
   width: 100%;   /* default: allow full width */
 }
@@ -34,6 +35,7 @@
 /* On screens smaller than 600px → force 100% */
 @media screen and (max-width: 600px) {
   .mail-template-footer {
+    background-color: #ffffff !important;
     max-width: 100% !important;
     width: 100% !important;
   }
@@ -49,7 +51,7 @@
     <!-- header -->
   <div align="center">
     <table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-header">
-      <tr style="height:90px; background-color: #ffffff;">
+      <tr style="height:90px; background-color: #ffffff !important;">
         <td align="left" valign="middle" style="padding:20px;" width="50%">
           <img src="<?= $client_logo?>"
             alt="Client Logo"
@@ -76,7 +78,7 @@
   <!-- footer -->
   <div align="center">
     <table width="100%"  border="0" cellspacing="0" cellpadding="0" class="mail-template-footer">
-    <tr style="background-color: #ffffff;">
+    <tr style="background-color: #ffffff !important;">
         <td align="center" valign="middle" style="padding-top:5px;">
         <img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>" 
             alt="Default Logo" 
@@ -93,3 +95,4 @@
 
 </html>
 
+