yadiparfum/parfum
yadiparfum/parfum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Exclude purchase totals from outlet expense and revenue calculations in chart components.

Browse Source
This commit is contained in:
Yoga Pangestu 2026-01-02 16:27:21 +07:00
parent 0733bd0d3e
commit cc18a1fae5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Livewire/Chart/OutletExpense.php
View File

@ -4,7 +4,6 @@
use App\Models\Expense; use App\Models\Expense;
use App\Models\Payroll; use App\Models\Payroll;
use App\Models\Purchase;
use Livewire\Component; use Livewire\Component;
class OutletExpense extends Component class OutletExpense extends Component
@ -24,11 +23,9 @@ public function mount(array $outlets)
foreach ($outlets as $id => $name) { foreach ($outlets as $id => $name) {
$expenseTotal = Expense::where('outlet_id', $id)->sum('amount'); $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'); $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; $expensesData[$name] = $total;
} }

4
app/Livewire/Chart/OutletRevenueExpense.php
View File

@ -5,7 +5,6 @@
use App\Models\Expense; use App\Models\Expense;
use App\Models\Order; use App\Models\Order;
use App\Models\Payroll; use App\Models\Payroll;
use App\Models\Purchase;
use Livewire\Component; use Livewire\Component;
class OutletRevenueExpense extends Component class OutletRevenueExpense extends Component
@ -27,9 +26,8 @@ public function mount(array $outlets)
$revenueData[$name] = $totalRevenue; $revenueData[$name] = $totalRevenue;
$expenseTotal = Expense::where('outlet_id', $id)->sum('amount'); $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'); $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); $this->outlets = array_values($outlets);