From 12f0894f5c6dfa8d2bb9329e72a60e90cbd7f320 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 29 Mar 2025 12:58:41 +0530
Subject: [PATCH 1/5] TEMP_FIX_SAVE_UPDATE_MPIN

---
 app/Config/Routes.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b6d181b3..e18a5909 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -460,6 +460,11 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
     $routes->get('get_ticket_data',"EmployeeRestController::get_ticket_data");
 });
 
+$routes->post("employeeRest/saveMpin", "RestAuthenticationController::saveMpin");
+$routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin");
+
+
+
 $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
 $routes->get("getAddOnPolicy", "EmployeeRestController::getAddOnPolicy");
 $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
@@ -467,8 +472,7 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
 
     $routes->post("storeFireBase", "EmployeeRestController::storeFireBase");
-    $routes->post("saveMpin", "RestAuthenticationController::saveMpin");
-    $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
+    // $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
     $routes->post("getChatResponse", "ChatBotController::getChatResponse");
     $routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile");
 

From 99812e66d77ed203cfcd93ec10a66402c49e1bb7 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 29 Mar 2025 16:15:29 +0530
Subject: [PATCH 2/5] TEMP_FIX_REST_CONTROLLER

---
 app/Controllers/RestAuthenticationController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index ebd8bf44..61ca1dc8 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -424,15 +424,14 @@ class RestAuthenticationController extends AdminController
             $mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null;
             $email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
             $mpin = $this->request->getJSON()->mpin;
-
             if (isset($mobile_number)) 
             {
                 $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
             }else{
                 $employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('relationship', 'self')->first();
             }
