diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php index 193dd37e..845ccc19 100644 --- a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php +++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php @@ -28,7 +28,7 @@ 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') ) @@ -36,7 +36,7 @@ public function index(Request $request) ->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') ) ->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();