diff --git a/app/Controllers/EmployeeMultiEventServiceController.php b/app/Controllers/EmployeeMultiEventServiceController.php index 634af029..b554a969 100644 --- a/app/Controllers/EmployeeMultiEventServiceController.php +++ b/app/Controllers/EmployeeMultiEventServiceController.php @@ -223,8 +223,8 @@ class EmployeeMultiEventServiceController extends BaseController 'col_cell_name' => 'M', 'col_name' => 'Phone', 'is_mandatory' => false, - 'data_type' => 'str', - 'format' => null, + 'data_type' => 'mobile', + 'format' => 'mobile', 'allowed_values' => null, 'custom' => 'check_dup_mobileno', 'params' => ['row', 'existing_mobilenos'] @@ -1506,6 +1506,7 @@ class EmployeeMultiEventServiceController extends BaseController foreach ($row as $col_key => $col) { $is_mandatory = $columns_to_check[$keys[$col_key]]['is_mandatory']; $format = $columns_to_check[$keys[$col_key]]['format']; + $data_type = $columns_to_check[$keys[$col_key]]['data_type']; $allowed_values = $columns_to_check[$keys[$col_key]]['allowed_values']; $custom_function = isset($columns_to_check[$keys[$col_key]]['custom']) ? $columns_to_check[$keys[$col_key]]['custom'] : null; $binding_params = isset($columns_to_check[$keys[$col_key]]['params']) ? $columns_to_check[$keys[$col_key]]['params'] : null; @@ -1545,14 +1546,26 @@ class EmployeeMultiEventServiceController extends BaseController } //format check - if (isset($format)) { - $format_error = check_excel_date_format($col, $format); - if (!$format_error['status']) { + if(isset($format)) + { + + $validation = validate_excel_value($col, $data_type, $format, $allowed_values); + if (!$validation['status']) { array_push($result['error_summary'], 2); - $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name - $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index - $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $format_error['error']; + + $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; + $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; + $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $validation['error']; } + + // $format_error = check_excel_date_format($col,$format); + // if(!$format_error['status']) + // { + // array_push($result['error_summary'],2); + // $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name + // $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index + // $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $format_error['error']; + // } } // Kint::dump($is_mandatory); //allowed values check diff --git a/app/Controllers/FhplApiController.php b/app/Controllers/FhplApiController.php index 7d5ae66f..542f461b 100644 --- a/app/Controllers/FhplApiController.php +++ b/app/Controllers/FhplApiController.php @@ -530,12 +530,19 @@ class FhplApiController extends BaseController $employeePolicyModel = new EmployeePolicyModel(); $employeePolicyData = $employeePolicyModel + ->select(' + employees.*, + employee_polices.id as emp_policy_id, + employee_polices.client_policy_id, + ') ->join('employees', 'employees.id = employee_polices.employee_id') ->where('employee_polices.client_policy_id', $client_policy_id) ->where('employee_polices.tpa_id IS NULL') ->findAll(); $updated = 0; + $employee_policy_ids = []; + $batch_file_success = 'success'; foreach ($employeePolicyData as $policy) { $hasMatchForThisPolicy = false; @@ -566,24 +573,22 @@ class FhplApiController extends BaseController } } } - } - // Handle NO MATCH for this policy - if (!$hasMatchForThisPolicy) { + if (!$hasMatchForThisPolicy) { + $nhanceSideData = [ + 'name' => $policy['name'] ?? null, + 'emp_code' => $policy['emp_code'] ?? null, + 'relationship' => $policy['relationship'] ?? null, + 'gender' => $policy['gender'] ?? null, + 'dob' => $policy['dob'] ?? null, + ]; + $batch_file_success = 'partially success'; - $nhanceSideData = [ - 'name' => $policy_data['name'] ?? null, - 'emp_code' => $policy_data['emp_code'] ?? null, - 'relationship' => $policy_data['relationship'] ?? null, - 'gender' => $policy_data['gender'] ?? null, - 'dob' => $policy_data['dob'] ?? null, - ]; - $batch_file_success = 'partially success'; - - log_message( - 'error', - "FHPL - TPA ID Pull No match for Nhance = " . json_encode($nhanceSideData) - ); + log_message( + 'error', + "FHPL - TPA ID Pull No match for Nhance = " . json_encode($nhanceSideData) + ); + } } // send e-card diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 765afe8f..ce2dc8f0 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -2165,7 +2165,7 @@ class LeadsController extends BaseController } // dd($data); $lead_data = []; - if (in_array((int) $rfq_data['lead_type'], [1, 3], true)) { + if (in_array((int) $rfq_data['lead_type'], [1], true)) { if (in_array($rfq_data['policy_type_id'], [2, 3, 4, 5])) { $lead_data = [ diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php index e8f4429e..d2fe3ae8 100644 --- a/app/Views/claim_files_upload.php +++ b/app/Views/claim_files_upload.php @@ -618,6 +618,7 @@ + Allowed: PDF, JPG, JPEG, PNG.
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php index 54f69c69..83baa2b3 100755 --- a/app/Views/client_kyc.php +++ b/app/Views/client_kyc.php @@ -5,6 +5,7 @@
+ * Allowed: PDF, JPG, JPEG, PNG.
@@ -48,7 +49,7 @@
- Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF + Allowed: PDF, JPG, JPEG, PNG.
@@ -169,7 +170,7 @@
- Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF + Allowed: PDF, JPG, JPEG, PNG.
@@ -504,7 +505,7 @@ - Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF + Allowed: PDF, JPG, JPEG, PNG.
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php index 15df09cf..9097d532 100755 --- a/app/Views/employee_data_list.php +++ b/app/Views/employee_data_list.php @@ -976,7 +976,7 @@ $gst_total = 0; }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while fetching e-card.', 'Error'); }); diff --git a/app/Views/errors/403.php b/app/Views/errors/403.php index 79344fe8..a76bcf1f 100755 --- a/app/Views/errors/403.php +++ b/app/Views/errors/403.php @@ -41,11 +41,20 @@ text-align: center; } + .error-illustration-frame { + display: inline-block; + max-width: 100%; + line-height: 0; + margin: 0 auto 24px auto; + } + .error-image { - width: min(100%, 560px); - height: auto; display: block; - margin: 0 auto 10px auto; + width: 446px; + height: auto; + max-width: 100%; + max-height: 52vh; + object-fit: contain; } .error-title { @@ -98,7 +107,7 @@ background-image: radial-gradient(circle at 0 0, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 120px, transparent 120px), radial-gradient(circle at 100% 100%, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 140px, transparent 140px); } - .error-image { + .error-illustration-frame { margin-bottom: 20px; } @@ -113,7 +122,15 @@
- /assets/images/errors/403_illustration.jpeg" alt="403 access denied"> +
+ /assets/images/errors/403_illustration.png" + width="446" + height="415" + decoding="async" + fetchpriority="high" + alt="403 access forbidden"> +

