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

update querry
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 4m25s
Details
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 15s
Details
Build, Push and Deploy / deploy-staging (push) Successful in 45s
Details
Build, Push and Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
eko54r
2026-04-23 21:37:41 +07:00
parent 90ceb2ec19
commit 6868533af2
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Business/App/Exports/ExportLossProfitHistory.php
View File

@@ -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))

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

@@ -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();

2
Modules/Business/App/Exports/ExportProductSaleHistoryDetailReport.php
View File

@@ -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();

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

@@ -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))

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

@@ -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();

4
Modules/Business/App/Http/Controllers/AcnooProductSaleHistoryReportController.php
View File

@@ -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();

12
Modules/Business/resources/views/product-sale-history-report/details-list.blade.php
View File

@@ -28,8 +28,8 @@
</thead>
<tbody>
@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 @@
<td>{{ $saleDetail->quantities }}</td>
<td>{{ currency_format($saleDetail->productPurchasePrice, currency: business_currency()) }}</td>
<td>{{ currency_format($saleDetail->price, currency: business_currency()) }}</td>
@if ($saleDetail->lossprofit >= 0)
<td class="text-success">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossprofit < 0)
<td class="expense-ammount">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@if ($saleDetail->lossProfit >= 0)
<td class="text-success">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossProfit < 0)
<td class="expense-ammount">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@endif
</tr>
@endforeach

12
Modules/Business/resources/views/product-sale-history-report/excel-csv-detail.blade.php
View File

@@ -13,8 +13,8 @@
</thead>
<tbody>
@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
@@ -28,10 +28,10 @@
<td>{{ $saleDetail->quantities }}</td>
<td>{{ currency_format($saleDetail->productPurchasePrice, currency: business_currency()) }}</td>
<td>{{ currency_format($saleDetail->price, currency: business_currency()) }}</td>
@if ($saleDetail->lossprofit >= 0)
<td class="text-success">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossprofit < 0)
<td class="expense-ammount">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@if ($saleDetail->lossProfit >= 0)
<td class="text-success">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossProfit < 0)
<td class="expense-ammount">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@endif
</tr>
@endforeach

12
Modules/Business/resources/views/product-sale-history-report/pdf-detail.blade.php
View File

@@ -25,8 +25,8 @@
</thead>
<tbody>
@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
@@ -50,10 +50,10 @@
<td style="border:1px solid gainsboro; text-align:center;">
{{ currency_format($saleDetail->price, currency: business_currency()) }}
</td>
@if ($saleDetail->lossprofit >= 0)
<td style="border:1px solid gainsboro; text-align:center; color: green;">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossprofit < 0)
<td style="border:1px solid gainsboro; text-align:center; color: red;">{{ currency_format($saleDetail->lossprofit, currency: business_currency()) }}</td>
@if ($saleDetail->lossProfit >= 0)
<td style="border:1px solid gainsboro; text-align:center; color: green;">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@elseif ($saleDetail->lossProfit < 0)
<td style="border:1px solid gainsboro; text-align:center; color: red;">{{ currency_format($saleDetail->lossProfit, currency: business_currency()) }}</td>
@endif
</tr>
@endforeach