dst/dstpabuaran.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance expense summary and monthly expense calculations with user role-based purchase visibility

Browse Source
This commit is contained in:
Yoga Pangestu 2026-08-14 04:21:26 +07:00
parent 7fa20fbc3c
commit ae1cc7b9a9
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/Services/AnalysisService.php
View File

@ -448,12 +448,18 @@ public function getExpenseSummary(?string $startDate, ?string $endDate, ?User $u
$advanceQuery = EmployeeAdvance::where('status', EmployeeAdvanceStatus::REPAID); $advanceQuery = EmployeeAdvance::where('status', EmployeeAdvanceStatus::REPAID);
$this->applyDateFilter($advanceQuery, $startDate, $endDate, 'employee_advances.created_at'); $this->applyDateFilter($advanceQuery, $startDate, $endDate, 'employee_advances.created_at');
$purchaseQuery = Purchase::query();
$this->applyDateFilter($purchaseQuery, $startDate, $endDate, 'purchases.created_at');
$expenseTotal = (clone $expenseQuery)->sum('amount'); $expenseTotal = (clone $expenseQuery)->sum('amount');
$advanceTotal = (clone $advanceQuery)->sum('amount'); $advanceTotal = (clone $advanceQuery)->sum('amount');
$purchaseTotal = (clone $purchaseQuery)->sum('total');
$includePurchase = $user && $this->isPurchaseVisible($user);
if ($includePurchase) {
$purchaseQuery = Purchase::query();
$this->applyDateFilter($purchaseQuery, $startDate, $endDate, 'purchases.created_at');
$purchaseTotal = (clone $purchaseQuery)->sum('total');
} else {
$purchaseTotal = 0;
}
return [ return [
'total' => (int) ($expenseTotal + $advanceTotal + $purchaseTotal), 'total' => (int) ($expenseTotal + $advanceTotal + $purchaseTotal),
@ -521,16 +527,6 @@ public function getMonthlyExpense(?string $startDate, ?string $endDate, ?User $u
->get() ->get()
->keyBy('month'); ->keyBy('month');
$purchaseMonthly = Purchase::query();
$this->applyDateFilter($purchaseMonthly, $startDate, $endDate, 'purchases.created_at');
$purchaseByMonth = (clone $purchaseMonthly)->toBase()
->selectRaw("DATE_FORMAT(created_at, '%b %Y') as month")
->selectRaw('COALESCE(SUM(total), 0) as purchase')
->groupBy(DB::raw("DATE_FORMAT(created_at, '%Y-%m')"), DB::raw("DATE_FORMAT(created_at, '%b %Y')"))
->get()
->keyBy('month');
$advanceMonthly = EmployeeAdvance::where('status', EmployeeAdvanceStatus::REPAID); $advanceMonthly = EmployeeAdvance::where('status', EmployeeAdvanceStatus::REPAID);
$this->applyDateFilter($advanceMonthly, $startDate, $endDate, 'employee_advances.created_at'); $this->applyDateFilter($advanceMonthly, $startDate, $endDate, 'employee_advances.created_at');
@ -541,6 +537,22 @@ public function getMonthlyExpense(?string $startDate, ?string $endDate, ?User $u
->get() ->get()
->keyBy('month'); ->keyBy('month');
$includePurchase = $user && $this->isPurchaseVisible($user);
if ($includePurchase) {
$purchaseMonthly = Purchase::query();
$this->applyDateFilter($purchaseMonthly, $startDate, $endDate, 'purchases.created_at');
$purchaseByMonth = (clone $purchaseMonthly)->toBase()
->selectRaw("DATE_FORMAT(created_at, '%b %Y') as month")
->selectRaw('COALESCE(SUM(total), 0) as purchase')
->groupBy(DB::raw("DATE_FORMAT(created_at, '%Y-%m')"), DB::raw("DATE_FORMAT(created_at, '%b %Y')"))
->get()
->keyBy('month');
} else {
$purchaseByMonth = collect();
}
$allMonths = []; $allMonths = [];
foreach ([$expenseByMonth, $purchaseByMonth, $advanceByMonth] as $data) { foreach ([$expenseByMonth, $purchaseByMonth, $advanceByMonth] as $data) {
foreach ($data as $month => $row) { foreach ($data as $month => $row) {
@ -554,7 +566,7 @@ public function getMonthlyExpense(?string $startDate, ?string $endDate, ?User $u
$row['purchase'] = (int) ($purchaseByMonth[$month]->purchase ?? 0); $row['purchase'] = (int) ($purchaseByMonth[$month]->purchase ?? 0);
$row['expense'] = (int) ($expenseByMonth[$month]->expense ?? 0); $row['expense'] = (int) ($expenseByMonth[$month]->expense ?? 0);
$row['advance'] = (int) ($advanceByMonth[$month]->advance ?? 0); $row['advance'] = (int) ($advanceByMonth[$month]->advance ?? 0);
$row['total'] = $row['purchase'] + $row['expense'] + $row['advance']; $row['total'] = $row['expense'] + $row['advance'] + $row['purchase'];
} }
return array_values($allMonths); return array_values($allMonths);
@ -843,6 +855,15 @@ private function isMarketingUser(User $user): bool
]); ]);
} }
private function isPurchaseVisible(User $user): bool
{
return $user->hasAnyRole([
Role::DEVELOPER->value,
Role::OWNER->value,
Role::ADMIN_BAHAN_BAKU->value,
]);
}
private function applyMarketingFilter(Builder $query, User $user, string $column = 'marketing_id'): Builder private function applyMarketingFilter(Builder $query, User $user, string $column = 'marketing_id'): Builder
{ {
if ($this->isMarketingUser($user)) { if ($this->isMarketingUser($user)) {