Merge pull request 'Refactor invoice record query to include scanned status filter and adjust pagination' (#286) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

Reviewed-on: #286
This commit was merged in pull request #286.
This commit is contained in:
2026-01-30 12:09:25 +00:00

View File

@@ -474,11 +474,18 @@ class InvoiceDataTable extends Component
public function getInvoiceRecordsProperty()
{
return InvoiceValidation::with('stickerMasterRelation.item')
->when($this->hasSearched, function ($query) {
$query->where('invoice_number', $this->invoiceNumber)
->where('plant_id', $this->plantId);
->where('invoice_number', $this->invoiceNumber)
->where('plant_id', $this->plantId)
->where(function ($query) {
$query->whereNull('scanned_status')
->orWhere('scanned_status', '');
})
->paginate(7);
// ->when($this->hasSearched, function ($query) {
// $query->where('invoice_number', $this->invoiceNumber)
// ->where('plant_id', $this->plantId)
// ->where('scanned_status', '=', '');
// })
->paginate(6);
}