From cc18a1fae5f3978d953c16b9e76ffb2666dfee22 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Fri, 2 Jan 2026 16:27:21 +0700 Subject: [PATCH] feat: Exclude purchase totals from outlet expense and revenue calculations in chart components. --- app/Livewire/Chart/OutletExpense.php | 5 +---- app/Livewire/Chart/OutletRevenueExpense.php | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/Livewire/Chart/OutletExpense.php b/app/Livewire/Chart/OutletExpense.php index 96f2c80..b15d430 100644 --- a/app/Livewire/Chart/OutletExpense.php +++ b/app/Livewire/Chart/OutletExpense.php @@ -4,7 +4,6 @@ use App\Models\Expense; use App\Models\Payroll; -use App\Models\Purchase; use Livewire\Component; class OutletExpense extends Component @@ -24,11 +23,9 @@ public function mount(array $outlets) foreach ($outlets as $id => $name) { $expenseTotal = Expense::where('outlet_id', $id)->sum('amount'); - $purchaseTotal = auth()->user()->hasRole(['Developer', 'Owner']) ? Purchase::where('outlet_id', $id)->sum('total') : 0; - $payrollTotal = Payroll::whereHas('user.outlets', fn ($q) => $q->where('outlet_id', $id))->sum('total_salary'); - $total = $expenseTotal + $purchaseTotal + $payrollTotal; + $total = $expenseTotal + $payrollTotal; $expensesData[$name] = $total; } diff --git a/app/Livewire/Chart/OutletRevenueExpense.php b/app/Livewire/Chart/OutletRevenueExpense.php index 7d5db4b..778e5de 100644 --- a/app/Livewire/Chart/OutletRevenueExpense.php +++ b/app/Livewire/Chart/OutletRevenueExpense.php @@ -5,7 +5,6 @@ use App\Models\Expense; use App\Models\Order; use App\Models\Payroll; -use App\Models\Purchase; use Livewire\Component; class OutletRevenueExpense extends Component @@ -27,9 +26,8 @@ public function mount(array $outlets) $revenueData[$name] = $totalRevenue; $expenseTotal = Expense::where('outlet_id', $id)->sum('amount'); - $purchaseTotal = Purchase::where('outlet_id', $id)->sum('total'); $payrollTotal = Payroll::whereHas('user.outlets', fn ($q) => $q->where('outlet_id', $id))->sum('total_salary'); - $expenseData[$name] = $expenseTotal + $purchaseTotal + $payrollTotal; + $expenseData[$name] = $expenseTotal + $payrollTotal; } $this->outlets = array_values($outlets);