ACCESS DENIED

diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php index 79ef31df..da28ff61 100755 --- a/app/Views/insurer_or_tpa_data.php +++ b/app/Views/insurer_or_tpa_data.php @@ -1361,7 +1361,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while fetching TPA ID.', 'Error'); }); diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php index 3e077886..939d4b57 100644 --- a/app/Views/leads_form.php +++ b/app/Views/leads_form.php @@ -451,8 +451,11 @@

- +
+
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php index 919b88e8..0f19fa24 100644 --- a/app/Views/leads_form_handler.php +++ b/app/Views/leads_form_handler.php @@ -733,7 +733,7 @@ if (isset($selected_lead_type)) { $('.loader-mask').delay(350).fadeOut('slow'); console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while removing the file.', 'Error'); }); }else{ diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php index 7ee7ca64..a0d9946e 100644 --- a/app/Views/leads_non_eb.php +++ b/app/Views/leads_non_eb.php @@ -469,8 +469,10 @@ var pageBackButton = '
- - + +
diff --git a/app/Views/non_eb_claim_edit.php b/app/Views/non_eb_claim_edit.php index 29b533e8..a145f7ae 100644 --- a/app/Views/non_eb_claim_edit.php +++ b/app/Views/non_eb_claim_edit.php @@ -1229,7 +1229,7 @@ function nonebAddFileUploadHtml() { var row = document.createElement('div'); row.className = 'form-row dynamic-form-row'; row.innerHTML = '
' + - '
' + + '
Allowed: PDF, JPG, JPEG, PNG.
' + '
'; container.appendChild(row); } diff --git a/app/Views/notification.php b/app/Views/notification.php index 5072ab39..8dd20c09 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -449,7 +449,7 @@ - + * Allowed: PDF, JPG, JPEG, PNG.
@@ -537,7 +537,7 @@ - + * Allowed: PDF, JPG, JPEG, PNG.
@@ -642,7 +642,7 @@ - + * Allowed: PDF, JPG, JPEG, PNG.
@@ -738,6 +738,7 @@ + * Allowed: PDF, JPG, JPEG, PNG.
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php index 403a1fb4..6e6a988a 100644 --- a/app/Views/policy_transaction_inception_form.php +++ b/app/Views/policy_transaction_inception_form.php @@ -6185,7 +6185,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while creating the vehicle.', 'Error'); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); }); @@ -6251,7 +6251,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while creating the client.', 'Error'); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); diff --git a/app/Views/policy_transaction_inception_form_2.php b/app/Views/policy_transaction_inception_form_2.php index a37a607f..8cf18e05 100644 --- a/app/Views/policy_transaction_inception_form_2.php +++ b/app/Views/policy_transaction_inception_form_2.php @@ -5842,7 +5842,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while creating the vehicle.', 'Error'); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); }); @@ -5908,7 +5908,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while createing the client.', 'Error'); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index 1b882ca1..58521104 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -7433,7 +7433,7 @@ function appendMultiFileData(data) { $('.loader-mask').delay(350).fadeOut('slow'); console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while removing the file.', 'Error'); }); }else{ diff --git a/app/Views/view_rfq_non_eb_new.php b/app/Views/view_rfq_non_eb_new.php index abc4f3ad..9f16c805 100644 --- a/app/Views/view_rfq_non_eb_new.php +++ b/app/Views/view_rfq_non_eb_new.php @@ -3271,7 +3271,7 @@ }, function(xhr, status, error) { console.error('Error fetching data:', error); console.error(xhr.responseText); - toastr.error('An error occurred while checking the CD amount.', 'Error'); + toastr.error('An error occurred while saving the data.', 'Error'); }); } diff --git a/public/assets/images/errors/403_illustration.png b/public/assets/images/errors/403_illustration.png new file mode 100644 index 00000000..be1912c3 Binary files /dev/null and b/public/assets/images/errors/403_illustration.png differ