From 6345a3f38828c336ecc291820b1c36e3a0c83764 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Tue, 11 Nov 2025 11:30:22 +0700 Subject: [PATCH] refactor(overview): menghapus query method --- app/Livewire/Studio/Dashboard/Overview.php | 42 +++++++--------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/app/Livewire/Studio/Dashboard/Overview.php b/app/Livewire/Studio/Dashboard/Overview.php index 4d96267..5846dcb 100644 --- a/app/Livewire/Studio/Dashboard/Overview.php +++ b/app/Livewire/Studio/Dashboard/Overview.php @@ -35,71 +35,53 @@ protected function loadStats() { $outletIds = $this->selectedOutletIds; - $todayOrder = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $todayOrder = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->count(); - $yesterdayOrder = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $yesterdayOrder = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->count(); - $todayIncome = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $todayIncome = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->sum('total'); - $yesterdayIncome = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $yesterdayIncome = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->sum('total'); - $todayCogs = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $todayCogs = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->sum('cogs'); - $yesterdayCogs = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $yesterdayCogs = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->sum('cogs'); - $todayDiscount = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $todayDiscount = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->sum('discount'); - $yesterdayDiscount = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) - ->paid() + $yesterdayDiscount = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->sum('discount'); - $todayVoucher = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $todayVoucher = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->whereNotNull('voucher_id') ->count(); - $yesterdayVoucher = Order::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $yesterdayVoucher = Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->whereNotNull('voucher_id') ->count(); - $todayExpense = Expense::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $todayExpense = Expense::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->today() ->sum('amount'); - $yesterdayExpense = Expense::query() - ->when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) + $yesterdayExpense = Expense::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) ->yesterday() ->sum('amount');