diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 0e141e75..2b5354d5 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -610,7 +610,23 @@ class ClientController extends AdminController $policy_terms = $this->clientPolicyModel->where('id', $this->request->getPost('base_policy'))->first(); if ( $this->request->getPost('is_addon') == 2 || $this->request->getPost('is_addon') == 3) { - $data['policy_terms'] = $policy_terms['policy_terms']; + + if ($this->request->getPost('is_addon') == 3) { + $policyTerm = $policy_terms['policy_terms']; + $decoded_policyTerm = json_decode($policyTerm, true); + $decoded_policyTerm['family_floater'] =0; + $decoded_policyTerm['family_floaters']['self'] =0; + $decoded_policyTerm['family_floaters']['spouse'] =0; + $decoded_policyTerm['family_floaters']['childrens'] =0; + $decoded_policyTerm['family_floaters']['parents'] =0; + $decoded_policyTerm['family_floaters']['parents-in-law'] =0; + $decoded_policyTerm['family_floaters']['either-parents-pil'] =0; + + $data['policy_terms'] = json_encode($decoded_policyTerm); + }else{ + $data['policy_terms'] = $policy_terms['policy_terms']; + + } } @@ -679,7 +695,23 @@ class ClientController extends AdminController $policy_terms = $this->clientPolicyModel->where('id', $this->request->getPost('base_policy'))->first(); if ( $this->request->getPost('is_addon') == 2 || $this->request->getPost('is_addon') == 3) { - $data['policy_terms'] = $policy_terms['policy_terms']; + if ($this->request->getPost('is_addon') == 3) { + $policyTerm = $policy_terms['policy_terms']; + $decoded_policyTerm = json_decode($policyTerm, true); + $decoded_policyTerm['family_floater'] =0; + $decoded_policyTerm['family_floaters']['self'] =0; + $decoded_policyTerm['family_floaters']['spouse'] =0; + $decoded_policyTerm['family_floaters']['childrens'] =0; + $decoded_policyTerm['family_floaters']['parents'] =0; + $decoded_policyTerm['family_floaters']['parents-in-law'] =0; + $decoded_policyTerm['family_floaters']['either-parents-pil'] =0; + + $data['policy_terms'] = json_encode($decoded_policyTerm); + } else { + $data['policy_terms'] = $policy_terms['policy_terms']; + } + + } // dd($data); @@ -1259,6 +1291,7 @@ class ClientController extends AdminController ->where("employees.emp_status",'active') ->countAllResults(); + $emp_count_by_policy = $this->employeePolicyModel->where('client_policy_id',$client_policy_id)->where('is_active',1)->countAllResults(); if($emp_count == 0){ $emp_count = true; }else{ @@ -1266,7 +1299,7 @@ class ClientController extends AdminController } if ($record) { - return $this->respond(['Status' => true,'code' => 200,'data' => $record['policy_terms'], 'count' => $emp_count, 'policy_name' => $policy_name], 200); + return $this->respond(['Status' => true,'code' => 200,'data' => $record['policy_terms'], 'count' => $emp_count, 'policy_name' => $policy_name,'policy_addon' => $record['is_addon'], 'emp_count_by_policy'=>$emp_count_by_policy], 200); } else { return $this->respond(['Status' => false,'code' => 200,'message' => 'Record not found.', 'count' => $emp_count, 'policy_name' => $policy_name], 200); } diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 5245fcae..1631a100 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1308,7 +1308,7 @@ public function calculatePremium()//family level //get policy slab rates $slab_details = $this->policesModel->getPolicySlabRatesForEmpOnboard($client_policy_id,$client_id); - $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $client_policy_id,emp_code: $emp_code,emp_status:['active'],policy_status:['active']); + $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $client_policy_id,emp_code: $emp_code,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']); $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception']; // dd($this->employeeModel->getLastQuery()); diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index d211a9cf..908612fe 100644 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -424,10 +424,26 @@ $(document).ready(function() { // console.log(res) var OptionsHTML = ''; OptionsHTML += ''; + $policy_type_value = $('#policy_type').val(); $.each(res.data, function(index, item) { - OptionsHTML += ''; + + if ($policy_type_value == 3) { + if (item.policy_type_id == 5 || item.policy_type_id == 3) { + OptionsHTML += ''; + } + }else if($policy_type_value == 2){ + if (item.policy_type_id == 4 ) { + OptionsHTML += ''; + } + }else{ + OptionsHTML += ''; + } }); $('#policy').html(OptionsHTML); @@ -989,6 +1005,10 @@ $('#policy_type').change(function() { $('#end_date').val(''); $('#base_policy').val('0'); + if($(this).val() == 3){ + toastr.warning('Please Change the Policy Terms after Submit the Policy!', 'warning'); + } + if ($(this).val() != '1' && $(this).val() != '0') { $('#base_policy_id').show(); @@ -1011,7 +1031,6 @@ $('#policy_type').change(function() { $('#base_policy_id').hide(); $('#base_policy').prop('required', false); } - }) @@ -1074,8 +1093,8 @@ $(document).ready(function(){ const queryString = objectToQueryString(queryParams); // var uri = '= base_url('util/fetch-policy-for-policy-type')?>?' + queryString var uri = '= base_url('client/policy/list/')?>' + client_policy_id - console.log('uri', uri) - console.log('queryString', queryString) + // console.log('uri', uri) + // console.log('queryString', queryString) $('.loader').fadeIn(); $('.loader-mask').fadeIn(); @@ -1102,11 +1121,19 @@ $(document).ready(function(){ var policeOptionHTML = ''; + $policy_type_value = $('#policy_type').val(); $.each(res.policy, function(index, item) { - console.log(item) - policeOptionHTML += ''; + // } + // } + }); $('#policy').html(policeOptionHTML); diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php index f5b9b5ac..25b16341 100644 --- a/app/Views/policy_gmc_terms.php +++ b/app/Views/policy_gmc_terms.php @@ -105,8 +105,8 @@