diff --git a/app/Livewire/InvoiceDataTable.php b/app/Livewire/InvoiceDataTable.php index dd12ee7..048206f 100644 --- a/app/Livewire/InvoiceDataTable.php +++ b/app/Livewire/InvoiceDataTable.php @@ -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); }