diff --git a/Modules/Business/App/Exports/ExportLossProfitHistory.php b/Modules/Business/App/Exports/ExportLossProfitHistory.php index 49c6e660..480623f7 100644 --- a/Modules/Business/App/Exports/ExportLossProfitHistory.php +++ b/Modules/Business/App/Exports/ExportLossProfitHistory.php @@ -23,7 +23,7 @@ public function view(): View ->select( DB::raw('DATE(saleDate) 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)) 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/Exports/ExportProductSaleHistoryDetailReport.php b/Modules/Business/App/Exports/ExportProductSaleHistoryDetailReport.php index 4e30139e..1c77e0fe 100644 --- a/Modules/Business/App/Exports/ExportProductSaleHistoryDetailReport.php +++ b/Modules/Business/App/Exports/ExportProductSaleHistoryDetailReport.php @@ -23,7 +23,7 @@ public function view(): View $saleDetailsQuery = $product->saleDetails() ->with('sale:id,party_id,invoiceNumber,saleDate', 'sale.party:id,name') - ->select('id', 'sale_id', 'product_id', 'quantities', 'lossprofit', 'price', 'productPurchasePrice'); + ->select('id', 'sale_id', 'product_id', 'quantities', 'lossProfit', 'price', 'productPurchasePrice'); $saleDetails = $saleDetailsQuery->get(); diff --git a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php index 44b87f1a..193dd37e 100644 --- a/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php +++ b/Modules/Business/App/Http/Controllers/AcnooLossProfitHistoryController.php @@ -30,7 +30,7 @@ public function index(Request $request) ->select( DB::raw('DATE(saleDate) 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) => @@ -214,7 +214,7 @@ public function exportPdf() ->select( DB::raw('DATE(saleDate) 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)) 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(); diff --git a/Modules/Business/App/Http/Controllers/AcnooProductSaleHistoryReportController.php b/Modules/Business/App/Http/Controllers/AcnooProductSaleHistoryReportController.php index e741f8a2..22f66eff 100644 --- a/Modules/Business/App/Http/Controllers/AcnooProductSaleHistoryReportController.php +++ b/Modules/Business/App/Http/Controllers/AcnooProductSaleHistoryReportController.php @@ -72,7 +72,7 @@ public function show(Request $request, $id) $this->applyDateFilter($sale, $duration, 'saleDate', $request->from_date, $request->to_date); }) ->with('sale:id,party_id,invoiceNumber,saleDate', 'sale.party:id,name') - ->select('id', 'sale_id', 'product_id', 'quantities', 'lossprofit', 'price', 'productPurchasePrice'); + ->select('id', 'sale_id', 'product_id', 'quantities', 'lossProfit', 'price', 'productPurchasePrice'); $saleDetailsQuery->when(filled($request->search), function ($q) use ($request) { $search = $request->search; @@ -150,7 +150,7 @@ public function exportDetailPdf(Request $request, $id) $saleDetailsQuery = $product->saleDetails() ->with('sale:id,party_id,invoiceNumber,saleDate', 'sale.party:id,name') - ->select('id', 'sale_id', 'product_id', 'quantities', 'lossprofit', 'price', 'productPurchasePrice'); + ->select('id', 'sale_id', 'product_id', 'quantities', 'lossProfit', 'price', 'productPurchasePrice'); $saleDetails = $saleDetailsQuery->get(); diff --git a/Modules/Business/resources/views/product-sale-history-report/details-list.blade.php b/Modules/Business/resources/views/product-sale-history-report/details-list.blade.php index 60098cf0..e0331c33 100644 --- a/Modules/Business/resources/views/product-sale-history-report/details-list.blade.php +++ b/Modules/Business/resources/views/product-sale-history-report/details-list.blade.php @@ -28,8 +28,8 @@
@php - $profits = $saleDetails->where('lossprofit', '>', 0)->sum('lossprofit'); - $losses = $saleDetails->where('lossprofit', '<', 0)->sum('lossprofit'); + $profits = $saleDetails->where('lossProfit', '>', 0)->sum('lossProfit'); + $losses = $saleDetails->where('lossProfit', '<', 0)->sum('lossProfit'); $net_profit = $profits + $losses; @endphp @@ -43,10 +43,10 @@