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

FIX_IMPORT&EXPORT_ISSUES

Browse Source
This commit is contained in:
velz 2024-11-11 08:46:19 +05:30
parent 81957e5151
commit 4fa40f0fc8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/ClientController.php
View File

@ -248,7 +248,7 @@ class ClientController extends AdminController
$headerData['page_name'] = 'Client List'; $headerData['page_name'] = 'Client List';
$data['clientList'] = $this->clientModel->getCreatedByUserName(); $data['clientList'] = $this->clientModel->getCreatedByUserName();
$data['client_rm'] = $this->clientRMModel->getAllClientRM(); $data['client_rm'] = $this->clientRMModel->getAllClientRM();
$data['lead_data'] = $this->leadsModel->getLeadForInsertClientList(); // $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
// dd($data); // dd($data);

4
app/Controllers/EmpDataServiceController.php
View File

@ -302,7 +302,7 @@ class EmpDataServiceController extends BaseController
], ],
[ [
'column_index' => 18, 'column_index' => 18,
'column_name' => 'PR0 RATA PREMIUM', 'column_name' => 'PRO RATA PREMIUM',
'db_column_name' => 'rata_premimum' 'db_column_name' => 'rata_premimum'
], ],
[ [
@ -1281,7 +1281,7 @@ class EmpDataServiceController extends BaseController
unset($excel_data[0]); unset($excel_data[0]);
// array_pop($excel_data); // array_pop($excel_data);
$inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATIONSHIP CODE','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL AMOUNT']; $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATIONSHIP CODE','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PRO RATA PREMIUM','GST','TOTAL AMOUNT'];
foreach ($inceptionHeader as $key => $value) { foreach ($inceptionHeader as $key => $value) {
if($excel_header[$key] != $value){ if($excel_header[$key] != $value){

8
app/Models/EmployeePolicyModel.php
View File

@ -568,10 +568,10 @@ class EmployeePolicyModel extends Model
deletiondata.reasonforexit, deletiondata.reasonforexit,
deletiondata.status, deletiondata.status,
DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) AS no_of_days, DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + 1 AS no_of_days,
ROUND((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365, 2) AS pro_rata_premium, ROUND((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + 1)) / 365, 2) AS pro_rata_premium,
ROUND(((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) * 0.18, 2) AS gst, ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + 1)) / 365) * 0.18, 2) AS gst,
ROUND(((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) + (((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) * 0.18), 2) AS total ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + 1)) / 365) + (((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + 1)) / 365) * 0.18), 2) AS total
FROM FROM
emp_endorsement a emp_endorsement a
LEFT JOIN LEFT JOIN