diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index cf511080..1fd3c38a 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -1859,7 +1859,7 @@ class ClientController extends AdminController // Fetch related policy transactions $policy_transactions = $this->policyTransactionModel ->where('is_active', 1) - ->where('client_policy_id', $new['client_policy_id']) + ->where('client_policy_id', $new['id']) ->findAll(); $updated_pt_ids = []; @@ -4666,6 +4666,11 @@ class ClientController extends AdminController public function sendextraparam() { + // $data = db_connect()->table('jobs')->where('id', 1677)->get()->getRowArray(); + // // dd($data); + // $return = $this->updatePolicyTransactionDataWhileClinetPolicyUpdate(json_decode($data['payload'], true)); + // dd($return); + // die; // $employeeController = new EmployeeController(); // $employeeController->truncateFileData('633'); diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 28a3416a..cb93e213 100755 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -1913,6 +1913,23 @@ class EmpDataServiceController extends BaseController if(in_array($file['event_type'], ['missed_inception']) && isset($value[18])){ $endorsement_id = $value[18]; + + $result_for_employees_policy = $this->employeePolicyModel + ->select('employee_polices.*') + ->join('employees', 'employees.id = employee_polices.employee_id') + ->join('emp_endorsement', 'emp_endorsement.employee_id = employees.id') // assuming this is the correct join + ->where('employees.emp_code', $emp_code) + ->where('employees.name', $name) + ->where('employees.client_id', $client_id) + ->where('employees.client_branch_id', $client_branch_id) + ->where('employee_polices.client_policy_id', $client_policy_id) + ->where('employee_polices.is_active', 1) + ->where('employee_polices.status', 'active') + ->where('employees.is_active', 1) + ->where('employees.emp_status', 'active') + ->first(); + + $enrollment_file_id = $result_for_employees_policy['file_id'] ?? null; } //for addition and dependent_addition endorsement , endorsement_id update functionality diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 5d65c4a4..52143e10 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1587,9 +1587,17 @@ class EmployeeServiceController extends AdminController { $pre_rack_rate_name = $slab_value['rack_rate_name']; $rack_rate_json = json_decode($slab_value['additional_relationship'], true); - $relationship_array_key = strtolower($employee['relationship']); + $relationship_array_key = strtolower(trim($employee['relationship'])); - if(array_key_exists($relationship_array_key, $rack_rate_json) && $rack_rate_json[ strtolower($employee['relationship']) ] != 0 && $rack_rate_json[ strtolower($employee['relationship']) ] != 'NA') + if (in_array($relationship_array_key, ['son', 'daughter'])) { + $relationship_array_key = 'childrens'; + } elseif (in_array($relationship_array_key, ['father', 'mother'])) { + $relationship_array_key = 'parents'; + } elseif (in_array($relationship_array_key, ['father in law', 'mother in law', 'father-in-law', 'mother-in-law'])) { + $relationship_array_key = 'parents-in-law'; + } + + if(array_key_exists($relationship_array_key, $rack_rate_json) && $rack_rate_json[$relationship_array_key] != 0 && $rack_rate_json[$relationship_array_key] != 'NA') { $applicable_rack_rate_name = $slab_value['rack_rate_name']; $applicable_rack_rate_master = $slab_value['grid_master']; @@ -1623,6 +1631,9 @@ class EmployeeServiceController extends AdminController } + + die; + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); //set success msg to pull notifications