-           
             if ($employeeData && $mpin == $employeeData["mpin"]) {
+
                 $auth =  HttpRequestHelper::getRequestInfo();
                 if ($auth) {
                     $data = [
@@ -449,7 +448,8 @@ class RestAuthenticationController extends AdminController
 
 
 
-                $result = JWTToken::encode($employeeData);
+                // $result = JWTToken::encode($employeeData);
+                $result = $employeeData;
                 return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
             } else {
                 return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);
@@ -464,7 +464,7 @@ class RestAuthenticationController extends AdminController
         try {
             $mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null;
             $email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
-            $mpin = $this->request->getJSON()->mpin;
+            // $mpin = $this->request->getJSON()->mpin;
 
             if (isset($mobile_number)) 
             {

From e59d0177193667c8438b08b067f7bd09c5e481c5 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 29 Mar 2025 16:21:53 +0530
Subject: [PATCH 3/5] TEMP_FIX_REST_CONTROLLER

---
 app/Controllers/RestAuthenticationController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index 61ca1dc8..d16cf92a 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -448,8 +448,8 @@ class RestAuthenticationController extends AdminController
 
 
 
-                // $result = JWTToken::encode($employeeData);
-                $result = $employeeData;
+                $result = JWTToken::encode($employeeData);
+                // $result = $employeeData;
                 return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
             } else {
                 return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);

From 3543c3096cfac08b86be2128cd3e937fd0d0f289 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 29 Mar 2025 18:05:40 +0530
Subject: [PATCH 4/5] rest

---
 app/Views/view_rfq_non_eb.php | 51 +++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index 6ea8de67..bcceff5f 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -1,4 +1,10 @@
 <style>
+
+    .table-content.collapse:not(.show) {
+        display: block !important;  /* Allows width calculation */
+        height: 0;
+        overflow: hidden;
+    }
     #allTableContainer {
         max-width: 100%;
         overflow-x: auto;
@@ -2070,22 +2076,45 @@
         tableSNOTracker[tableID] = sno;
     }
 
+    
+
     function increaseTableWidth(increaseBy) {
 
         $('.table-collapsible-bar').each(function() {
-            let currentWidth = ($(this).width());
-            // // // console.log('table width ', typeof (currentWidth));
-            let increaseTableWidth = (currentWidth + increaseBy);
-            // // // console.log(increaseTableWidth);
-            $(this).width(currentWidth + increaseBy);
+            const $bar = $(this);
+            const wasCollapsed = $bar.hasClass('collapsed');
+            
+            // Temporarily show the bar for accurate width calculation
+            if(wasCollapsed) {
+                $bar.css({
+                    'display': 'block',
+                    'visibility': 'hidden',
+                    'position': 'absolute'
+                });
+            }
+
+            const currentWidth = $bar.width();
+            $bar.width(currentWidth + increaseBy);
+
+            // Restore original state
+            if(wasCollapsed) {
+                $bar.css({
+                    'display': '',
+                    'visibility': '',
+                    'position': ''
+                });
+            }
         });
-        // // // console.log("function called tablewidth increase");
+
         $("table").each(function() {
-            let currentWidth = ($(this).width());
-            // // // console.log('table width ', typeof(currentWidth));
-            let increaseTableWidth = (currentWidth + increaseBy);
-            // // // console.log(increaseTableWidth);
-            $(this).width(currentWidth + increaseBy);
+            const $table = $(this);
+            const currentWidth = $table.width();
+            $table.width(currentWidth + increaseBy);
+            
+            // Force layout update for hidden tables
+            $table.parent('.table-content').css('display', 'block');
+            $table.width(currentWidth + increaseBy);
+            $table.parent('.table-content').css('display', '');
         });
     }
 

From 65b3fc029f3e2d3ba7448e615fb326e1e955ef53 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Sat, 29 Mar 2025 18:24:04 +0530
Subject: [PATCH 5/5] FIX_TABLE_WIDTH_ISSUE

---
 app/Views/view_rfq_non_eb.php | 53 +++++++++++------------------------
 composer.json                 |  2 +-
 2 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index bcceff5f..6a182769 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -1,16 +1,12 @@
 <style>
-
-    .table-content.collapse:not(.show) {
-        display: block !important;  /* Allows width calculation */
-        height: 0;
-        overflow: hidden;
-    }
     #allTableContainer {
         max-width: 100%;
         overflow-x: auto;
         display: block;
     }
 
+    
+
     .btn-custom {
         background-color: #007bff;
         color: #fff;
@@ -2081,40 +2077,23 @@
     function increaseTableWidth(increaseBy) {
 
         $('.table-collapsible-bar').each(function() {
-            const $bar = $(this);
-            const wasCollapsed = $bar.hasClass('collapsed');
-            
-            // Temporarily show the bar for accurate width calculation
-            if(wasCollapsed) {
-                $bar.css({
-                    'display': 'block',
-                    'visibility': 'hidden',
-                    'position': 'absolute'
-                });
-            }
-
-            const currentWidth = $bar.width();
-            $bar.width(currentWidth + increaseBy);
-
-            // Restore original state
-            if(wasCollapsed) {
-                $bar.css({
-                    'display': '',
-                    'visibility': '',
-                    'position': ''
-                });
+            let currentWidth = ($(this).width());
+            let increaseTableWidth = (currentWidth + increaseBy);
+            if (increaseTableWidth < 1200){
+                increaseTableWidth = 1200+increaseBy
             }
+            $(this).width(currentWidth + increaseBy);
         });
-
+        // // // console.log("function called tablewidth increase");
         $("table").each(function() {
-            const $table = $(this);
-            const currentWidth = $table.width();
-            $table.width(currentWidth + increaseBy);
-            
-            // Force layout update for hidden tables
-            $table.parent('.table-content').css('display', 'block');
-            $table.width(currentWidth + increaseBy);
-            $table.parent('.table-content').css('display', '');
+            let currentWidth = ($(this).width());
+            // alert(currentWidth);
+            let increaseTableWidth = (currentWidth + increaseBy);
+            console.log("Table Width increased to ",increaseTableWidth);
+            if (increaseTableWidth < 1200){
+                increaseTableWidth = 1200+increaseBy
+            }
+            $(this).width(increaseTableWidth);
         });
     }
 
diff --git a/composer.json b/composer.json
index bbe0843f..bcf6883c 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "botman/driver-web": "^1.5",
         "dompdf/dompdf": "^2.0",
         "firebase/php-jwt": "^6.10",
-        "google/apiclient": "^2.15.0",
+        "google/apiclient": "^2.18",
         "kreait/firebase-php": "^7.0",
         "laminas/laminas-escaper": "^2.9",
         "php-amqplib/php-amqplib": "^2.8",