Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
velz 2026-05-05 09:17:59 +05:30
commit 9f8e26e593
18 changed files with 92 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Controllers/EmployeeMultiEventServiceController.php
View File

@ -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

37
app/Controllers/FhplApiController.php
View File

@ -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

2
app/Controllers/LeadsController.php
View File

@ -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 = [

1
app/Views/claim_files_upload.php
View File

@ -618,6 +618,7 @@
<input type="file" class="form-control" id="${fileId}" name="file_upload[]" accept=".pdf,.jpg,.jpeg,.png" required
data-parsley-required-message="File is required."
data-parsley-claimfileext-message="Only PDF, JPG, JPEG, and PNG files are allowed.">
<small class="text-muted"> Allowed: PDF, JPG, JPEG, PNG. </small>
</div>
<div class="form-group col-md-2" style="position: relative; top: 28px;">
<a class="btn btn-danger waves-effect waves-light" onclick="removeHTMLInput(this)" style="background-color: #BD0707;">

7
app/Views/client_kyc.php
View File

@ -5,6 +5,7 @@
<div class="col-lg-12">
<div class="card" id="collapseOne">
<div class="card-body">
<small class="text-danger"> * Allowed: PDF, JPG, JPEG, PNG. </small>
<div class="table-responsive">
<table data-custom-table-css="second-table" id="kyc_table" class="table table-sm mb-0">
<thead>
@ -48,7 +49,7 @@
<div class="form-group col-md-4">
<label>File<span class="text-danger">*</span></label>
<input class="form-control other-doc-file-field" type="file" name="file_name[]" required accept=".pdf, .jpeg, .jpg, .png">
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF</small>
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG.</small>
<div class="other-doc-file-error text-danger small mt-1"></div>
</div>
<div class="form-group col-md-4" style="<?= isset($client['id']) ? 'margin-top: 41px;' : 'margin-top: 30px;' ?>">
@ -169,7 +170,7 @@
<div class="form-group col-md-4">
<label>File<span class="text-danger">*</span></label>
<input class="form-control other-doc-file-field" type="file" name="file_name[]" required accept=".pdf, .jpeg, .jpg, .png">
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF</small>
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG.</small>
<div class="other-doc-file-error text-danger small mt-1"></div>
</div>
<div class="form-group col-md-4" style="<?= isset($client['id']) ? 'margin-top: 41px;' : 'margin-top: 30px;' ?>">
@ -504,7 +505,7 @@
<input type="hidden" class="form-control" value="${item.id}" name="kyc_doc_type_id">
<input type="hidden" name="client_id" value="${client_id}">
<button class="btn btn-sm btn-primary submit" style="position: relative; right:0px;">Submit</button>
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG. Size : 200KB/image 25MB/PDF</small>
<small class="mt-1 text-muted d-block">Allowed: PDF, JPG, JPEG, PNG.</small>
<div class="kyc-primary-file-error text-danger small mt-1"></div>
</form>
</td>

2
app/Views/employee_data_list.php
View File

@ -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');
});

27
app/Views/errors/403.php
View File

@ -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 @@
<body>
<main class="error-wrapper">
<img class="error-image" src="<?= base_url()."public"; ?>/assets/images/errors/403_illustration.jpeg" alt="403 access denied">
<div class="error-illustration-frame">
<img class="error-image"
src="<?= base_url()."public"; ?>/assets/images/errors/403_illustration.png"
width="446"
height="415"
decoding="async"
fetchpriority="high"
alt="403 access forbidden">
</div>
<h1 class="error-title">ACCESS DENIED</h1>
<p class="error-subtitle">
<?= isset($message) && !empty($message) ? $message : "You don't have permission to access this page." ?>

2
app/Views/insurer_or_tpa_data.php
View File

@ -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');
});

5
app/Views/leads_form.php
View File

@ -451,8 +451,11 @@
<div class="form-row">
<div class="form-group col-md-12">
<label for="notes">Remarks</label>
<textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
<textarea class="form-control" id="notes" name="notes" rows="4"maxlength="100"
oninput="this.value = this.value.slice(0, 100);">
</textarea>
</div>
</div>
</div>
</div>

2
app/Views/leads_form_handler.php
View File

@ -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{

6
app/Views/leads_non_eb.php
View File

@ -469,8 +469,10 @@ var pageBackButton = '<a href="<?= base_url('leads/list') ?>" class="topbar-icon
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label for="notes">Remarks</label>
<textarea class="form-control" id="notes" name="notes" rows="4"></textarea>
<label for="notes">Remarks</label>
<textarea class="form-control" id="notes" name="notes" rows="4" maxlength="100"
oninput="this.value = this.value.slice(0, 100);">
</textarea>
</div>
</div>
</div>

2
app/Views/non_eb_claim_edit.php
View File

@ -1229,7 +1229,7 @@ function nonebAddFileUploadHtml() {
var row = document.createElement('div');
row.className = 'form-row dynamic-form-row';
row.innerHTML = '<div class="form-group col-md-5"><label>Document Name <span class="text-danger">*</span></label><input type="text" class="form-control" name="docs_name[]" placeholder="Enter file name" required></div>' +
'<div class="form-group col-md-5"><label>Choose File <span class="text-danger">*</span></label><input type="file" class="form-control" name="file_upload[]" accept=".pdf,.jpg,.jpeg,.png" required></div>' +
'<div class="form-group col-md-5"><label>Choose File <span class="text-danger">*</span></label><input type="file" class="form-control" name="file_upload[]" accept=".pdf,.jpg,.jpeg,.png" required><small class="text-muted"> Allowed: PDF, JPG, JPEG, PNG. </small></div>' +
'<div class="form-group col-md-2" style="position:relative;top:28px;"><a class="btn btn-danger btn-sm" onclick="nonebRemoveHTMLInput(this)"><i class="mdi mdi-delete"></i></a></div>';
container.appendChild(row);
}

7
app/Views/notification.php
View File

@ -449,7 +449,7 @@
</div>
<input type="file" id="Question_title_fileInput" style="display: none;">
<small class="text-danger"> * Allowed: PDF, JPG, JPEG, PNG. </small>
<table data-custom-table-css="table" id="attachment_table_common" class="table table-sm mb-0" style="margin-top: 30px;">
<thead>
<tr>
@ -537,7 +537,7 @@
</div>
<input type="file" id="Question_title_fileInput" style="display: none;">
<small class="text-danger"> * Allowed: PDF, JPG, JPEG, PNG. </small>
<table data-custom-table-css="table" id="attachment_table" class="table table-sm mb-0" style="margin-top: 30px;">
<thead>
<tr>
@ -642,7 +642,7 @@
<input type="file" id="Question_title_fileInput" style="display: none;">
<small class="text-danger"> * Allowed: PDF, JPG, JPEG, PNG. </small>
<table data-custom-table-css="table" id="attachment_table_reminder" class="table table-sm mb-0" style="margin-top: 30px;">
<thead>
<tr>
@ -738,6 +738,7 @@
<input type="file" id="Question_title_fileInput" style="display: none;">
<small class="text-danger"> * Allowed: PDF, JPG, JPEG, PNG. </small>
<table data-custom-table-css="table" id="attachment_table_ecard" class="table table-sm mb-0" style="margin-top: 30px;">
<thead>
<tr>

4
app/Views/policy_transaction_inception_form.php
View File

@ -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');

4
app/Views/policy_transaction_inception_form_2.php
View File

@ -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');

2
app/Views/view_rfq.php
View File

@ -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{

2
app/Views/view_rfq_non_eb_new.php
View File

@ -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');
});
}

BIN
public/assets/images/errors/403_illustration.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB