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

This commit is contained in:
velz 2025-09-16 15:01:33 +05:30
commit 6de8dd9449
9 changed files with 140 additions and 126 deletions

View File

@ -5266,7 +5266,7 @@ class ClientController extends AdminController
// $res = $empServiceController->employeesEnrollmentInsert(['file_id' => 836]);
// $res = $empServiceController->employeesSIEnhanceProcess(['file_id' => '978']);
// $res = $empServiceController->employeeDisembark(['file_id' => '1681']);
// $res = $empServiceController->employeesCorrectionProcess(['file_id' => '1681']);
// $res = $empServiceController->employeesCorrectionProcess(['file_id' => '2033']);
// dd( $res);
$EmployeeMultiEventServiceController = new EmployeeMultiEventServiceController();
@ -5324,6 +5324,7 @@ class ClientController extends AdminController
$EmpDataServiceController = new EmpDataServiceController();
// $res = $EmpDataServiceController->generateExcelForDeletion($batch_data); dd($return); die;
// $res = $EmpDataServiceController->generateExcelForSIEnhancement($batch_data); die;
// $res = $EmpDataServiceController->generateExcelForCorrection($batch_data);
// $res = $EmpDataServiceController->importInceptionFileValidation(['file_id' => 1932]); die;
// $res = $EmpDataServiceController->importDeletionValidation(['file_id' => 304]); //for live
// $res = $EmpDataServiceController->importSIEnhancementUpdateEndorsementID(['file_id' => 1199]); //for live

View File

@ -2078,18 +2078,18 @@ class EmpDataServiceController extends BaseController
'user_id' => $user_id,
]]);
$r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
'client_policy_id' => $client_policy_id ?? null,
'endorsement_no' => $endorsement_id ?? null,
'emp_count' => $emp_count ?? null,
'action_type' => $file['event_type'] ?? null,
'no_of_insured' => count($no_of_insured ?? []) ?? null,
'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
'created_by' => $file['created_by'] ?? null,
]]);
// $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
// 'client_policy_id' => $client_policy_id ?? null,
// 'endorsement_no' => $endorsement_id ?? null,
// 'emp_count' => $emp_count ?? null,
// 'action_type' => $file['event_type'] ?? null,
// 'no_of_insured' => count($no_of_insured ?? []) ?? null,
// 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
// 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
// 'gst' => $base_bremium_and_gst['gst'] ?? null,
// 'policy_issue_date' => $policy_issue_date ?? null,
// 'created_by' => $file['created_by'] ?? null,
// ]]);
// $this->cashDepositCalculationForInception($depositeData);
// $this->sendMailForDownloadingECard($emp_policy_ids);
@ -2518,14 +2518,14 @@ class EmpDataServiceController extends BaseController
$file_data = $this->getDataByFileId($file_id, 'success');
$this->setPullNotification($file_data);
$r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
'client_policy_id' => $client_policy_id ?? null,
'endorsement_no' => $endorsement_id[0] ?? null,
'emp_count' => $emp_count ?? null,
'action_type' => $file['event_type'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
'created_by' => $file['created_by'] ?? null,
]]);
// $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
// 'client_policy_id' => $client_policy_id ?? null,
// 'endorsement_no' => $endorsement_id[0] ?? null,
// 'emp_count' => $emp_count ?? null,
// 'action_type' => $file['event_type'] ?? null,
// 'policy_issue_date' => $policy_issue_date ?? null,
// 'created_by' => $file['created_by'] ?? null,
// ]]);
//import file to upload Google Drive
@ -3177,18 +3177,18 @@ class EmpDataServiceController extends BaseController
'user_id' => $user_id,
]]);
$r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
'client_policy_id' => $client_policy_id ?? null,
'endorsement_no' => $endorsement_id ?? null,
'emp_count' => $emp_count ?? null,
'action_type' => $file['event_type'] ?? null,
'no_of_insured' => count($no_of_insured ?? []) ?? null,
'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
'created_by' => $file['created_by'] ?? null,
]]);
// $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
// 'client_policy_id' => $client_policy_id ?? null,
// 'endorsement_no' => $endorsement_id ?? null,
// 'emp_count' => $emp_count ?? null,
// 'action_type' => $file['event_type'] ?? null,
// 'no_of_insured' => count($no_of_insured ?? []) ?? null,
// 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
// 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
// 'gst' => $base_bremium_and_gst['gst'] ?? null,
// 'policy_issue_date' => $policy_issue_date ?? null,
// 'created_by' => $file['created_by'] ?? null,
// ]]);
}
@ -3688,18 +3688,18 @@ class EmpDataServiceController extends BaseController
'user_id' => $user_id,
]]);
$r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
'client_policy_id' => $client_policy_id ?? null,
'endorsement_no' => $endorsement_id ?? null,
'emp_count' => $emp_count ?? null,
'action_type' => $file['event_type'] ?? null,
'no_of_insured' => count($no_of_insured ?? []) ?? null,
'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
'created_by' => $file['created_by'] ?? null,
]]);
// $r = Jobs::addJob(['job_name' => 'makeEntryForBDSPolicyTransaction', 'payload' => [
// 'client_policy_id' => $client_policy_id ?? null,
// 'endorsement_no' => $endorsement_id ?? null,
// 'emp_count' => $emp_count ?? null,
// 'action_type' => $file['event_type'] ?? null,
// 'no_of_insured' => count($no_of_insured ?? []) ?? null,
// 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
// 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
// 'gst' => $base_bremium_and_gst['gst'] ?? null,
// 'policy_issue_date' => $policy_issue_date ?? null,
// 'created_by' => $file['created_by'] ?? null,
// ]]);
}
$file_data = $this->getDataByFileId($file_id, 'success');

View File

@ -526,7 +526,7 @@ class EmployeeController extends AdminController
$client_branch_id = $this->request->getPost('client_branch_id');
$insurer_or_tpa = $this->request->getPost('insurer_or_tpa');
$actions = $this->request->getPost('action_type');
$policy_issue_date = $this->request->getPost('policy_issue_date');
$policy_issue_date = $this->request->getPost('policy_issue_date') ?? null;
$client_data = $this->clientPolicyModel->getCliendDataForExcelFileName($client_policy_id);
$file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $client_data['policy_type'], $client_data['branch_code']);
@ -544,9 +544,7 @@ class EmployeeController extends AdminController
];
$batch_data['policy_issue_date'] = (!empty($policy_issue_date) && strtotime($policy_issue_date) !== false)
? change_date_format($policy_issue_date)
: null;
$batch_data['policy_issue_date'] = (!empty($policy_issue_date) && strtotime($policy_issue_date) !== false) ? change_date_format($policy_issue_date) : null;
if ($actions == 'export') {

View File

@ -1956,14 +1956,29 @@ class EmployeeMultiEventServiceController extends BaseController
$field_value = ($field_name == 'dob' ? change_date_format($row[4], 'd-M-Y', 'Y-m-d') : $row[4]);
// $employee = $this->employeeModel
// ->where('emp_code', $row[1])
// ->where('name', $row[2])
// ->where('client_id', $file['client_id'])
// ->where('client_branch_id', $file['client_branch_id'])
// ->where('emp_status', 'active')
// ->where('is_active', 1)
// ->first();
$employee = $this->employeeModel
->where('emp_code', $row[1])
->where('name', $row[2])
->where('client_id', $file['client_id'])
->where('client_branch_id', $file['client_branch_id'])
->where('emp_status', 'active')
->where('is_active', 1)
->first();
->select('employees.*')
->join('employee_polices', 'employees.id = employee_polices.employee_id')
->where('employees.emp_code', $row[1])
->where('employees.name',$row[2])
->where('employees.client_id',$file['client_id'])
->where('employees.client_branch_id',$file['client_branch_id'])
->where('employee_polices.client_policy_id',$file['policy_id'])
->where('employees.emp_status','active')
->where('employees.is_active',1)
->where('employee_polices.status','active')
->where('employee_polices.is_active',1)
->first();
$existing_endorsements = $this->empEndorsementModel->where('actions', 'c')
->where('table_name', 'employees')
->where('endorsement_id is null')

View File

@ -1470,10 +1470,11 @@ class EmployeeServiceController extends AdminController
//get file name
$file_id = $params['file_id'];
$file = $this->fileModel->find($file_id);
// dd($file);
$file_name_with_path = WRITEPATH."/uploads/excel/".$file['file_name'];
$spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
$spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
$sheet = $spreadsheet->getActiveSheet();
$highestRowAndColumn = $sheet->getHighestRowAndColumn();
@ -1498,13 +1499,21 @@ class EmployeeServiceController extends AdminController
$employee = $this->employeeModel
->where('emp_code', $row[1])
->where('name',$row[2])
->where('client_id',$file['client_id'])
->where('client_branch_id',$file['client_branch_id'])
->where('emp_status','active')
->where('is_active',1)
->select('employees.*')
->join('employee_polices', 'employees.id = employee_polices.employee_id')
->where('employees.emp_code', $row[1])
->where('employees.name',$row[2])
->where('employees.client_id',$file['client_id'])
->where('employees.client_branch_id',$file['client_branch_id'])
->where('employee_polices.client_policy_id',$file['policy_id'])
->where('employees.emp_status','active')
->where('employees.is_active',1)
->where('employee_polices.status','active')
->where('employee_polices.is_active',1)
->first();
// Kint::dump($employee);
$existing_endorsements = $this->empEndorsementModel->where('actions','c')
->where('table_name','employees')
->where('endorsement_id is null')
@ -1530,7 +1539,7 @@ class EmployeeServiceController extends AdminController
$this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]);
//set success msg to pull notifications
$this->setPullNotification($this->getFileMetaDataByFileId($file_id,'success'));
return true;
return true;
}

