From 0cb58d3419d0436a975d86ccc6a1ce70e9d1b665 Mon Sep 17 00:00:00 2001 From: eko54r Date: Wed, 6 May 2026 09:49:01 +0700 Subject: [PATCH] update error --- .../App/Exports/ExportLossProfitHistory.php | 18 +++++++++--------- .../AcnooLossProfitDetailReportController.php | 16 ++++++++-------- .../AcnooLossProfitHistoryController.php | 8 ++++---- .../Http/Controllers/AcnooStockController.php | 2 +- .../Controllers/AcnooStockReportController.php | 2 +- .../Controllers/AcnooWarehouseController.php | 2 +- .../Auth/RegisteredUserController.php | 4 ++++ 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Modules/Business/App/Exports/ExportLossProfitHistory.php b/Modules/Business/App/Exports/ExportLossProfitHistory.php index 49c6e660..b7f008ef 100644 --- a/Modules/Business/App/Exports/ExportLossProfitHistory.php +++ b/Modules/Business/App/Exports/ExportLossProfitHistory.php @@ -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(); diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitDetailReportController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitDetailReportController.php index 6fc5f3dc..2e185c43 100644 --- a/Modules/Business/App/Http/Controllers/AcnooLossProfitDetailReportController.php +++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitDetailReportController.php @@ -33,14 +33,14 @@ public function lossProfitDetails() $query->where('business_id', $businessId); }) ->whereDate('created_at', '<', $today) - ->sum(DB::raw('productPurchasePrice * productStock')); + ->sum(DB::raw('"productPurchasePrice" * "productStock"')); // Closing stock (up to today) from stocks table $closing_stock_by_purchase = Stock::whereHas('product', function ($query) use ($businessId) { $query->where('business_id', $businessId); }) ->whereDate('created_at', '<=', $today) - ->sum(DB::raw('productPurchasePrice * productStock')); + ->sum(DB::raw('"productPurchasePrice" * "productStock"')); $total_purchase_price = (clone $purchaseQuery)->sum('totalAmount'); $total_purchase_shipping_charge = (clone $purchaseQuery)->sum('shipping_charge'); @@ -59,13 +59,13 @@ public function lossProfitDetails() $query->where('business_id', $businessId); }) ->whereDate('created_at', '<', $today) - ->sum(DB::raw('productSalePrice * productStock')); + ->sum(DB::raw('"productSalePrice" * "productStock"')); $closing_stock_by_sale = Stock::whereHas('product', function ($query) use ($businessId) { $query->where('business_id', $businessId); }) ->whereDate('created_at', '<=', $today) - ->sum(DB::raw('productSalePrice * productStock')); + ->sum(DB::raw('"productSalePrice" * "productStock"')); $total_sale_price = (clone $salesQuery)->sum('totalAmount'); $total_sale_shipping_charge = (clone $salesQuery)->sum('shipping_charge'); @@ -135,14 +135,14 @@ public function lossProfitFilter(Request $request) $q->where('business_id', $businessId); }) ->whereDate('created_at', '<', $startDate) - ->sum(DB::raw('productPurchasePrice * productStock')); + ->sum(DB::raw('"productPurchasePrice" * "productStock"')); // Closing stock by purchase (up to end date) $closing_stock_by_purchase = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); }) ->whereDate('created_at', '<=', $endDate) - ->sum(DB::raw('productPurchasePrice * productStock')); + ->sum(DB::raw('"productPurchasePrice" * "productStock"')); $total_purchase_price = (clone $purchaseQuery)->sum('totalAmount'); $total_purchase_shipping_charge = (clone $purchaseQuery)->sum('shipping_charge'); @@ -159,14 +159,14 @@ public function lossProfitFilter(Request $request) $q->where('business_id', $businessId); }) ->whereDate('created_at', '<', $startDate) - ->sum(DB::raw('productSalePrice * productStock')); + ->sum(DB::raw('"productSalePrice" * "productStock"')); // Closing stock by sale $closing_stock_by_sale = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); }) ->whereDate('created_at', '<=', $endDate) - ->sum(DB::raw('productSalePrice * productStock')); + ->sum(DB::raw('"productSalePrice" * "productStock"')); $total_sale_price = (clone $salesQuery)->sum('totalAmount'); $total_sale_shipping_charge = (clone $salesQuery)->sum('shipping_charge'); diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php index 845ccc19..6449ae7f 100644 --- a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php +++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php @@ -90,14 +90,14 @@ public function index(Request $request) if (moduleCheck('HrmAddon')) { $payrollQuery = 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')); $this->applyDateFilter($payrollQuery, $duration, 'date', $request->from_date, $request->to_date); $dailyPayrolls = $payrollQuery->get(); @@ -262,12 +262,12 @@ public function exportPdf() 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(); } diff --git a/Modules/Business/App/Http/Controllers/AcnooStockController.php b/Modules/Business/App/Http/Controllers/AcnooStockController.php index 10712ca7..88fdf571 100644 --- a/Modules/Business/App/Http/Controllers/AcnooStockController.php +++ b/Modules/Business/App/Http/Controllers/AcnooStockController.php @@ -72,7 +72,7 @@ public function index() // Calculate totals for all stock $total_stock_value = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); - })->sum(DB::raw('productPurchasePrice * productStock')); + })->sum(DB::raw('"productPurchasePrice" * "productStock"')); $total_qty = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); diff --git a/Modules/Business/App/Http/Controllers/AcnooStockReportController.php b/Modules/Business/App/Http/Controllers/AcnooStockReportController.php index dfe8f542..d035bfd8 100644 --- a/Modules/Business/App/Http/Controllers/AcnooStockReportController.php +++ b/Modules/Business/App/Http/Controllers/AcnooStockReportController.php @@ -24,7 +24,7 @@ public function index(Request $request) $total_stock_value = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); - })->sum(DB::raw('productPurchasePrice * productStock')); + })->sum(DB::raw('"productPurchasePrice" * "productStock"')); $total_qty = Stock::whereHas('product', function ($q) use ($businessId) { $q->where('business_id', $businessId); diff --git a/Modules/WarehouseAddon/App/Http/Controllers/AcnooWarehouseController.php b/Modules/WarehouseAddon/App/Http/Controllers/AcnooWarehouseController.php index 8b1ad9b2..7af244fe 100644 --- a/Modules/WarehouseAddon/App/Http/Controllers/AcnooWarehouseController.php +++ b/Modules/WarehouseAddon/App/Http/Controllers/AcnooWarehouseController.php @@ -36,7 +36,7 @@ public function index(Request $request) $query->when(request()->has('branch_id'), function ($q) { $q->whereColumn('stocks.branch_id', 'warehouses.branch_id'); }); - }], DB::raw('productStock * productPurchasePrice')) + }], DB::raw('"productStock" * "productPurchasePrice"')) ->when($request->branch_id, function ($q) use ($request) { $q->where('branch_id', $request->branch_id); }) diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index a988b483..11a431eb 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -93,6 +93,10 @@ public function store(Request $request) ]); } catch (\Throwable $th) { DB::rollBack(); + \Log::error('Registration Error: ' . $th->getMessage(), [ + 'exception' => $th, + 'email' => $request->email + ]); return response()->json([ 'message' => 'Something went wrong. Please contact the admin.', ], 403);