Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-03-31 09:45:55 +05:30
commit 4826f71a71
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Config/Routes.php
View File

@ -463,6 +463,11 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
$routes->get('get_ticket_data',"EmployeeRestController::get_ticket_data"); $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("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
$routes->get("getAddOnPolicy", "EmployeeRestController::getAddOnPolicy"); $routes->get("getAddOnPolicy", "EmployeeRestController::getAddOnPolicy");
$routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { $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("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
$routes->post("storeFireBase", "EmployeeRestController::storeFireBase"); $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->post("getChatResponse", "ChatBotController::getChatResponse");
$routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile"); $routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile");

6
app/Controllers/RestAuthenticationController.php
View File

@ -424,15 +424,14 @@ class RestAuthenticationController extends AdminController
$mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null; $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; $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)) if (isset($mobile_number))
{ {
$employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
}else{ }else{
$employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('relationship', 'self')->first(); $employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('relationship', 'self')->first();
} }
if ($employeeData && $mpin == $employeeData["mpin"]) { if ($employeeData && $mpin == $employeeData["mpin"]) {
$auth = HttpRequestHelper::getRequestInfo(); $auth = HttpRequestHelper::getRequestInfo();
if ($auth) { if ($auth) {
$data = [ $data = [
@ -450,6 +449,7 @@ class RestAuthenticationController extends AdminController
$result = JWTToken::encode($employeeData); $result = JWTToken::encode($employeeData);
// $result = $employeeData;
return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
} else { } else {
return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200); return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200);
@ -464,7 +464,7 @@ class RestAuthenticationController extends AdminController
try { try {
$mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null; $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; $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)) if (isset($mobile_number))
{ {

18
app/Views/view_rfq_non_eb.php
View File

@ -5,6 +5,8 @@
display: block; display: block;
} }
.btn-custom { .btn-custom {
background-color: #007bff; background-color: #007bff;
color: #fff; color: #fff;
@ -2070,22 +2072,28 @@
tableSNOTracker[tableID] = sno; tableSNOTracker[tableID] = sno;
} }
function increaseTableWidth(increaseBy) { function increaseTableWidth(increaseBy) {
$('.table-collapsible-bar').each(function() { $('.table-collapsible-bar').each(function() {
let currentWidth = ($(this).width()); let currentWidth = ($(this).width());
// // // console.log('table width ', typeof (currentWidth));
let increaseTableWidth = (currentWidth + increaseBy); let increaseTableWidth = (currentWidth + increaseBy);
// // // console.log(increaseTableWidth); if (increaseTableWidth < 1200){
increaseTableWidth = 1200+increaseBy
}
$(this).width(currentWidth + increaseBy); $(this).width(currentWidth + increaseBy);
}); });
// // // console.log("function called tablewidth increase"); // // // console.log("function called tablewidth increase");
$("table").each(function() { $("table").each(function() {
let currentWidth = ($(this).width()); let currentWidth = ($(this).width());
// // // console.log('table width ', typeof(currentWidth)); // alert(currentWidth);
let increaseTableWidth = (currentWidth + increaseBy); let increaseTableWidth = (currentWidth + increaseBy);
// // // console.log(increaseTableWidth); console.log("Table Width increased to ",increaseTableWidth);
$(this).width(currentWidth + increaseBy); if (increaseTableWidth < 1200){
increaseTableWidth = 1200+increaseBy
}
$(this).width(increaseTableWidth);
}); });
} }

2
composer.json
View File

@ -18,7 +18,7 @@
"botman/driver-web": "^1.5", "botman/driver-web": "^1.5",
"dompdf/dompdf": "^2.0", "dompdf/dompdf": "^2.0",
"firebase/php-jwt": "^6.10", "firebase/php-jwt": "^6.10",
"google/apiclient": "^2.15.0", "google/apiclient": "^2.18",
"kreait/firebase-php": "^7.0", "kreait/firebase-php": "^7.0",
"laminas/laminas-escaper": "^2.9", "laminas/laminas-escaper": "^2.9",
"php-amqplib/php-amqplib": "^2.8", "php-amqplib/php-amqplib": "^2.8",