yanto/kulakpos_web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update querry report profit n lost
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 3m48s
Details
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 15s
Details
Build, Push and Deploy / deploy-staging (push) Successful in 40s
Details
Build, Push and Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
eko54r
2026-04-23 22:17:41 +07:00
parent 4f530ff301
commit f2cd16a2a8
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Business/App/Exports/ExportProductLossProfit.php
View File

@@ -24,8 +24,8 @@ public function view(): View
}) })
->select( ->select(
'product_id', 'product_id',
DB::raw('SUM(CASE WHEN lossProfit > 0 THEN lossProfit ELSE 0 END) as profit'), DB::raw('SUM(CASE WHEN "lossProfit" > 0 THEN "lossProfit" ELSE 0 END) as profit'),
DB::raw('SUM(CASE WHEN lossProfit < 0 THEN lossProfit ELSE 0 END) as loss') DB::raw('SUM(CASE WHEN "lossProfit" < 0 THEN "lossProfit" ELSE 0 END) as loss')
) )
->groupBy('product_id') ->groupBy('product_id')
->get(); ->get();

28
Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php
View File

@@ -28,15 +28,15 @@ public function index(Request $request)
$salesQuery = DB::table('sales') $salesQuery = DB::table('sales')
->select( ->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(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) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(saleDate)')); ->groupBy(DB::raw('"saleDate"::date'));
$this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date); $this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date);
$dailySales = $salesQuery->get(); $dailySales = $salesQuery->get();
@@ -50,14 +50,14 @@ public function index(Request $request)
$incomeQuery = DB::table('incomes') $incomeQuery = DB::table('incomes')
->select( ->select(
DB::raw('DATE(incomeDate) as date'), DB::raw('"incomeDate"::date as date'),
DB::raw('SUM(amount) as total_incomes') DB::raw('SUM(amount) as total_incomes')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(incomeDate)')); ->groupBy(DB::raw('"incomeDate"::date'));
$this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date); $this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date);
$dailyIncomes = $incomeQuery->get(); $dailyIncomes = $incomeQuery->get();
@@ -105,14 +105,14 @@ public function index(Request $request)
$expenseQuery = DB::table('expenses') $expenseQuery = DB::table('expenses')
->select( ->select(
DB::raw('DATE(expenseDate) as date'), DB::raw('"expenseDate"::date as date'),
DB::raw('SUM(amount) as total_expenses_only') DB::raw('SUM(amount) as total_expenses_only')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(expenseDate)')); ->groupBy(DB::raw('"expenseDate"::date'));
$this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date); $this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date);
$dailyExpenses = $expenseQuery->get(); $dailyExpenses = $expenseQuery->get();
@@ -212,13 +212,13 @@ public function exportPdf()
// SALES // SALES
$dailySales = DB::table('sales') $dailySales = DB::table('sales')
->select( ->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(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) ->where('business_id', $businessId)
->when($branchId, fn ($q) => $q->where('branch_id', $branchId)) ->when($branchId, fn ($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(saleDate)')) ->groupBy(DB::raw('"saleDate"::date'))
->get(); ->get();
$sale_datas = $dailySales->map(fn ($sale) => (object)[ $sale_datas = $dailySales->map(fn ($sale) => (object)[
@@ -231,12 +231,12 @@ public function exportPdf()
// INCOME // INCOME
$dailyIncomes = DB::table('incomes') $dailyIncomes = DB::table('incomes')
->select( ->select(
DB::raw('DATE(incomeDate) as date'), DB::raw('"incomeDate"::date as date'),
DB::raw('SUM(amount) as total_incomes') DB::raw('SUM(amount) as total_incomes')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => $q->where('branch_id', $branchId)) ->when($branchId, fn ($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(incomeDate)')) ->groupBy(DB::raw('"incomeDate"::date'))
->get(); ->get();
$income_datas = $dailyIncomes->map(fn ($income) => (object)[ $income_datas = $dailyIncomes->map(fn ($income) => (object)[
@@ -274,12 +274,12 @@ public function exportPdf()
// EXPENSES // EXPENSES
$dailyExpenses = DB::table('expenses') $dailyExpenses = DB::table('expenses')
->select( ->select(
DB::raw('DATE(expenseDate) as date'), DB::raw('"expenseDate"::date as date'),
DB::raw('SUM(amount) as total_expenses_only') DB::raw('SUM(amount) as total_expenses_only')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => $q->where('branch_id', $branchId)) ->when($branchId, fn ($q) => $q->where('branch_id', $branchId))
->groupBy(DB::raw('DATE(expenseDate)')) ->groupBy(DB::raw('"expenseDate"::date'))
->get(); ->get();
$mergedExpenseData = collect(); $mergedExpenseData = collect();

14
Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryReportController.php
View File

@@ -25,15 +25,15 @@ public function index(Request $request)
$salesQuery = DB::table('sales') $salesQuery = DB::table('sales')
->select( ->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(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) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(saleDate)')); ->groupBy(DB::raw('"saleDate"::date'));
$this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date); $this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date);
$dailySales = $salesQuery->get(); $dailySales = $salesQuery->get();
@@ -47,14 +47,14 @@ public function index(Request $request)
$incomeQuery = DB::table('incomes') $incomeQuery = DB::table('incomes')
->select( ->select(
DB::raw('DATE(incomeDate) as date'), DB::raw('"incomeDate"::date as date'),
DB::raw('SUM(amount) as total_incomes') DB::raw('SUM(amount) as total_incomes')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(incomeDate)')); ->groupBy(DB::raw('"incomeDate"::date'));
$this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date); $this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date);
$dailyIncomes = $incomeQuery->get(); $dailyIncomes = $incomeQuery->get();
@@ -102,14 +102,14 @@ public function index(Request $request)
$expenseQuery = DB::table('expenses') $expenseQuery = DB::table('expenses')
->select( ->select(
DB::raw('DATE(expenseDate) as date'), DB::raw('"expenseDate"::date as date'),
DB::raw('SUM(amount) as total_expenses_only') DB::raw('SUM(amount) as total_expenses_only')
) )
->where('business_id', $businessId) ->where('business_id', $businessId)
->when($branchId, fn ($q) => ->when($branchId, fn ($q) =>
$q->where('branch_id', $branchId) $q->where('branch_id', $branchId)
) )
->groupBy(DB::raw('DATE(expenseDate)')); ->groupBy(DB::raw('"expenseDate"::date'));
$this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date); $this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date);
$dailyExpenses = $expenseQuery->get(); $dailyExpenses = $expenseQuery->get();

8
Modules/Business/App/Http/Controllers/AcnooProductLossProfitReportController.php
View File

@@ -45,8 +45,8 @@ public function index(Request $request)
->with('product:id,productName,productCode') ->with('product:id,productName,productCode')
->select( ->select(
'product_id', 'product_id',
DB::raw('SUM(CASE WHEN lossProfit > 0 THEN lossProfit ELSE 0 END) AS profit'), DB::raw('SUM(CASE WHEN "lossProfit" > 0 THEN "lossProfit" ELSE 0 END) AS profit'),
DB::raw('SUM(CASE WHEN lossProfit < 0 THEN lossProfit ELSE 0 END) AS loss') DB::raw('SUM(CASE WHEN "lossProfit" < 0 THEN "lossProfit" ELSE 0 END) AS loss')
) )
->groupBy('product_id') ->groupBy('product_id')
->paginate($request->per_page ?? 20) ->paginate($request->per_page ?? 20)
@@ -93,8 +93,8 @@ public function exportPdf()
}) })
->select( ->select(
'product_id', 'product_id',
DB::raw('SUM(CASE WHEN lossProfit > 0 THEN lossProfit ELSE 0 END) as profit'), DB::raw('SUM(CASE WHEN "lossProfit" > 0 THEN "lossProfit" ELSE 0 END) as profit'),
DB::raw('SUM(CASE WHEN lossProfit < 0 THEN lossProfit ELSE 0 END) as loss') DB::raw('SUM(CASE WHEN "lossProfit" < 0 THEN "lossProfit" ELSE 0 END) as loss')
) )
->groupBy('product_id') ->groupBy('product_id')
->get(); ->get();