From 89ea5cd9a54b3cb70136f8ef8428e4fc36f5fec2 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 27 Apr 2024 11:05:39 +0530 Subject: [PATCH] CHNAGE_INCEPTION_SAMPLE_FILE&PULL_ORIGINAL_DATA_ISSUE --- app/Controllers/EmployeeServiceController.php | 46 +----------------- app/Helpers/excel_util_helper.php | 8 +-- public/sample_excel/sample_inception.xls | Bin 9728 -> 9216 bytes 3 files changed, 5 insertions(+), 49 deletions(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 46fb73ee..9b4dd5be 100644 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -834,7 +834,7 @@ class EmployeeServiceController extends AdminController foreach($familiy_data as $fkey => $value) { - if($file['id'] == null || ($value['temp']['source'] == 'excel' || (in_array($value['temp']['grid_type'],[10,11]) && strtolower($value['relationship']) == 'self'))) //insert data come from excel and from db + if($file['id'] == null || $value['temp']['source'] == 'excel') //insert data come from excel and from db i.e. ( $file['id'] == null for enrollment data) { $employee = $this->employeeModel->checkExistingEmp($value); @@ -842,50 +842,6 @@ class EmployeeServiceController extends AdminController $temp = $value['temp']; unset($value['policy_details']); unset($value['temp']); - - if($file['id'] == null && (strtolower($value['relationship']) == 'self' && $temp['source'] == 'db' && $temp['emp_id'] != null && $temp['emp_policy_id'] != null)) - { - //check existing si and new si - $employee_policy = $this->employeePolicyModel->where('employee_id',$employee['id'])->where('client_policy_id',$file['policy_id'])->first(); - if($employee_policy['basic_cover_si'] != $policy_data['basic_cover_si']) - { - - //check any existing si enhancement pending - $existing_endorsements = $this->empEndorsementModel->where('actions','si') - ->where('table_name','employee_polices') - ->where('endorsement_id is null') - ->where('emp_code',$employee['emp_code']) - ->where('name',$employee['name']) - ->where('field_name','basic_cover_si') - ->findAll(); - - if(!count($existing_endorsements)) - { - - $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']); - foreach ($slab_details['slab_rates'] as $skey => $slab_value) - { - if($slab_value['si'] == $policy_data['si']) - { - $group_key = rand(100000, 999999); - //add new premimum details in endorsement table - $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'basic_cover_si','old_value' => $employee_policy['basic_cover_si'],'new_value' => $policy_data['premium'],'created_by' => $file['created_by'],'remarks' => 'da auto si enhancement','group_key' => $group_key]); - $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'premium','old_value' => $employee_policy['premium'],'new_value' => $slab_value['premium'],'created_by' => $file['created_by'],'remarks' => 'da auto si enhancement','group_key' => $group_key]); - $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'si_enhancement_date','old_value' => null,'new_value' => ($policy_data['date_coverage']),'created_by' => $file['created_by'],'remarks' => 'da auto si enhancement','group_key' => $group_key]); - break; - } - } - } - - - - - } - - break; - }// end of self employee si enhance ment - - //save employee table if(count($employee)) { diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index c2dfc080..25a70785 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -659,25 +659,25 @@ if (!function_exists('premium_calculation_manager')) //audit history table then initiate calculation with it. so this data again get updated in emp table //check emp records - if($file['id'] == null && $emp_data['temp']['emp_status'] == 'draft' && $emp_data['temp']['policy_status'] == 'draft') + if($emp_data['file_id'] == null && $emp_data['temp']['emp_status'] == 'draft' && $emp_data['temp']['policy_status'] == 'draft') { $original_emp_records = get_emp_records_from_audit_history($emp_data['temp']['emp_id']); if(is_array($original_emp_records)) { // Kint::dump($original_emp_records); - // $emp_data = replace_original_data(original_data:$original_emp_records,current_data:$emp_data); + $emp_data = replace_original_data(original_data:$original_emp_records,current_data:$emp_data); // Kint::dump($value); } } //check emp policy records - if($file['id'] == null && $emp_data['temp']['emp_status'] == 'draft' && $emp_data['temp']['policy_status'] == 'draft') + if($emp_data['file_id'] == null && $emp_data['temp']['emp_status'] == 'draft' && $emp_data['temp']['policy_status'] == 'draft') { $original_emp_policy_records = get_emp_policy_records_from_audit_history($emp_data['temp']['emp_policy_id']); if(is_array($original_emp_policy_records)) { // Kint::dump($original_emp_records); - // $emp_data['policy_details'] = replace_original_data(original_data:$original_emp_policy_records,current_data:$emp_data['policy_details']); + $emp_data['policy_details'] = replace_original_data(original_data:$original_emp_policy_records,current_data:$emp_data['policy_details']); // Kint::dump($policy_data); } } diff --git a/public/sample_excel/sample_inception.xls b/public/sample_excel/sample_inception.xls index 934df3cdd3aff1c66d5ab4b18a5a7886a1581ad9..2c3ab4e3dce179b06c1ed435e76464af19243977 100644 GIT binary patch delta 2038 zcmZ{l&ud&&6vxlK_x+rgHOD4(k{B` z8-M%(wGTlAp)EySRh-${CdNI6BCC|hT=W=pYUM)nlTq?d?yleDGoO^7hu&wLVp7 zov!ruYoDs@-qc*3a}j7H0-qZ7<=#;X*`HJQX9qT^n#_rKPVdKQSEcu9niR~0Jh?V5 z66}3=SEOkXu86K{whT3?acVH;V2p#=nJ%oUVx~te`s|B@l=iUBr*`fkpe4HbRMC!j z59tUUN%7aZh+s~`h0#?knt(-gBi4KBv>lIWnGO{ps<1RH#^-wiKYShHYr&t%SLhPH zCWlr8KV|2dT$r=PR1c1re+N~e!G9F{0jqqMDVE)68bvS?ym|n^2*TmquMvbh*K7uj zAkKJ4M2MCMQ zD5j1gIAahTLEy^agK%+Ai1#~+;0nS^xnEZhHg8%4H??WNAS1Yv1@17;f?LXhI|jim zWg#!(0|=fVEaZMYLFj(V2x$dD2F1V#o**Q})X^+>Il?LpzP1)TAgm&U&4Mq%*~4fS ze2lLmzjkZBAUya>rLu3ogy0K8vzR)H;EzG@O9+r31c%s^5CX|UEB6}+Lb|K$Nd%>X z2n2y0@IeHng9yeT1SNz}g0ILmDKsS%1Zc1L4auYsm2Zqi2!SvZl@JI+Q3(qK7L`yC zxa2~>wW<4?Msv15Hn8~+L;Sd1ZB>QD+OiCbwI$58<;m5@cmCOs{twa9%TRy;)o5p1 zSy{(eLc@KqW-LM%>mxD|te%9>9wPZ!O1*N_Y|QlA`H1BH?4!h<|jd}G-cDC`}noFnPhvf~LdVe$;x|_UdDzDom obH5+Y&a|3A=hp4bt*;-ctmVvPoz|YJW>?#v>*KS%=WWlt0BBS9qyPW_ delta 2240 zcmZ{lONbn05XbB5*K|+sJl!PD>|=U%vzytxln6OQA{&w5!HXb14vP-X#0K}s6SI`Nj z{;YNOpp%dO5*@Y!2QS8UEU%z-mgasjn)&FDxnb@(<8eq&MsF5woGKE%da>Pqts8XT z?)C>kFh|sB54yqjg`oRxZ%`uI>9*h6?gtmPcjV3JMDe^@af#ZUPH)iL?js?cZugDB z#a^(}?Q|}WDNiTqo6#qw57f&=`pkz79PiN_m2h6GOx9&8Lw+cgSBO-iPX^d)pB&EvUi{yuSu0e$A`2$nycC>{1+^2VoA*CRT(Qbq*oQJ;Fk8Niqa4@ z$dP-!4HnT+C}jXC(fdXo?@Ve^eKV0+kUaz$TT^6XHJ@raA!_~M$IGM)2f`e!#wJ`k zOjqwJ+Lu3hw1zVuoAB{`047YtuaL7fJYOjo57d*|MS<4oVCtfX6?Yrs^KU}}Zji>8 z_zmIbBs0G;#cz;BM^b(R{70k(wWb4ejK7bV4B)pA4x{q9PKDTB7Qqw*E}S5Qh=8e0 zL8!$DrXXCuoX8lV4w=?ugoRWyi(t+`Fe!^*iE}PjgThG_EkWRY$FW(0aH?#GQ%kat zAXrkxrBpMEV9h|V1c5t;3t@|M6e-kch_he|!g6fb7KHOxHG(~bU`rtysb&_zo`GOb zWkEM_$T20&!0B}aA&3n-g0TCAMsTKj!4ZUJs+mP_VuTG!PTdO*5H{dJXCbHK=XkRS zIVf!K43t9T1mV`7x)*X&2suH(P>eOR2)P*uxhaGYV+zjMSr);SEF6vvyMl0A=`6TY zg>VIdw;*?oi~LP?ggXPlogjp022Y%?%YC_>3>8lh_$?du1mSa2BX~fV3>6OulcD0J z2s~3fLEx720JloJKN;AXD}57dE_dkRwuTL*HK^v= zI*OA(Ww#a2(FPrr`y>pWCxN`>FnFUk>G^BAnAl}uCXT$s!QVILrc`8 zNIH51GB)Q6ERP|E^;6i@6qes=*y(xb1M3+4h@BNEC0y(hA6KkT&j5Z;sZ=YyIPc;IUemMR8);qtcsA