View File

@ -563,36 +563,19 @@ class EmployeePolicyModel extends Model
employees.email_personal AS emp_email_p,
employees.band AS emp_grade,
employees.designation AS emp_designation,
employees.basic_pay AS emp_basic_pay,
batch_data.emp_policy_id,
batch_data.bl AS batch_list_batch_code,
batch_data.bf AS batch_files_batch_code
employees.basic_pay AS emp_basic_pay
FROM
emp_endorsement
LEFT JOIN
employees ON employees.id = emp_endorsement.pk
LEFT JOIN
employee_polices ON employees.id = employee_polices.employee_id
LEFT JOIN (
SELECT batch_list.emp_policy_id,
batch_list.batch_code AS bl,
batch_files.batch_code AS bf
FROM
batch_files
LEFT JOIN
batch_list ON batch_files.batch_code = batch_list.batch_code
WHERE batch_files.event_type = 'correction'
AND batch_files.actions = 'export'
AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
) AS batch_data ON emp_endorsement.pk = batch_data.emp_policy_id
WHERE employees.client_id = '{$client_id}'
AND employee_polices.client_policy_id = '{$client_policy_id}'
AND employees.client_branch_id = '{$client_branch_id}'
AND emp_endorsement.actions = 'c'
AND emp_endorsement.status != 'truncated'
AND emp_endorsement.is_active = 1
AND employee_polices.is_active = 1
AND employee_polices.status = 'active'
AND employees.is_active = 1

View File

