update error
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 4m50s
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 16s
Build, Push and Deploy / deploy-staging (push) Successful in 41s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-05-06 09:49:01 +07:00
parent 28510f1163
commit 0cb58d3419
7 changed files with 28 additions and 24 deletions

View File

@@ -21,13 +21,13 @@ public function view(): View
// SALES
$dailySales = DB::table('sales')
->select(
DB::raw('DATE(saleDate) as date'),
DB::raw('"saleDate"::date as date'),
DB::raw('SUM(actual_total_amount) as total_sales'),
DB::raw('SUM(lossProfit) as total_sale_income')
DB::raw('SUM("lossProfit") as total_sale_income')
)
->where('business_id', $businessId)
->when($branchId, fn($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(saleDate)'))
->groupBy(DB::raw('"saleDate"::date'))
->get();
$sale_datas = $dailySales->map(fn($sale) => (object)[
@@ -40,12 +40,12 @@ public function view(): View
// INCOME
$dailyIncomes = DB::table('incomes')
->select(
DB::raw('DATE(incomeDate) as date'),
DB::raw('"incomeDate"::date as date'),
DB::raw('SUM(amount) as total_incomes')
)
->where('business_id', $businessId)
->when($branchId, fn($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(incomeDate)'))
->groupBy(DB::raw('"incomeDate"::date'))
->get();
$income_datas = $dailyIncomes->map(fn($income) => (object)[
@@ -71,24 +71,24 @@ public function view(): View
if (moduleCheck('HrmAddon')) {
$dailyPayrolls = DB::table('payrolls')
->select(
DB::raw('DATE(date) as date'),
DB::raw('"date"::date as date'),
DB::raw('SUM(amount) as total_payrolls')
)
->where('business_id', $businessId)
->when($branchId, fn($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(date)'))
->groupBy(DB::raw('"date"::date'))
->get();
}
// EXPENSES
$dailyExpenses = DB::table('expenses')
->select(
DB::raw('DATE(expenseDate) as date'),
DB::raw('"expenseDate"::date as date'),
DB::raw('SUM(amount) as total_expenses_only')
)
->where('business_id', $businessId)
->when($branchId, fn($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(expenseDate)'))
->groupBy(DB::raw('"expenseDate"::date'))
->get();
$mergedExpenseData = collect();