From 89fffb2cb12aa23de73f292010c12cb263f2570c Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Mon, 10 Nov 2025 22:59:39 +0700 Subject: [PATCH] feat(discount): memberikan kondisi voucher hanya berlaku di outlet tersebut --- app/Traits/Order/WithMember.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/Traits/Order/WithMember.php b/app/Traits/Order/WithMember.php index 27f4fec..e5f49a6 100644 --- a/app/Traits/Order/WithMember.php +++ b/app/Traits/Order/WithMember.php @@ -38,20 +38,15 @@ public function updatedFormMemberId(?string $member_id = null) } $memberId = $customer->user?->id; + $outletId = $this->form->outlet_id; $this->vouchers = Voucher::whereHas('users', function ($q) use ($memberId) { $q->where('user_id', $memberId); }) - ->where(function ($q) { - $q->where(function ($q) { - $q->whereNull('start_date') - ->orWhere('start_date', '<=', now()); - }); - $q->where(function ($q) { - $q->whereNull('end_date') - ->orWhere('end_date', '>=', now()); - }); + ->whereHas('outlets', function ($q) use ($outletId) { + $q->where('outlet_id', $outletId); }) + ->active() ->select('id', 'name', 'type', 'discount_amount', 'max_discount') ->orderByRaw(" CASE