@ -90,13 +90,14 @@
</select>
</div>
</div>
<div class="form-row policy_issue_date_row" style="display:none;">
<!-- <div class="form-row policy_issue_date_row" style="display:none;">
<div class="form-group col-md-4">
<label id="policy_issue_date_label">Policy Issue Date</label> <br />
<input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date"
placeholder="Enter Policy Issue Date">
</div>
</div>
</div> -->
<br>
<div class="form-row" id="import_excel_btn">
@ -152,10 +153,10 @@
$(document).ready(function() {
var policy_issue_datePicker = flatpickr("#policy_issue_date", {
dateFormat: "d/m/Y",
allowInput: false,
});
// var policy_issue_datePicker = flatpickr("#policy_issue_date", {
// dateFormat: "d/m/Y",
// allowInput: false,
// });
$('#insurer_or_tpa, #action_type').on('change', togglePolicyIssueDate);
});
@ -751,14 +752,14 @@
function togglePolicyIssueDate() {
let insurer = $('#insurer_or_tpa').val();
let action = $('#action_type').val();
if (insurer === 'insurer' && action === 'import') {
$('.policy_issue_date_row').show();
$('#policy_issue_date').attr('required', true);
$('#policy_issue_date_label').html('Policy Issue Date <span class="text-danger">*</span>');
} else {
$('.policy_issue_date_row').hide();
$('#policy_issue_date').removeAttr('required').val('');
$('#policy_issue_date_label').text('Policy Issue Date');
}
// if (insurer === 'insurer' && action === 'import') {
// $('.policy_issue_date_row').show();
// $('#policy_issue_date').attr('required', true);
// $('#policy_issue_date_label').html('Policy Issue Date <span class="text-danger">*</span>');
// } else {
// $('.policy_issue_date_row').hide();
// $('#policy_issue_date').removeAttr('required').val('');
// $('#policy_issue_date_label').text('Policy Issue Date');
// }
}
</script>

View File

