From d49ef7d99e16ee683b3132ac0329f9adb999200f Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 13 Jun 2023 13:31:35 +0700 Subject: [PATCH 1/6] update --- Modules/Internal/Http/Controllers/Api/CorporateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateController.php b/Modules/Internal/Http/Controllers/Api/CorporateController.php index d5f46f4e..c095f8a4 100755 --- a/Modules/Internal/Http/Controllers/Api/CorporateController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php @@ -80,7 +80,7 @@ class CorporateController extends Controller { $request->validate([ - 'code' => 'required|regex:/^[a-zA-Z0-9]+$/', + 'code' => 'required|regex:/^[a-zA-Z0-9_]+$/', 'name' => 'required', 'payor_id' => 'required', // 'logo' => 'required', From dbdeed0d5bb1729907cb2cf596f6f36fc5b259bb Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 13 Jun 2023 13:42:06 +0700 Subject: [PATCH 2/6] update --- Modules/Internal/Http/Controllers/Api/CorporateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateController.php b/Modules/Internal/Http/Controllers/Api/CorporateController.php index c095f8a4..abc66eb0 100755 --- a/Modules/Internal/Http/Controllers/Api/CorporateController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php @@ -303,7 +303,7 @@ class CorporateController extends Controller public function update(Request $request, $id) { $request->validate([ - 'code' => 'required|regex:/^[a-zA-Z0-9]+$/', + 'code' => 'required|regex:/^[a-zA-Z0-9_]+$/', 'payor_id' => 'required', 'name' => 'required', 'policy_code' => 'required_with:policy_id', From 554d0048e788b29e9269c4d60574e4bf64635ef4 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 13 Jun 2023 14:15:01 +0700 Subject: [PATCH 3/6] update --- frontend/dashboard/src/pages/Corporates/Form.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/dashboard/src/pages/Corporates/Form.tsx b/frontend/dashboard/src/pages/Corporates/Form.tsx index 8ff872f7..014e1bfb 100755 --- a/frontend/dashboard/src/pages/Corporates/Form.tsx +++ b/frontend/dashboard/src/pages/Corporates/Form.tsx @@ -430,6 +430,10 @@ export default function CorporateForm({ isEdit, currentCorporate }: Props) { value: 'member_id', label: 'Member ID', }, + { + value: 'policy_code', + label: 'Policy Number', + }, { value: 'phone', label: 'Nomor Telepon', From 569d356b6b3e680acf25d9d0849dd7e0960990ef Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Wed, 14 Jun 2023 10:47:11 +0700 Subject: [PATCH 4/6] automatic linking --- .../Controllers/Api/CorporateController.php | 1 + app/Models/Corporate.php | 1 + app/Models/CorporateBenefit.php | 3 ++ ...oloumn_automatic_linking_to_corporates.php | 33 ++++++++++++++++++ ...mn_limit_free_tc_to_corporate_benefits.php | 33 ++++++++++++++++++ .../dashboard/src/pages/Corporates/Form.tsx | 4 +++ .../Corporate Plan & Benefit Import.xlsx | Bin 15571 -> 15653 bytes 7 files changed, 75 insertions(+) create mode 100644 database/migrations/2023_06_14_093535_add_coloumn_automatic_linking_to_corporates.php create mode 100644 database/migrations/2023_06_14_100127_add_coloumn_limit_free_tc_to_corporate_benefits.php diff --git a/Modules/Internal/Http/Controllers/Api/CorporateController.php b/Modules/Internal/Http/Controllers/Api/CorporateController.php index abc66eb0..b06476c9 100755 --- a/Modules/Internal/Http/Controllers/Api/CorporateController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php @@ -673,6 +673,7 @@ class CorporateController extends Controller $row['prorate_lookup'], // "Prorate Lookup", $row['max_days_for_disability'], // "Max Days for Disability", $row['max_period_for_disability'], // "Max Periode of Disability", + $row['limit_free_tc'], // "Currency", $row['currency'], // "Currency", $row['show_benefit_item'], // "Show Benefit Item", $row['show_benefit_value'], // "Show Benefit Value", diff --git a/app/Models/Corporate.php b/app/Models/Corporate.php index c53c7aed..acf73614 100755 --- a/app/Models/Corporate.php +++ b/app/Models/Corporate.php @@ -23,6 +23,7 @@ class Corporate extends Model 'help_text', 'active', 'linking_rules', + 'automatic_linking' ]; protected $casts = [ diff --git a/app/Models/CorporateBenefit.php b/app/Models/CorporateBenefit.php index fadf3470..03b6e177 100755 --- a/app/Models/CorporateBenefit.php +++ b/app/Models/CorporateBenefit.php @@ -69,6 +69,7 @@ class CorporateBenefit extends Model 'show_benefit_item', 'show_benefit_value', 'active', + 'limit_free_tc', 'reason' ]; @@ -127,6 +128,7 @@ class CorporateBenefit extends Model "Prorate Lookup" => 'prorate_lookup', "Max Days for Disability" => 'max_days_for_disability', "Max Periode of Disability" => 'max_period_for_disability', + "Limit Free TC" => 'limit_free_tc', "Currency" => 'currency', "Show Benefit Item" => 'show_benefit_item', "Show Benefit Value" => 'show_benefit_value', @@ -187,6 +189,7 @@ class CorporateBenefit extends Model "Prorate Lookup", "Max Days for Disability", "Max Periode of Disability", + "Limit Free TC", "Currency", "Show Benefit Item", "Show Benefit Value", diff --git a/database/migrations/2023_06_14_093535_add_coloumn_automatic_linking_to_corporates.php b/database/migrations/2023_06_14_093535_add_coloumn_automatic_linking_to_corporates.php new file mode 100644 index 00000000..fd07fedd --- /dev/null +++ b/database/migrations/2023_06_14_093535_add_coloumn_automatic_linking_to_corporates.php @@ -0,0 +1,33 @@ +integer('automatic_linking')->after('active')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('corporates', function (Blueprint $table) { + $table->dropColumn('automatic_linking'); + }); + } +}; diff --git a/database/migrations/2023_06_14_100127_add_coloumn_limit_free_tc_to_corporate_benefits.php b/database/migrations/2023_06_14_100127_add_coloumn_limit_free_tc_to_corporate_benefits.php new file mode 100644 index 00000000..dd606dec --- /dev/null +++ b/database/migrations/2023_06_14_100127_add_coloumn_limit_free_tc_to_corporate_benefits.php @@ -0,0 +1,33 @@ +integer('limit_free_tc')->after('active')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('corporate_benefits', function (Blueprint $table) { + $table->dropColumn('limit_free_tc'); + }); + } +}; diff --git a/frontend/dashboard/src/pages/Corporates/Form.tsx b/frontend/dashboard/src/pages/Corporates/Form.tsx index 014e1bfb..33e2e0af 100755 --- a/frontend/dashboard/src/pages/Corporates/Form.tsx +++ b/frontend/dashboard/src/pages/Corporates/Form.tsx @@ -231,6 +231,7 @@ export default function CorporateForm({ isEdit, currentCorporate }: Props) { welcome_message: currentCorporate?.welcome_message || '', help_text: currentCorporate?.help_text || '', active: currentCorporate?.id ? currentCorporate?.active === 1 : true, + automatic_linking: currentCorporate?.id ? currentCorporate?.automatic_linking === 1 : true, policy_id: currentCorporate?.current_policy?.id || '', policy_code: currentCorporate?.current_policy?.code || '', policy_total_premi: currentCorporate?.current_policy?.total_premi || 0, @@ -303,6 +304,7 @@ export default function CorporateForm({ isEdit, currentCorporate }: Props) { formData.append('name', data.name); formData.append('code', data.code); formData.append('active', data.active ? '1' : '0'); + formData.append('automatic_linking', data.automatic_linking ? 1 : 0); formData.append('type', data.type); formData.append('welcome_message', data.welcome_message); formData.append('reason', data.reason); @@ -575,6 +577,8 @@ export default function CorporateForm({ isEdit, currentCorporate }: Props) { {JSON.stringify(values.active)} + {JSON.stringify(values.automatic_linking)} + Company Logo {/* t;oyAG;NWoK;NZO9a=in) zIa+|hj-1|3ZwvGsKcx#2-nUOYpiZZKK~hD7=ESi=`}zIK^G3gF>jLF)1Xrl4O1aT% zbsuj{PX|CF{wYrRNLASV+Y7!24D0&3$>hGQn2g>5E@Sd2o4FCBpAgTEo$YbrHJQ7C z2@ni*#4}mUGl!E~@Op6Er`L4U*l;Uy0r-V(%QYWgUAj42Z)+Xm`jhtRgn`te!ICaBs%n^7A3LIeMN_gv(ZJNh&hQGqF?yh%M?fZi z6Rz5tMO)(~Gf&MAvp!?R8Z{}eP*iz_)m=yz?!1djbLN{J3s`ih7NJG451iA>0y(d{+Rrf=7q~*H4ec>zjpkFHkBT~@g*upby zOOxP@YctSfs&agMf;0zxksV=huaSRukMR#IL zTLyI?bi;(bjY+p5$f?6>oHqvSb<2Hz9WK*wVS+iGxl52Az9w|)W2bW&t*{25C2;Hz z&&0(&UlWVcL7-QlMI{?qa2#AiBDHJ*_khre<|jpJLdiI~#zhf5zJZsHUUx(Ke}?n= zPosA=TOy3#ygmB0xtl0iI>YPP8Bgce7Hlk6m#J~smYZ>qBHTpfGjr@!JPK)0Kzip! zzM~aHr6IrHZpN<;+2ULfUt&j<0k3nS9M}lE5mSh|g~iqy;M@Y=O^WOdEhX%brxD0` zpof9lrYbrL)2o>CZeoHNIXWN`l|}lq9nFTuLNmeDo;3pACmAGfLLKdYL&JgtWGYmc zr-jsr;D3bfI2f86GRH4AfXn!oKSL|(!@j_yN2R~@)KcS^`uThlO~Tk3QS9Tn_~gug zw3n*DdFOiejhonu>haM^neDvt6_h(8m#PZxo<%le;%3}J&vA0x$wUQ(UMMzn+3Mu| zc`vE(e%?lW0{aZ^QVprFF-vYh@u99~X5XEC@4>cs|DD^PO~C0d2*VDU_9bW!Ft30cGD@&A-LH#klhgaj0Z;?v4D*SCw2S3;s)8w{ z6IR8#QOhXDHqhBb zv3hvFyFKnXDM+(zBgw<=%$!Mc8 z4rtYX$+Rccxn4W1)KjZxp*!SVHKfj{ghpOpG0qbE$S?mYdcI4k0hGKJ=Sk!$A5D_=zOKsiPc~uhw!ift9u*s!RdZN4m z*64b1=?|W+g;CkN3J%8WU0&s`kdL1I$DbLQd-+9@_k&p>19^)*S*v*2FQl31mTt?` zvqKj4=MNY^EJ@Wco6>}i1{y_hSP<~qRw}2!RZ208Tp<3baTmzq+_L9e^~f46TB*Tn zHc_!8N4eH)DCPz6(`VtRIC6|Lk)zv?a~}eamXNoGf7*d0hqvJvm=SV&TL4J~Rzoot80eEy~n~UzjQdcH!)QqD_yJ2>;r66$Af+Z(gtd~Rk_}mF9oA+gKc^p|18t6 zoH+Elyt<|)c0a%r=;B(u^piVeCSnN%!JPw-XNbMF zJ<&yWIzl|C^sst3ULS};ux$Dr&j47(PfMjA46Kr0SwCPRr7?ZI+|Qz*9@F_E<*|KL zu?%mPdXWV2dLvoGOAZ3vLMy@ZBV>2=7m94*5{AIT!96}cMc>EA#MF6pLMcKyNa!%? zi!)?d-nhiXO9!gDR*yD3(5e!)%&W&Ghq4g&3-O{!uvN8V(M+Jsp*?>KY-orA;_vR? z-1Knlcz9zqRes?mG1hT-qOWnYKDBgMB+=o0vj3@L!Nl0VLs7_(YVTb*Y;vTJ&`bN~ zK=t7p=j8lk@W{=DM{RpaWO0U_$67Q&g}S%8hwyPUL7Tehc5kkF>q>9Ddh13nFw?s) z(lXO~BobPS*A8jhdkCBE#@=ULE=%jV?|EGOHGRp{BG=H(;#cFKe|@*uc5Dy7C?+Vg zf)|2ta|;AA;v?vfiMD>BI8rtylpQHDvl1*!GKcR51S$Y90AVSLXvShd?Bi!hwncLq zB+UE2VrmW^NXEoq6`XlQClC!8O-2=jRGAeY=FQ-&0>a44py6=Kniyc=$sNf9^y>D6=bSyXTf ze(NM}qV)ZJ!+-jiaA%>R8R-J}TW~LY;}iFnGzOryj82;10x}0vavEfh^e_+1hr;WXIGD$w-h&HQ0vUwPnOFNGnnV3 zP3(ENH{d+pw>KGuN!do(=<5_|?j9L>uC}B%fGcU#e3z*bYv2X>7KKF(e2x2D^{F8` zCLZxZWhm`)>GhoKck@eqi`BY)l^vy(7Fi%eW0Gd{F&vmzZ1~)vXQ{K=`?9C49%Drr z2IlcQRKLA}3eN4>DLG$=uxV0}cu=37{x9*%BJ)?DVH)pZ?4z8J-%D^CCU$9Kf^i^0 z%{vm1aqWtsX%8DP&?R<^yF*pt($Y_bG&;InixMjYvR;nEVoNvZ{)v)YCJ@XEtwe~P1oMqh z!ScQ6yJ7uDu(OaC*&nvk`W(XWd*Jzs-^>-FRPb95AHk>6Jgu zhc&2etEPsBrDsc^SSb+b^}-bbKl(L*Y@Z{Cik+05dgud7r~<8XEg?8ZW^h3V|IlFl!ril3VRLib6B!b!~ z-F<5!1#d%$qQK0^E*TWa=7W^QQOp`V<@rt2y)5Yg%|}`K@;P}qss$2|(&$%m+*cdz zEO@2ExvclR^g44PQ=t%K-aKOD7%YR)Oq%W_Ayc}Frd?9kL8{`^Z5Ov7!oIl9?uIv4 zjd|*t=M^OCRe3H^agQhJUr*30x+(D3Yft%C-&pS;w_w8$F*!PJiS;6}XT$kQp}Qdv zhq758HqpCWTjic}SPPCquv$viKl3ifyP+w6Kok5Y>$aA^Pc_)QoK@!ULwxdE7(8z2`fECZixN$?{3960?>RxT% zQ??-KYoxo$21c3-nWvb!P&0&Wnr#~iw~j3&Z+Mqy0*3F{r0{zn%*NI?=1-LfgV7JT z+}-IsHqTTk(3j7(@Y|Rv+a7q;&IUVvpJ(JIuE-sK%;abIpxH_fOT3a>ofbXRRF5>oc^7eBLKd7E)A&?+%CirAqXd#e>K3))Cjx9s}#>szzW!j?i zydEIL4AQrPs6%g^YDG&Xm^fP`VFl^E_}a#+le;4arFWaW*l!{HRI!+fjI_jHX2UW% z0OQT873vVl%(~PV)A*GBiRPi{wsGWS@8E7`^0xMFXQX-X;9=x2I~MGJ3x){OXdGrY z%$?Lu3HvTkD!7tP&A-iD{4S9Z>hELhOq@+E0Ex2H;wx|bQf{@a=)g8tYlY4AQ#fJ4 zbkkiy%iudntd%tbnCg35(uWuG&W>f`)9h~Qf@uvp~A$&yvVSL3)+vLQ!1FmQBRJ%)U*z}Vq@8y%o?n$Kb zEJ}VB6}^N!$?UO(1V*!_5rwo67KvxnNE!t9vXjX!;Zr|@pWpUB%GVVJ# z$<9=fOwgJ-_B!arJUO#`fS9Yo908{PLp|pMGAbn*K(}>Nj_ctt}729(u2x=Y%w|GP9;)Fv6dzVWvEPQv7lB6`cZ>>L?NnF}i9MfgcW5 zZA7Q7F>bg18nV7JBXPjU$dm?rF3=Jn5+cwXs0ZA2GVT9f`Vy4arU}a}Rn$Idca5O~ zEj8BLS+$L@aSEM>%YGI3!^uZvuiWbD_e?sU3G9W?%g86PZu@t>{ReYWBJ$%ZHRFZPR~jyeq=yx@ZtDc~$dZU`kt-INO5x}x^CJK@-R9yLOp;Qdpz;3*S(k?oUbB{jKl|j5{NEAK6nOITzeaSIrNrZDM91BMX&?C*o{R!K zo4{AIv{jcCq^v;yi^2gVP31ok&ywD(&(ilp&^O%t_2untTu8gv{qe2hhUf*X?GE4E z^&W!#_>}VdKVKZ>db_b}{Dl5QY#owo>H+XjHX3ROI=nDLsOBXqUG>=Fvd}}ANdDJ| z8Ti5*ihM2y(GLyMA9`BjPkmux?j+7FhHZxnp0Is0>AYWi4F^UQefK6UhYv0T zS#oKE@sl1A7`;QicCHX(a$JI=9bUz3S2_CT8DO#Iu8=H`#K3Z$;>1*}Oue+F%eB5_ zS8Wl5qK^LtkN(_J;?FuA@5@M#!-J!@32xh zb!=-Yc^-V8)^_oAIrHA-TMv71YJ}?WcXe5n;dWQ!egtcT4S@*x(JySfZCMrgvrfx!Xb>$Yq)A@NG>DDB-qDv+ zIt0;>Nyof^)YcjAidxcgfa}WGO>uAr`dBij5ulWGT24=F8M>c3i?H5xgfu|>LN&c+ zbvZ`uVLF<>Iui16bHUY=^^+eOUU5F%>E4+h-;x$?5GCxHe{j2{Y*rnbVVW+qi6%%*&b*Vq37_t&P(Uvma2t38~j7baIyb zLOsHGU!m*`i$kj?T9eakNcpn_8c2z*d;nGOH|&df`$IPY4Z}+$^f+&wH3yS$%Qs zo$4e3GW`%H`?*UtLx3RglT-2oEG^rod|%dBqZB(VMC27Fw4*#9Kw-96sFwRV3_-wo@}JI@OO{LFG5X^%|C84_mrK}4RE@W{=52;UKI zl~oee66ujYs&5kC9*PuzUdMcKM4jKFV^rwjwdJHt7{4vDn#PQONhB)2lo`d|%^R=X z9zAY0Rw^d1SMg$un;@eXVkhHpCjS2NwGIp$sKF+khzw|r9ak=O_#^09PtQdBl&~2D63 zhli8ig55AKlHc|ewXRp+1X^NAuZ0fhrk*j725jmj%0?4n3`$RIDnGJnc0Go^!r(W? z-z4Nh?pM{<>ab|UPXnB#la>;lMdfe)u>)qtVCs{KhmD3pFax~DZo7#pp!zq8@72i@ z`t1l)yt7Y_>K@1*O<~!m2Xzl>?fZ4<<`2KfuUV9KSOFKB@}#~KNtf@cIUE+H)4SJp zc{rvN2Cyk0sbiE@Up?eK7g}@rZWz8OJJP*{6>P@?16A6$;P&OEZ?~4wxoaBSkZF=girYTOI@pMrZ$!%WA(sm* zQeODwGxtq-11*JMwSjgKv&0W5JTKVGWNE=D$zLhup`#9g0SZOr+wa@;z02=++~@n%A{6soV(9xy zg6Z?-kfRsrW0R4)Ex3MafDUg7Wtu=FGYM>ZT3she5Sy-N8YSQUNOsn8GEo&c`>5E>DN^cNj{UtT(DR|6b9Oo zm+;;B||Oqr~j|NRw#FEZU(?_n^8bV^`RIcWa$)(DBtxX5fhcH7tz5;B*&IW1mr z`Q{s)Hlk6$J zFLYljmt>U5`kp?2B$e-@jnwPQQIitT zWg?>58cr-kq&Fp?`r2-8K6uF2%*nW91_!TAd;&+lCAthJyIiCn&X1;g4Z;#@4DZdT zv)oH;C>9wHS6ct5#+*dwAVvQ!;DM1Z3Y?xHFo?SV-_Mhkj1!BdRZl{d4OoRy8!Bs8 zf)KK06OMIe$tz^42rap$bDG91dU{>vghpgUn~Ca;TTh5qg5p@F0gaH2z;&t@bwIrR zc&%u~+pS;lw8&w^d?_ogS({fdicb5-?NB-)2M3~h{?V^9Vm2zrWU>1(`j*v)x8+=@ zF~76d`};-~UpSNvJL@9==J$&?#o5nz@mTD} z{+%NAAZ*tr)4aXO4{ifBzE!g$b#{4?}N+I4J&ofC>jk`m_xH`{IO33$s!D zJ0Jbuyd4@LEC+uA9TjGz`0owfzgy{n;)>8x{P$x2pIli)3gLni+R4cPB@qTdzj6UE z|BbJpiz335&totCbe1HE00)QnZ}?O~;DPdriow5wx{8V+@CrbyM5$05gr2MX58Giy AsQ>@~ delta 8601 zcmZ{K1ymi+lJ~{kF7EDbL4!NNU4jL7cNiQl61ZI4JwR}ROR%5;f<$l+u7Tj;Bmej9 zd%Jti_RN{n^Q)?^s;=qj?wTnNoC|0;Lk5JoZ`C^yKp7vGdl_;}hi zKiGH}GHOf@{Tz!u-EqCluCc0X85IhVR0nBz5NdZT8%%#j{WQEkj+dZ@DriFs5} z=iC0n6jRk%ggFuM#?)26rVDk$RSc3=fCMYD#j*YdxBFC%Jg;5EUUZ>3E!45bDMkD# z(ppr9l}}r{Qg4VL30@$oSa>!8&FJT^)bfS{{}8*ln*FgUax{d|M-Dw*z_Vme#vMuD zsp_e+*6~Q5u5V}<<*vgzRpvM>S_<1#c@Orwk(P~DB^%j(Lo$>@YNK@Vcx)|M)nmIV zj4V)`pSr{M?x}$qttAkHK&U3?bgdf2bM};@Rckiv^l(QE^%tdx)EC+oEfbhi9NURo z082>sV-rPt>7Rk$pU>?#fGk&_ML==TXw7u7v{;N<_(yK?#|V=B+hUq>mBnDkJy1tV z_xtkevIG5w<4lgg;`2|gk`=vx*Z#L&$No;Q5UWeWZfi4~q=WEtB?<&lk)>n-&{ ztl^t=b_clhvUhig9d8@-y?g!CMOOHIS}8lfI&|sSb&JtQ=lbATcEeoBPJ5!0Pno*4q?o0Zazw8?;TlV)_<>8@u#zO;ce78-3wwU?8S{F*n z8HXsRhL|sF(=?l!udB&yc>${Cdz6RUHpvB)(Ae|NPP^s{zlygbG<%(|IMg3Ii#ZX! zFHZERzf&9vy{^R^mHi{is(&qOdB+Wcc?b|RFQQw)quZR3RzyFKZ**>$0u~Km;x@-a zFtP@{!G^A74rNvl*UF*_gbyKX@~!i#t$Z~GXAZ5%$DK|!=HjEM$@pfs-hHgNEqqg0 zm^?ROkgS%!JW*%R`5HgxCj-=_ysf(DHLTvej+=;KUv0s4!nn;-t-xBt>~&AD$8Awp zS15P6a$oWBcWbxLmgzPjEtzV-!n->fllG>$*E(c3ZC#Uhvdj~;T~$^58N2e|(yAGm zWA%tPi~Yp(#@aeXUo;6a!_>c(hd98GP9E)`WO_cG-^E}NUcTeEx0jg`NaxB? z(SUkqxE?|=Zbnh^o-Cm)yBxyO?ALX!KDtYSx9K>N#5~&fsrSU)zjIAryAtaDm}1-C zc2zT*`+7*OpK^3Ci|1XsEh{+#VHGO0;bf<$MQ4P}#Nv3`t&Vn@!A{R&7=25x@_T;0 z3}%X@>FF9oW@Rru+1Z~1B!7Y)HHe8ATneUMje4XbkX8#nJrQcQhje3okda1WkyG-P8b)_kNyAQH*u91_=$G~90k zCCcMm)_!~g&!b07sgNk4`s)`CrNoA27fwFH7vw zV(3crZ#L!JMB+z{0p2=iG9xO64E2=gK~bXM_<3Vq*P=5%`uceU429wydG&q7`DM5J zFH|v=e8~rVt4I)=0z+fDjOe6C??ufwxgc4K+Ow$je!NbOQTE(3HY?_+hQ)6iI*=15 zcXb?;$*Aviy^?&}U*pe<;v|2kn7nZKAW%SxnDvO{zO4T<4yY$=AF^|{c?&WLmuLie zA^t!=T9UHdYwo+@;i2^-GPiwuWPC2^6mc_vKYuF*q3_neQNvZERP?Xy`;@P!GlFNv zj!dq^@j-5s##zP&^Zbab_McZwJt zOCDhBzspTvJ*v1|$$m(9UD5XLKKJT)-!?=GUqfVOZ-|uHIR7kf&wG=UIWXUU3WAXD z-wzoPJx|4t6+Mr~R}?+Z!G{&%^@8md9#M?D_7GfD3Tqa>-mUE#z{0`!z{6{ybyzz~ z9N!TUsk(!WVHl6xI$jif6fF}N-e6iuHW*Bdq!sf>H^^FxiGdq~DjuO3#xo=*vwlG8 z5T~(OLNk750o_Q`k3m9}MWm8uks`68qjkSZ6c}Rm(89I3@&CVwCUjc3JHbHvXn+d) zE_@U}d@>CIO&%{4w>?lnbPLwb31x}%oLVC#3J%Yj9q#~bB=*sxBB9#7VnD1bfKJ^o zxT-Rsm*gcAi)c9Pn1;D4{9`u%zs$A^2DdSSk+h~J|IqDswKvtt+2fzf!9$@+ben%D zVHcNjTqMEu!dWjsn{TTHc0)0^#M^Kuc1JmgaBJ=uIWhhSv} zS81F-T``zdl~~)GZNf9s>K{v`pDm4a+&BB{1RJ!;TS)$06NeDXv!$H>Uy$g2mW&in zgF%3DyYWYN8$j?AJWPQw23x9t;nOT82$UxY0+E1VOQK{zS*Ds>sS<9? zDf=-XwTy6y^25+Wp({Jd*7g0@siW+5-$eKinZvhV?4R!SE#qy|FlUkj5au#`4O%po&X(42gbsP!LuO9m7h7$~d&!AIJMXVDmkgF( zc17}rfUs+qVq$wGT{nLK=_qpqTuq8|1NlA2IVG`eD>_GS^I3fdGjl{Ulv6*cX|-%D zSk7^tH{6HlI*C%f|tNA73$&d$lIMVCS9v763tt#!r@WkfUE`lo@erPoO8 ziAG5I3vPpJLqD%2b-}}aZ3xn9?7t3dMWtw{YeR;~%{Qdc{DpOL!854nBxav`st#TJ z>%%>-Pc4EzF0Pxn14+zF9Tke=m=sS7NMg<0>OO$mAyEAq2+Ns)s;8$oC|&<)syBai z<-Hf1dv*&Nv%UVa&MzO`uFz;5# zm7ynB|Fn~<1ma2Gvxg#Kln^0JVj6P2rXJAqH>0gB4@neGFPKXd$xo$`=had;4s@W= zQOqwLuO(J)C^=J$TU&+bidh!77F#-TP1O31jKHZ z?*3%&e39J-jDb7ghdQMO??F$ z6RZ|-Z+Dff45vvli1QR7mXC8C86D(%`-WolhG*>3_=7CLHWv*uLp<>_h}W6XV!2G- zTAG*+Kw0~vHhvF_c+W#RQ{a`xC7%HcqraAE<6K1)cRYKO3dEeCcel|_gfUbrMPrI{ zJncqaderpnkSjklD1%$T#{xuuI6 zWzJZR(w9M@IGd4QO>fljp!6W;9@YhJjyM)h zZe0A_-@m=QdGH7PpHAv?uSZHaT)6=8-kwpQXYu=|$+ey1t=q5MPk9AgyYJejN38D0 zT+NrMrxJuY4&F3!yKV!fQK9W?R4=GcaB{u0y=&TCYRdc=YSZ%!n_`K{D3k$*`im<1 zs+w(n#ir)e?{BxisYv)S1hL-^K$nfiGT)Z9rq)xSm5GUhmHe#6D9i4z*gACFE}tt& zUW7{5CW`R;p}R^nD=5#Eskex;kE>9rPDx>~lF+lnwPMD6%8ABbc;OlDUl=Ca#F~=$ zmg444)D#mI*$fo~7%1}6YiKvukF2psQS4ZqP(_4I7No}ejV6$-u&2ykWHmQuVf{RE zwv7}Kd%s{YHRbvu%gb2(k#qUE?)#Tq@Jv3kOArymShSj&ifMg@N;sb(`)5e?FO=~Y zs`v{zV2Jol6||;!?H)OFe6oArTnX$DrJm%eakk<5?AADT^w{=5J@nV>Nnh@Qfczi#|eXo z%)*nSK%V3`{l|6WV9&G+)&h73fxQ#>rPB1dV;3fjTbP!Q4y9}|9pEcVrS0l$h+Gc1%fFZh z58UOA5UKFZ#O$86%7US!M+>f`N=auki5!Rad>BiS{*beND{Y<(JhKW^e*L0b#(F+1 z7?a|^wO9hZ$}lihIlzI~yUoA0XPZs)-@21g>h=hq84a9x&%-DPk^3Oz$SXkTpwjID zrDa%cAGf#e*-6h%6_ux3B)=lfi5Fm8t1$H>QHvVlTA72)6hYN!>L1ePrNJ{AS$d^~ zJo9mTqR=|}YQQ_Z4$Ng5Qjjf6vVWA?RJQ=ZxT&cC<#uls^wJX?8LPssk6sU0ehLnF^$03g zLJH>d{x`1CH!%V9yVv?bKe?8Dn*-POecqpxZ0R#Uek)l#Y74CWw%Pmrq)U>b$qriK zxh+6h0)NiOYrIUIIXs9Me1|z}X9|rwxf*qtKcS$@rlweJQJVewR<>2}S8Fhkb!)e2w4c_q}eaVnyMrPgjCtz2u<* z`L93Lt?s8eu5C|)q&Ur(wsd^F%wl+)y!XQ%lo)AfDQh%jA|LB&t^-@6f^JPJLKZSi ztewW!u|^qIb5MnqD;a26N^2s$GP8dmi2Wipk}kt!HPXTg-`JUG(!h;mFn@&!XCyl+ zz}nJ92@bQCCleqNEdqn}X_Id@c;i+HbP(GWd&5R9V6ik@07_CsH=+U4?6=>hQK%?Q z>XidZyi<|#>p`F-+K=mAW3;U18h=V{CE=L#B&-P=N!XpIhlogUVwj~`!z>rmu%29< zFWPKBK-3;|IH)P8RdyP2Xg9qDtPAp2_cQk@gj=a{}>Y&U0M;=F56$6-a^rNO%-m6NH?MzO^7 zu!@&z9FX{YDWm-i@YsscC@32>JU(U z%J=H1Hgt%E39T7HIy)=P>?;o*(|VO}GY*GP!LPoadB9|{$(I&n3Q>yW9msHzk=AXp zl_i&gdz2NJWCyz^Mzd0>jer|3PbkUxTY*}!c<-S@T@~LC>!;~ag9KhayETtLo;CVJ z-yN9DhL3}4IZ~1xTvjKqOvG(OpN3A41HW%Bx#vwWZ>iR?8aQjHOe|FViTk+Y+}f|Y zNh+g99}Qe@dxbVq^gVv32CVEnY0UAoIVj0~o8{I?)Xs^urqIo6%-e{U)!#MG?o0Bf zCgq{fKEzdAzM9moelha(8+}2^E5jv7dx17NCYrdzByEG~)+n*Z;Tq<}yOeJJc)P8J z7mbr@GEvrPPR@q?ir8k|1&h)$P+4pajda!e?BPc`>nwfS2cdtmb4~O!2*AW+>pSRk z0-p4F2ZQym1iY7bfU}L)-}L)u{Uz6}7q}tZUjUk$x;^kj3zl+%4+R{CGci&sd`LOt zI8z33cuDgG(c?8X>)0%v?>G0bl7P4|ynvtXQ=e1DV)flGWqbzHUU~QvTgcfIt1$Vo z{`ng*ao5(_+A)g+JJu$nWKCNCL6Ca$rtp zGQrkea#ui~kMW``*2huLyGp0-N3SK*%NFaq($i~<=&k6w%mgG@6&R#?u~-uyY3??T zYJ2e!pCHilQohJZkdz#)e=!1FmHm99>G_titULlyaDJPOvwa5zdD_<AtEzAfY{Q#Q{2biNT!P$}mk9~`2PVut$?Sf@5^tx{$-{t~zWZ^?724^-MoA7Oea)%D zBig5G_4DShi~34ba$KL^@qPMI;F6Cei~FA1xAB1KMU2h|>>&8Ab~K`vuV_!;D%_iV zdZgc$LUcZp$*q(N3STC_ak&iNDo*)oe{ogLkUHG2u&)=m$2M`uw;oeuh-+KQV5HB<@Z&Es&7 z!R>5hxGWp7Rti58^7{zS$-QkPY|YttiuM4BkXPrzz@Pk#BN`gFdp)3m*oHzbe&pP4 z>2a{5N2EwbQs_&~1~H|8>iJso;aW!Si1-Cjf8fUCiNg`+*41!=9nRq-lR2{1+1d0q z<@H;GydYm0*4Spf!HwE?_k+K;3l&V_nPG2xyRO52r`_}Apipn|oL$`0T-tgyoe}-I z|1q(}!@c;~?r=mnnR$7O+&n0pI%cJ7CN;sY5$j@2dFm8ys#giqC1+hsHWY)@rplXW_n(G?gE?Dy6lLX)F z4>~p|mvYPbnxA*0Rf4Y6LNLFgIK|Y?=S1dHs(6afl3COEg!NDRMj#e&wr67}YVY#v z!frGvawhEz)o|i|WS=wFyIpGhTC6Wd#oQ5}v#tV24j2X__H{ZG0O{0nT_pZXom!b5 z{ZZ|F+8jC@^Md>yY>Z)f5QHPTIB41oNfZ4~>5zTbFE^fidx`ukhr|PB4R>(PK0{4w z&awQI9Kg-i0!3nTM|=OWeW`}C><5pH#V}@ssc3R9@jmRr#I!`4gw<;1nHt)CVfIs011xskdxf-c^IEzhbGM%u<=;H%+9JNk1YR~jPAA-JJ8)={#0C!=EH^CELaal8<6uJqoCLbe%CBJCtPIG; zb;nMb$@0u^$fy$sF-!P<%1U>$ba^fFULI|feUg`~8#i54|i6+96W zWf@oep_vK*n@?#$0RejY!Y$0xUO3t!JYJ_)zhgF3kCH^GGyZ(~Du+=QEpAp2j~{t1 z$H3C!ifTilT_#-Bb=0~{83>^D9y*Pfnzjgi74tIln{@oI0dW1XT+9 z2Yf&diP8#3oc~2#CQS@rBTA|}#E@jdhZY0f`99d8G8nkj7`T+!78(Zm{N0Jd0zm=0 z5iiq{UhR(bJBM1h?8o%p7=pT%gR~d7oP9L8j&LmQaeH4tN0!UL80Tw8L z(TvEAiGbK?)o$EOz$X9)q}k4;w5rY@jWaTRv+tG_Uiu<~RJxE8U!ccY{NJV+;*Ej!G&Ra@_ zm+rXB2_=kx#Q2Lv#7IEKR=q3e-D4qf%ywCo-j7A$IqB;(&QB5)OXT&#R%_Qr=9pwN zk|P=kOZS%Zy4fprh(&>Ig&Fq^aqmspQVfMy#r3|(z zrU_R8;}#dC_#1eM=O;o69t6Vs56g3{ffp7n{t}K6HYom*apT25|5v!!cw1UqdRuC$ UA|d}}#(qA^pJx*ik-vBU51tPyYybcN From 4c59fd21b54e0929f9c3b25f788bc99c9d630a7a Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Wed, 14 Jun 2023 11:10:04 +0700 Subject: [PATCH 5/6] update --- frontend/dashboard/src/pages/Corporates/Benefit/List.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx index 36629ed9..46f9c5be 100755 --- a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx +++ b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx @@ -710,6 +710,12 @@ export default function PlanList() { : {row.max_period_for_disability ? row.max_period_for_disability : '-'} + + Limit Free TC + + + : {row.limit_free_tc ? row.limit_free_tc : '-'} + Currency From 914b9b0c94218202513f1fc1428a59ab9e14c748 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Wed, 14 Jun 2023 14:35:37 +0700 Subject: [PATCH 6/6] update --- .../Api/OLDLMS/MembershipController.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Http/Controllers/Api/OLDLMS/MembershipController.php b/app/Http/Controllers/Api/OLDLMS/MembershipController.php index 0b574f10..ab63e636 100755 --- a/app/Http/Controllers/Api/OLDLMS/MembershipController.php +++ b/app/Http/Controllers/Api/OLDLMS/MembershipController.php @@ -261,6 +261,27 @@ class MembershipController extends Controller return Helper::responseJson(data: MemberResource::make($member)); } + public function automaticLinking(Request $request) + { + $member = Member::query() + ->when(in_array('email', $linkingRulesArr), function($q) use ($request) { + $q->where('email', $request->email); + }) + ->with([ + 'memberPlans' => function ($memberPlan) { + $memberPlan->latest(); + }, + ]) + + ->first(); + + if ($member) { + $message = $member->currentPolicy->corporate->welcome_message; + return Helper::responseJson(data: MemberResource::make($member), message: $message); + } + + } + public function removeInsurance($email) { $user = User::where('sEmail', $email)->firstOrFail();