From f2cd16a2a850700e0e194bade40bde281949ad25 Mon Sep 17 00:00:00 2001
From: eko54r <yantoseko@gmail.com>
Date: Thu, 23 Apr 2026 22:17:41 +0700
Subject: [PATCH] update querry report profit n lost

---
 .../App/Exports/ExportProductLossProfit.php   |  4 +--
 .../AcnooLossProfitHistoryController.php      | 28 +++++++++----------
 ...AcnooLossProfitHistoryReportController.php | 14 +++++-----
 ...AcnooProductLossProfitReportController.php |  8 +++---
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Modules/Business/App/Exports/ExportProductLossProfit.php b/Modules/Business/App/Exports/ExportProductLossProfit.php
index 6cfeebd4..acfb7a55 100644
--- a/Modules/Business/App/Exports/ExportProductLossProfit.php
+++ b/Modules/Business/App/Exports/ExportProductLossProfit.php
@@ -24,8 +24,8 @@ public function view(): View
             })
             ->select(
                 '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 loss')
+                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')
             )
             ->groupBy('product_id')
             ->get();
diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php
index 44b87f1a..845ccc19 100644
--- a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php
+++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php
@@ -28,15 +28,15 @@ public function index(Request $request)
 
         $salesQuery = 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'));
 
         $this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date);
         $dailySales = $salesQuery->get();
@@ -50,14 +50,14 @@ public function index(Request $request)
 
         $incomeQuery = 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'));
 
         $this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date);
         $dailyIncomes = $incomeQuery->get();
@@ -105,14 +105,14 @@ public function index(Request $request)
 
         $expenseQuery = 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'));
 
         $this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date);
         $dailyExpenses = $expenseQuery->get();
@@ -212,13 +212,13 @@ public function exportPdf()
         // 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)[
@@ -231,12 +231,12 @@ public function exportPdf()
         // 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)[
@@ -274,12 +274,12 @@ public function exportPdf()
         // 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();
diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryReportController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryReportController.php
index 7bf76eaa..84b56247 100644
--- a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryReportController.php
+++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryReportController.php
@@ -25,15 +25,15 @@ public function index(Request $request)
 
         $salesQuery = 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'));
 
         $this->applyDateFilter($salesQuery, $duration, 'saleDate', $request->from_date, $request->to_date);
         $dailySales = $salesQuery->get();
@@ -47,14 +47,14 @@ public function index(Request $request)
 
         $incomeQuery = 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'));
 
         $this->applyDateFilter($incomeQuery, $duration, 'incomeDate', $request->from_date, $request->to_date);
         $dailyIncomes = $incomeQuery->get();
@@ -102,14 +102,14 @@ public function index(Request $request)
 
         $expenseQuery = 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'));
 
         $this->applyDateFilter($expenseQuery, $duration, 'expenseDate', $request->from_date, $request->to_date);
         $dailyExpenses = $expenseQuery->get();
diff --git a/Modules/Business/App/Http/Controllers/AcnooProductLossProfitReportController.php b/Modules/Business/App/Http/Controllers/AcnooProductLossProfitReportController.php
index e50a0ac7..cef86071 100644
--- a/Modules/Business/App/Http/Controllers/AcnooProductLossProfitReportController.php
+++ b/Modules/Business/App/Http/Controllers/AcnooProductLossProfitReportController.php
@@ -45,8 +45,8 @@ public function index(Request $request)
             ->with('product:id,productName,productCode')
             ->select(
                 '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 loss')
+                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')
             )
             ->groupBy('product_id')
             ->paginate($request->per_page ?? 20)
@@ -93,8 +93,8 @@ public function exportPdf()
                 })
                 ->select(
                     '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 loss')
+                    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')
                 )
                 ->groupBy('product_id')
                 ->get();