@ -169,7 +169,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input class="form-check-input me-2" type="checkbox" id="accidentalDeathBenefit_display" name="accidentalDeathBenefit_display" checked>
<input class="form-check-input me-2 unchecked" type="checkbox" id="accidentalDeathBenefit_display" name="accidentalDeathBenefit_display" checked>
<label class="form-check-label mb-0" for="accidentalDeathBenefit_display">
Accidental Death Benefit
</label>
@ -181,7 +181,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input class="form-check-input me-2" type="checkbox" id="permanentTotalDisablement_display" name="permanentTotalDisablement_display" checked>
<input class="form-check-input me-2 unchecked" type="checkbox" id="permanentTotalDisablement_display" name="permanentTotalDisablement_display" checked>
<label class="form-check-label mb-0" for="permanentTotalDisablement_display">
Permanent Total Disablement
</label>
@ -197,7 +197,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="permanentPartialDisablement_display" id="permanentPartialDisablement_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="permanentPartialDisablement_display" id="permanentPartialDisablement_display" checked>
<label class="form-check-label mb-0" for="permanentPartialDisablement">Permanent Partial Disablement</label>
</div>
</div>
@ -208,7 +208,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="temporaryTotalDisablementBenefit_display" id="temporaryTotalDisablementBenefit_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="temporaryTotalDisablementBenefit_display" id="temporaryTotalDisablementBenefit_display" checked>
<label class="form-check-label mb-0" for="temporaryTotalDisablementBenefit">Temporary Total Disablement Benefit</label>
</div>
</div>
@ -221,7 +221,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="medical_expenses_medical_extension_display" id="medical_expenses_medical_extension_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="medical_expenses_medical_extension_display" id="medical_expenses_medical_extension_display" checked>
<label class="form-check-label mb-0" for="medical_expenses_medical_extension">Medical Expenses / Medical Extension (IPD)</label>
</div>
</div>
@ -232,7 +232,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="opd_treatment_cover_display" id="opd_treatment_cover_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="opd_treatment_cover_display" id="opd_treatment_cover_display" checked>
<label class="form-check-label mb-0" for="opd_treatment_cover">OPD Treatment Cover</label>
</div>
@ -245,7 +245,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="ambulanceCharges_display" id="ambulanceCharges_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="ambulanceCharges_display" id="ambulanceCharges_display" checked>
<label class="form-check-label mb-0" for="ambulanceCharges"> Ambulance Charges</label>
</div>
</div>
@ -255,7 +255,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox"class="form-check-input me-2" name="repatriation_of_mortal_remains_display" id="repatriation_of_mortal_remains_display" checked>
<input type="checkbox"class="form-check-input me-2 unchecked" name="repatriation_of_mortal_remains_display" id="repatriation_of_mortal_remains_display" checked>
<label class="form-check-label mb-0" for="repatriation_of_mortal_remains">Repatriation of Mortal Remains</label>
</div>
</div>
@ -267,7 +267,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input me-2" name="childrenEducationWelfareFund_display" id="childrenEducationWelfareFund_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="childrenEducationWelfareFund_display" id="childrenEducationWelfareFund_display" checked>
<label class="form-check-label mb-0" for="childrenEducationWelfareFund">Children Education Welfare Fund</label>
</div>
</div>
@ -277,7 +277,7 @@
<div class="col-md-2">
<div class="form-check align-items-center">
<input type="checkbox" class="form-check-input me-2" name="terrorism_display" id="gpa_terrorism_display" checked>
<input type="checkbox" class="form-check-input me-2 unchecked" name="terrorism_display" id="gpa_terrorism_display" checked>
<label class="form-check-label mb-0"for="terrorism">Terrorism</label>
</div>
</div>
@ -289,7 +289,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="worldwideCover_display" id="worldwideCover_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="worldwideCover_display" id="worldwideCover_display" checked>
<label class="form-check-label" for="worldwideCover">Worldwide Cover</label>
</div>
</div>
@ -299,7 +299,7 @@
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="family_transportation_benefits_display" id="family_transportation_benefits_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="family_transportation_benefits_display" id="family_transportation_benefits_display" checked>
<label class="form-check-label" for="family_transportation_benefits">Family Transportation Benefits</label>
</div>
</div>
@ -311,7 +311,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="fractures_dislocation_burns_display" id="fractures_dislocation_burns_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="fractures_dislocation_burns_display" id="fractures_dislocation_burns_display" checked>
<label class="form-check-label"for="fractures_dislocation_burns">Fractures / Dislocation / Burns</label>
</div>
</div>
@ -320,7 +320,7 @@
</div>
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="coma_display" id="coma_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="coma_display" id="coma_display" checked>
<label class="form-check-label" for="coma">Coma</label>
</div>
</div>
@ -332,7 +332,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex-align-items-center">
<input type="checkbox" class="form-check-input" name="carriageofDeadBody_display" id="carriageofDeadBody_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="carriageofDeadBody_display" id="carriageofDeadBody_display" checked>
<label class="form-check-label" for="carriageOfDeadBody">Carriage of Dead Body</label>
</div>
</div>
@ -341,7 +341,7 @@
</div>
<div class="col-md-2">
<div class="form-check d-flex-align-items-center">
<input type="checkbox" class="form-check-input" name="compassionateVisitExpenses_display" id="compassionateVisitExpenses_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="compassionateVisitExpenses_display" id="compassionateVisitExpenses_display" checked>
<label class="form-check-label" for="compassionateVisitExpenses">Compassionate Visit Expenses</label>
</div>
</div>
@ -353,7 +353,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="travel_expenses_for_medical_treatment_display" id="travel_expenses_for_medical_treatment_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="travel_expenses_for_medical_treatment_display" id="travel_expenses_for_medical_treatment_display" checked>
<label class="form-check-label" for="travel_expenses_for_medical_treatment">Travel expenses for Medical Treatment</label>
</div>
</div>
@ -362,7 +362,7 @@
</div>
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="daily_cash_allowance_display" id="daily_cash_allowance_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="daily_cash_allowance_display" id="daily_cash_allowance_display" checked>
<label class="form-check-label" for="daily_cash_allowance">Daily cash Allowance</label>
</div>
</div>
@ -374,7 +374,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="artifical_limb_and_prosthesis_display" id="artifical_limb_and_prosthesis_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="artifical_limb_and_prosthesis_display" id="artifical_limb_and_prosthesis_display" checked>
<label class="form-check-label" for="artifical_limb_and_prosthesis">Artifical Limb and Prosthesis</label>
</div>
</div>
@ -383,7 +383,7 @@
</div>
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="animalSnakeInsectBite_display" id="animalSnakeInsectBite_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="animalSnakeInsectBite_display" id="animalSnakeInsectBite_display" checked>
<label class="form-check-label" for="animalSnakeInsectBite">Animal/Snake/Insect bite</label>
</div>
@ -396,7 +396,7 @@
<div class="row mb-2">
<div class="col-md-2">
<div class="form-check d-flex align-items-center">
<input type="checkbox" class="form-check-input" name="air_ambulance_display" id="air_ambulance_display" checked>
<input type="checkbox" class="form-check-input unchecked" name="air_ambulance_display" id="air_ambulance_display" checked>
<label class="form-check-label" for="air_ambulance">Air Ambulance</label>
</div>
</div>
@ -657,7 +657,7 @@
}
}
if (key.includes("enrollment_display_key") && key != "") {
if (key.includes("enrollment_display_key") && key.length) {
console.log('enrollment_display_key');
console.log(gpaJsonObjectForSpecialCondition[key]);
@ -698,7 +698,7 @@
.next()[0];
$(element).css("display", "");
}
disableUnwantedTermsforGPA(jsonObject);
// disableUnwantedTermsforGPA(jsonObject);
Object.keys(jsonObject).forEach(function(key) {

View File

@ -172,6 +172,7 @@
<input type="hidden" name="cd_ac_no" id="cd_ac_pk_for_leader">
<input type="hidden" name="ct_type" id="ct_type">
<input type="hidden" name="remove_pt_co_id" id="remove_pt_co_id" >
<input type="hidden" name="issuer" id="issuer" value="2">
<!-- <input type="hidden" id="cd_ac_no_for_edit"> -->
<input type="hidden" id="premium_details_unique_id">
@ -249,7 +250,7 @@
</select>
</div>
<div class="form-group col-md-3">
<!-- <div class="form-group col-md-3">
<label for="client_branch">Issuer<span class="text-danger">*</span></label>
<select class="form-control" id="issuer" name="issuer" required>
<option value="">Select Issuer</option>
@ -261,7 +262,7 @@
}
?>
</select>
</div>
</div> -->
</div>
</div>
@ -1194,7 +1195,6 @@ $(document).ready(function(){
}
});
$('#upload_enrollment_model').on('hide.bs.modal', function (e) {
console.log('Attempting to hide #upload_enrollment_model modal');
@ -1263,7 +1263,6 @@ $(document).ready(function(){
});
$('#aadhar').attr('data-parsley-required', 'false');
$('#aadhar').removeAttr('required');
@ -1356,10 +1355,15 @@ $(document).ready(function(){
setTimeout(function(){
$('#client_branch_id').val(branch_id).change()
}, 800)
$('#table_tr_34').show();
$('#table_tr_37').show();
}else{
$('.branchdiv').hide()
$('#client_branch_id').prop('required', false);
$('#table_tr_34').hide();
$('#table_tr_37').hide();
}
if(val == 'add_vehicle'){
@ -1541,7 +1545,6 @@ $(document).ready(function(){
$('[name="standard_tp[]"]').val(std_tp);
$('[name="standard_ter[]"]').val(std_tep);
if(value == 8){
$('#vhnodiv').show();
$('#client_type_div').hide();
@ -3843,9 +3846,13 @@ $('#Owner_type').on('change', function() {
if ($(this).val() == 2) {
$('.ownerbranchdiv').hide();
$('#owner_branch').prop('required', false);
$('#table_tr_34').hide();
$('#table_tr_37').hide();
} else {
$('.ownerbranchdiv').show();
$('#owner_branch').prop('required', true);
$('#table_tr_34').show();
$('#table_tr_37').show();
}
// console.log('selected Owner type', selectedClientType);