update marketing
All checks were successful
All checks were successful
This commit is contained in:
@@ -35,82 +35,52 @@ public function index(Request $request)
|
||||
->with('purchases_dues')
|
||||
->latest();
|
||||
|
||||
// Branch-aware due filter
|
||||
if ($activeBranch) {
|
||||
$query->whereHas('purchases_dues', function ($q) use ($activeBranch) {
|
||||
$q->where('branch_id', $activeBranch->id)
|
||||
->where('dueAmount', '>', 0);
|
||||
});
|
||||
} else {
|
||||
$query->where('due', '>', 0);
|
||||
}
|
||||
$parties = $query
|
||||
->paginate($request->per_page ?? 20)
|
||||
->appends($request->query());
|
||||
|
||||
$parties = $query->paginate($request->per_page ?? 20);
|
||||
|
||||
// Replace $supplier->due with branch-specific due if active branch exists
|
||||
if ($activeBranch) {
|
||||
$parties->setCollection(
|
||||
$parties->getCollection()
|
||||
->transform(function ($supplier) use ($activeBranch) {
|
||||
$supplier->due = $supplier->purchases_dues
|
||||
$party_due = $supplier->purchases_dues
|
||||
->where('branch_id', $activeBranch->id)
|
||||
->sum('dueAmount');
|
||||
|
||||
if ($supplier->branch_id === $activeBranch->id) {
|
||||
$openingBalanceDue = $supplier->opening_balance_type === 'due'
|
||||
? ($supplier->opening_balance ?? 0)
|
||||
: 0;
|
||||
|
||||
$supplier->due = $openingBalanceDue + $party_due;
|
||||
} else {
|
||||
$supplier->due = $party_due;
|
||||
}
|
||||
|
||||
return $supplier;
|
||||
})
|
||||
->filter(fn($supplier) => $supplier->due > 0)
|
||||
->values()
|
||||
);
|
||||
} else {
|
||||
$parties->setCollection(
|
||||
$parties->getCollection()
|
||||
->filter(fn($supplier) => ($supplier->due ?? 0) > 0)
|
||||
->values()
|
||||
);
|
||||
}
|
||||
|
||||
// Calculate total_due
|
||||
$total_due = $parties->sum(function ($supplier) {
|
||||
return $supplier->due;
|
||||
});
|
||||
$supplier_total_due = $parties->getCollection()->sum('due');
|
||||
|
||||
if ($request->ajax()) {
|
||||
|
||||
return response()->json([
|
||||
'data' => view('business::reports.supplier-due.datas', compact('parties', 'total_due'))->render()
|
||||
'data' => view('business::reports.supplier-due.datas', compact('parties'))->render(),
|
||||
'supplier_total_due' => currency_format($supplier_total_due, currency: business_currency())
|
||||
]);
|
||||
}
|
||||
|
||||
if ($activeBranch) {
|
||||
// Filter parties that have branch-specific due > 0
|
||||
$query->whereHas('purchases_dues', function ($q) use ($activeBranch) {
|
||||
$q->where('branch_id', $activeBranch->id)
|
||||
->where('dueAmount', '>', 0);
|
||||
});
|
||||
} else {
|
||||
$query->where('due', '>', 0);
|
||||
}
|
||||
|
||||
$parties = $query->paginate(20)->appends($request->query());
|
||||
|
||||
// Calculate total due
|
||||
$total_due = $parties->sum(function ($supplier) use ($activeBranch) {
|
||||
if ($activeBranch) {
|
||||
return $supplier->purchases_dues
|
||||
->where('branch_id', $activeBranch->id)
|
||||
->sum('dueAmount');
|
||||
}
|
||||
return $supplier->due;
|
||||
});
|
||||
|
||||
// Replace $supplier->due with branch-specific due if active branch exists
|
||||
if ($activeBranch) {
|
||||
$parties->setCollection(
|
||||
$parties->getCollection()
|
||||
->transform(function ($supplier) use ($activeBranch) {
|
||||
$supplier->due = $supplier->purchases_dues
|
||||
->where('branch_id', $activeBranch->id)
|
||||
->sum('dueAmount');
|
||||
return $supplier;
|
||||
})
|
||||
->filter(fn($supplier) => $supplier->due > 0)
|
||||
->values()
|
||||
);
|
||||
}
|
||||
|
||||
return view('business::reports.supplier-due.due-reports', compact('parties', 'total_due'));
|
||||
return view('business::reports.supplier-due.due-reports', compact('parties', 'supplier_total_due'));
|
||||
}
|
||||
|
||||
public function exportExcel()
|
||||
@@ -123,7 +93,7 @@ public function exportCsv()
|
||||
return Excel::download(new ExportSupplierDue, 'supplier-due.csv');
|
||||
}
|
||||
|
||||
public function exportPdf()
|
||||
public function exportPdf(Request $request)
|
||||
{
|
||||
$user = auth()->user();
|
||||
$businessId = $user->business_id;
|
||||
@@ -131,29 +101,48 @@ public function exportPdf()
|
||||
|
||||
$query = Party::where('business_id', $businessId)
|
||||
->where('type', 'Supplier')
|
||||
->when($request->search, function ($q) use ($request) {
|
||||
$q->where(function ($q2) use ($request) {
|
||||
$q2->where('type', 'like', '%' . $request->search . '%')
|
||||
->orWhere('name', 'like', '%' . $request->search . '%')
|
||||
->orWhere('phone', 'like', '%' . $request->search . '%')
|
||||
->orWhere('credit_limit', 'like', '%' . $request->search . '%');
|
||||
});
|
||||
})
|
||||
->with('purchases_dues')
|
||||
->latest();
|
||||
|
||||
if ($activeBranch) {
|
||||
$query->whereHas('purchases_dues', function ($q) use ($activeBranch) {
|
||||
$q->where('branch_id', $activeBranch->id)
|
||||
->where('dueAmount', '>', 0);
|
||||
});
|
||||
} else {
|
||||
$query->where('due', '>', 0);
|
||||
}
|
||||
|
||||
$parties = $query->get();
|
||||
|
||||
if ($activeBranch) {
|
||||
$parties->transform(function ($supplier) use ($activeBranch) {
|
||||
$supplier->due = $supplier->purchases_dues
|
||||
->where('branch_id', $activeBranch->id)
|
||||
->sum('dueAmount');
|
||||
return $supplier;
|
||||
})->filter(fn($supplier) => $supplier->due > 0);
|
||||
$parties = $parties
|
||||
->transform(function ($supplier) use ($activeBranch) {
|
||||
$party_due = $supplier->purchases_dues
|
||||
->where('branch_id', $activeBranch->id)
|
||||
->sum('dueAmount');
|
||||
|
||||
if ($supplier->branch_id === $activeBranch->id) {
|
||||
$openingBalanceDue = $supplier->opening_balance_type === 'due'
|
||||
? ($supplier->opening_balance ?? 0)
|
||||
: 0;
|
||||
|
||||
$supplier->due = $openingBalanceDue + $party_due;
|
||||
} else {
|
||||
$supplier->due = $party_due;
|
||||
}
|
||||
|
||||
return $supplier;
|
||||
})
|
||||
->filter(fn($supplier) => $supplier->due > 0)
|
||||
->take($request->per_page ?? 20)
|
||||
->values();
|
||||
} else {
|
||||
$parties = $parties
|
||||
->filter(fn($supplier) => ($supplier->due ?? 0) > 0)
|
||||
->take($request->per_page ?? 20)
|
||||
->values();
|
||||
}
|
||||
|
||||
return PdfService::render('business::reports.supplier-due.pdf', compact('parties'),'supplier-due-report.pdf');
|
||||
return PdfService::render('business::reports.supplier-due.pdf', compact('parties'), 'supplier-due-report.pdf');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user