diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 971b1073..dec12249 100755 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -6,6 +6,7 @@ use App\Exceptions\ImportRowException; use App\Helpers\Helper; use App\Http\Resources\MemberDataTableResource; use App\Models\Corporate; +use App\Models\CorporateEmployee; use App\Models\Member; use Box\Spout\Reader\Common\Creator\ReaderEntityFactory; use Box\Spout\Writer\Common\Creator\WriterEntityFactory; @@ -45,7 +46,13 @@ class CorporateMemberController extends Controller // return $claim->used(now()->startOfYear(), now()->endOfYear()); }, 'currentPlan', - 'currentPlan.benefits' + 'currentPlan.benefits' => function ($benefit) use ($corporate_id){ + return $benefit->where([ + 'corporate_benefits.active' => 1, + 'corporate_benefits.corporate_id' => $corporate_id, + // 'corporate_benefits.plan_id' => $corporate_id, + ]); + } ]) ->paginate() ->appends($request->all()); @@ -230,17 +237,36 @@ class CorporateMemberController extends Controller public function generateLog(Request $request, $member_id) { - $member = Member::findOrFail($member_id) - ->load([ - 'currentPlan', - 'currentPolicy', - 'currentPlan.corporateBenefits' => function ($benefit) use ($request) { - return $benefit->when($request->benefit_ids, function ($q, $ids) { - return $q->whereIn('benefit_id', $ids); - }); - }, - 'currentPlan.corporateBenefits.benefit']); - + $corporate_id = CorporateEmployee::where('member_id', $member_id)->value('corporate_id'); + // $member = Member::findOrFail($member_id) + // ->load([ + // 'currentPlan', + // 'currentPolicy', + // 'currentPlan.corporateBenefits' => function ($benefit) use ($request) { + // return $benefit->when($request->benefit_ids, function ($q, $ids) { + + // $q->whereIn('benefit_id', $ids) + // ->where([ + // 'corporate_benefits.active' => 1, + // 'corporate_benefits.corporate_id' => $corporate_id, + // ]); + // }); + // }, + // // 'currentPlan.corporateBenefits.benefit' + // ]); + $member = Member::with([ + 'currentPlan', + 'currentPolicy', + 'currentPlan.corporateBenefits' => function ($query) use ($request, $corporate_id) { + $query->when($request->benefit_ids, function ($q, $ids) use ($corporate_id) { + $q->whereIn('benefit_id', $ids) + ->where('active', 1) + ->where('corporate_id', $corporate_id); + }); + }, + // 'currentPlan.corporateBenefits.benefit' + ])->findOrFail($member_id); + $dateOfAdmission = $request->date_of_admission ? Carbon::parse($request->date_of_admission) : now(); // return view('pdf.guaranted_leter', compact('member')); diff --git a/frontend/dashboard/src/pages/Corporates/Member/sections/DialogLog.tsx b/frontend/dashboard/src/pages/Corporates/Member/sections/DialogLog.tsx index 03a4b8f2..f4bfb088 100755 --- a/frontend/dashboard/src/pages/Corporates/Member/sections/DialogLog.tsx +++ b/frontend/dashboard/src/pages/Corporates/Member/sections/DialogLog.tsx @@ -63,7 +63,6 @@ const DialogLog = ({ title, openDialog, setOpenDialog, data }: MuiDialogProps) = useEffect(() => { setBenefitIds(data.member.current_plan?.benefits.filter((benefit) => benefit.pivot.active == 1).map((benefit) => benefit.id)) setCheckedBenefitIds(benefitIds) - console.log('Check All', benefitIds, 'X', data.member.current_plan?.benefits.map((benefit) => benefit.id)) }, []) const clickHandler = () => { diff --git a/resources/views/pdf/guaranted_leter.blade.php b/resources/views/pdf/guaranted_leter.blade.php index bd5d5382..324614f5 100755 --- a/resources/views/pdf/guaranted_leter.blade.php +++ b/resources/views/pdf/guaranted_leter.blade.php @@ -120,7 +120,6 @@
{{ $member->currentPolicy->code ?? '' }}
-
Date of Admission