From 283de4d276ed6e1a4dd39b4da8a4ae37fdd83f3a Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 26 Feb 2025 11:14:01 +0530 Subject: [PATCH 1/4] FIX_CLAIM_ARRAY : RV --- app/Controllers/TicketController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index a1209efc..f98e0192 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -115,7 +115,8 @@ class TicketController extends BaseController '((AUTO_QUERY_CONTENT))' => 'auto_query_content', ]; $this->extraFields = [ - + 1 => ['non_id_reason'], + 10 => ['pay_initiate_date'], 3 => ['raised_date'], 4 => ['raised_date'], 5 => ['claim_number', 'registration_date'], From 042fcc068b5c690d80c82da3e476cc04435b4080 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 26 Feb 2025 11:58:43 +0530 Subject: [PATCH 2/4] CHANGE_TRIGGER_TYPE_8 : RV --- app/Controllers/TicketController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index f98e0192..6da26715 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -99,7 +99,8 @@ class TicketController extends BaseController 4 => "Trigger 4", 5 => "Trigger 5", 6 => "Trigger 6", - 7 => "Trigger 7" + 7 => "Trigger 7", + 8 => "Trigger 8", ]; $this->placeHolders = [ From 2c0f1dabd3036bdcc5fef7e25b70b2910fff7223 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 26 Feb 2025 12:32:21 +0530 Subject: [PATCH 3/4] CHANGE_CLAIM_MAIL_TRIGGER : RV --- app/Views/ticket_mail_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php index 213312b4..00413062 100644 --- a/app/Views/ticket_mail_template.php +++ b/app/Views/ticket_mail_template.php @@ -83,7 +83,7 @@ aria-hidden="true" data-toggle="tooltip" data-placement="top" - title=""> + title=""> From c75cedac0c488c8ec1c667352bae9b77b441425b Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Thu, 27 Feb 2025 15:27:12 +0530 Subject: [PATCH 4/4] CHANGE : active policy check in login api --- .../RestAuthenticationController.php | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 56c65ff8..752d116c 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -71,13 +71,20 @@ class RestAuthenticationController extends AdminController $mobile_number = $this->request->getJSON()->mobile_number; - $employeeData = $this->employeeModel->where('mobile', $mobile_number) - ->where('relationship', 'self') - ->where('emp_status !=', 'truncated') - ->where('is_active', 1) - ->first(); + $employeeData = $this->employeeModel->select('employees.relationship,EP.employee_id') + ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner') + ->where('employees.is_active', 1) + ->where('employees.relationship', 'self') + ->where('employees.emp_status !=', 'truncated') + ->where('employees.mobile', $mobile_number) + ->where('EP.is_active', 1) + ->whereIn('EP.status', ['active']) + ->first(); + + - if ($employeeData) { + if (isset($employeeData['employee_id'])) + { $result = ['user_verification' => true ,'message' => "Verified Successfully"]; return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); @@ -97,11 +104,18 @@ class RestAuthenticationController extends AdminController $email = $this->request->getJSON()->email; - $employeeData = $this->employeeModel->where('email_corporate', $email)->where('relationship', 'self') - ->where('emp_status !=', 'truncated')->where('is_active', 1) + $employeeData = $this->employeeModel->select('employees.relationship,EP.employee_id') + ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner') + ->where('employees.is_active', 1) + ->where('employees.relationship', 'self') + ->where('employees.emp_status !=', 'truncated') + ->where('employees.email_corporate', $email) + ->where('EP.is_active', 1) + ->whereIn('EP.status', ['active']) ->first(); - if ($employeeData) { + if (isset($employeeData['employee_id'])) + { $otp = random_int(100000, 999999);