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

update error
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 4m50s
Details
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 16s
Details
Build, Push and Deploy / deploy-staging (push) Successful in 41s
Details
Build, Push and Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
eko54r
2026-05-06 09:49:01 +07:00
parent 28510f1163
commit 0cb58d3419
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
Modules/Business/App/Http/Controllers/AcnooLossProfitDetailReportController.php
View File

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

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

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

2
Modules/Business/App/Http/Controllers/AcnooStockController.php
View File

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

2
Modules/Business/App/Http/Controllers/AcnooStockReportController.php
View File

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