diff --git a/.env.sample b/.env.sample index cc9a927c..b8c1b80f 100755 --- a/.env.sample +++ b/.env.sample @@ -159,3 +159,19 @@ bds.dailyReportEmails = MEDIASSIST_WELLNESS_KEY = MEDIASSIST_WELLNESS_IV = MEDIASSIST_WELLNESS_LOGIN_URL = + + +#-------------------------------------------------------------------- +# Icici api details LIVE +#-------------------------------------------------------------------- + +ICICI_TOKEN_URL = +ICICI_BASE_URL = +ICICI_PASSWORD = +ICICI_CLIENT_ID = +ICICI_CLIENT_SECRET = +ICICI_API_SCOPE = +ICICI_GRANT_TYPE = + + +ICICI_PRIMARY_KEY_CONSTANT = diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index b5d1706c..fe698d03 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -145,6 +145,7 @@ class ClientController extends AdminController private const ALLOWED_DUPLICATE_CHECK_TABLES = [ 'clients', 'client_branch', 'level_contacts', 'insurers', 'insurer_branch', 'tpa', 'tpa_branch', 'policies', 'client_policy', 'user_profiles', + 'policy_transaction', ]; public function checkDuplicateTableFieldValue() @@ -5873,6 +5874,7 @@ class ClientController extends AdminController $policyListByClient = []; $unitList = []; $insurerBranchList = []; + $policyCount = []; //for client branch mapping to the client foreach ($branches as $branch) { @@ -5901,20 +5903,30 @@ class ClientController extends AdminController $client['client_policy_count'] = $policyCount[$client['id']] ?? 0; } - if (!empty($branchList)) { + if (!empty($clients)) { return $this->respond([ 'status' => true, 'client_data' => $clients, 'vehicle_data' => $vehicles, - 'branch_data' => $branchList, - 'policy_data' => $policyList, - 'policyListByClient' => $policyListByClient, + 'branch_data' => $branchList ?? [], + 'policy_data' => $policyList ?? [], + 'policyListByClient' => $policyListByClient ?? [], 'insurer_data' => $insurers, - 'insurer_branch_data' => $insurerBranchList, - 'unit_data' => $unitList, + 'insurer_branch_data' => $insurerBranchList ?? [], + 'unit_data' => $unitList ?? [], ], 200); } else { - return $this->respond(['status' => false], 200); + return $this->respond([ + 'status' => false, + 'client_data' => [], + 'vehicle_data' => [], + 'branch_data' => [], + 'policy_data' => [], + 'policyListByClient' => [], + 'insurer_data' => [], + 'insurer_branch_data' => [], + 'unit_data' => [], + ], 200); } } diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index da5c0612..a2ff2325 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -2318,7 +2318,7 @@ class PolicyTransactionController extends BaseController $policy_type_id = (!isset($policy_type_id) || $policy_type_id === '' || $policy_type_id === null) ? 0 : $policy_type_id; $date_type = (!isset($date_type) || $date_type === '' || $date_type === null) ? 0 : $date_type; $issuer = (!isset($issuer) || $issuer === '' || $issuer === null) ? 0 : $issuer; - $status = (!isset($issuer) || $status === '' || $status === null) ? 0 : $status; + $status = (!isset($status) || $status === '' || $status === null) ? 0 : $status; if($bds_edit_pt_id == null){ $data['endorsement_data_list'] = $this->policyTransactionModel->getEndorsementTranctionListData($start_date, $end_date, $client_id, $insurer_id, $policy_type_id, $date_type, $issuer, $status); @@ -2412,7 +2412,7 @@ class PolicyTransactionController extends BaseController $policy_type_id = (!isset($policy_type_id) || $policy_type_id === '' || $policy_type_id === null) ? 0 : $policy_type_id; $date_type = (!isset($date_type) || $date_type === '' || $date_type === null) ? 0 : $date_type; $issuer = (!isset($issuer) || $issuer === '' || $issuer === null) ? 0 : $issuer; - $status = (!isset($issuer) || $status === '' || $status === null) ? 0 : $status; + $status = (!isset($status) || $status === '' || $status === null) ? 0 : $status; if($bds_edit_pt_id == null){ $data['endorsement_data_list'] = $this->policyTransactionModel->getEndorsementTranctionListData($start_date, $end_date, $client_id, $insurer_id, $policy_type_id, $date_type, $issuer, $status); @@ -5102,9 +5102,20 @@ class PolicyTransactionController extends BaseController // ->where('client_policy.is_active', 1) // ->findAll(); + // Only columns needed for policy_transaction_endorsement_list appendPolicies() JSON — not policy_transaction.* + // (full rows + json_encode duplicated memory and exceeded PHP memory_limit on large datasets). $policies = $this->policyTransactionModel ->select(" - policy_transaction.*, + policy_transaction.id, + policy_transaction.client_id, + policy_transaction.client_branch_id, + policy_transaction.policy_no, + policy_transaction.policy_type_id, + policy_transaction.insurer_id, + policy_transaction.insurer_branch_id, + policy_transaction.tpa_id, + policy_transaction.tpa_branch_id, + policy_transaction.cd_ac_no, policy_type.policy_type, policy_type.ebp, policy_type.etp, @@ -5124,11 +5135,6 @@ class PolicyTransactionController extends BaseController foreach ($policies as $policy) { $policyList[$policy['client_branch_id']][] = $policy; $policyListByClient[$policy['client_id']][] = $policy; - if (isset($policyCount[$policy['client_id']])) { - $policyCount[$policy['client_id']]++; - } else { - $policyCount[$policy['client_id']] = 1; - } } return [$policyList, $policyListByClient]; diff --git a/app/Helpers/session_helper.php b/app/Helpers/session_helper.php index bd54744c..8769216e 100755 --- a/app/Helpers/session_helper.php +++ b/app/Helpers/session_helper.php @@ -180,8 +180,8 @@ if (!function_exists('user_team')) { function user_team() { // $CI =& get_instance(); - $session = \Config\Services::session(); - return $session->get('user_team'); + $session = \Config\Services::session(); + return $session->get('user_team') ?: []; } } diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php index 635f3db4..8fa6c56d 100755 --- a/app/Views/client_kyc.php +++ b/app/Views/client_kyc.php @@ -92,7 +92,7 @@ - + @@ -181,7 +197,7 @@ >Back --> -
+ @@ -1055,6 +1071,9 @@ $('.loader-mask').fadeIn(); $('#endorsement_form_id')[0].reset(); + if (typeof window.resetEndorsementFormParsley === 'function') { + window.resetEndorsementFormParsley('#endorsement_form_id'); + } // var id = $(input).attr('data-id'); var id = input; @@ -1088,10 +1107,77 @@ $('#policy_tranction_primarykey_for_file_upload').val(res.data.id); $('#client_policy_id_for_file_upload').val(res.data.client_policy_id); $('#policy_tranction_primarykey').val(res.data.id); - $('#client_type').val(res.data.client_type).trigger('change'); - $('#client_id').val(res.data.client_id).change(); $('#base_cd_amount').val(res.data.base_cd_amount); + var applyEndorsementClientSelection = function () { + var clientType = String(res.data.client_type || ''); + var clientId = String(res.data.client_id || ''); + var branchId = String(res.data.client_branch_id || ''); + var policyId = String(res.data.client_policy_id || ''); + var $clientType = $('#client_type'); + var $client = $('#client_id'); + var $branch = $('#client_branch_id'); + var $policy = $('#client_policy_id'); + + if (clientType) { + $clientType.val(clientType).trigger('change'); + } + + if (clientId && !$client.find("option[value='" + clientId + "']").length) { + $client.append($('