diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b70388e0..0059a7a1 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -463,6 +463,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) { @@ -470,8 +475,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"); diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index ebd8bf44..d16cf92a 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 = [ @@ -450,6 +449,7 @@ class RestAuthenticationController extends AdminController $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)) { diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php index 6ea8de67..6a182769 100644 --- a/app/Views/view_rfq_non_eb.php +++ b/app/Views/view_rfq_non_eb.php @@ -5,6 +5,8 @@ display: block; } + + .btn-custom { background-color: #007bff; color: #fff; @@ -2070,22 +2072,28 @@ 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); + if (increaseTableWidth < 1200){ + increaseTableWidth = 1200+increaseBy + } $(this).width(currentWidth + increaseBy); }); // // // console.log("function called tablewidth increase"); $("table").each(function() { let currentWidth = ($(this).width()); - // // // console.log('table width ', typeof(currentWidth)); + // alert(currentWidth); let increaseTableWidth = (currentWidth + increaseBy); - // // // console.log(increaseTableWidth); - $(this).width(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",