From 606ee7f812f15ba55d6c1cd233699f9eed61ad8e Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 1 Feb 2025 12:07:32 +0530 Subject: [PATCH] FIX_NONIR_CHATBOT --- app/Controllers/Chatbot/MainMenuConversation.php | 2 +- app/{ => Controllers/Chatbot}/NetworkHospitalConversation.php | 0 app/Models/EmployeeModel.php | 2 +- app/Models/EmployeePolicyModel.php | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename app/{ => Controllers/Chatbot}/NetworkHospitalConversation.php (100%) diff --git a/app/Controllers/Chatbot/MainMenuConversation.php b/app/Controllers/Chatbot/MainMenuConversation.php index 01b1c576..76e150a6 100644 --- a/app/Controllers/Chatbot/MainMenuConversation.php +++ b/app/Controllers/Chatbot/MainMenuConversation.php @@ -49,7 +49,7 @@ class MainMenuConversation extends Conversation break; default: $this->say("Invalid selection. Please choose an option."); - $this->showMainMenu(); + $this->bot->startConversation(new MainMenuConversation()); break; } }); diff --git a/app/NetworkHospitalConversation.php b/app/Controllers/Chatbot/NetworkHospitalConversation.php similarity index 100% rename from app/NetworkHospitalConversation.php rename to app/Controllers/Chatbot/NetworkHospitalConversation.php diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 6571a34e..d8fd4894 100755 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -106,7 +106,7 @@ class EmployeeModel extends Model public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [],array $client_branch_id = []) { - $result = $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string']) + $result = $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string','employee_polices.claim_status']) ->join('employee_polices', 'employee_polices.employee_id = employees.id') ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id') ->join('policy_type', 'policy_type.id = client_policy.policy_type_id','left') diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 1d79f36d..274b0a0b 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -1731,7 +1731,7 @@ class EmployeePolicyModel extends Model employee_polices ep WHERE ep.file_id = $file_id - AND ep.uhid IS NOT NULL' + AND ep.uhid IS NOT NULL AND ep.status != 'truncated' AND ep.status != 'truncated' AND ep.is_active = 1;