Merge pull request 'changed logic in invoice data table' (#1311) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 13s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 13s
Reviewed-on: #1311
This commit was merged in pull request #1311.
This commit is contained in:
@@ -850,20 +850,6 @@ class InvoiceDataTable extends Component
|
|||||||
|
|
||||||
if($categoryExist?->category == 'Panel Box'){
|
if($categoryExist?->category == 'Panel Box'){
|
||||||
|
|
||||||
$panelExist = PanelBoxValidation::where('plant_id', $this->plantId)->where('panel_box_serial_number', $serialNumber)->where('panel_box_code', $itemCode)->where('panel_box_supplier', $supplier)->first();
|
|
||||||
|
|
||||||
if(!$panelExist){
|
|
||||||
Notification::make()
|
|
||||||
->title('Panel Not Verified')
|
|
||||||
->body("Panel Quality Inspection failed.<br>Panel Box Code: $itemCode, Item Code: {$this->currentItemCode}, Serial Number: $serialNumber.</br>")
|
|
||||||
->danger()
|
|
||||||
->seconds(2)
|
|
||||||
->send();
|
|
||||||
$this->capacitorInput = '';
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$panelExistsInvoice = InvoiceValidation::where('plant_id', $this->plantId)
|
$panelExistsInvoice = InvoiceValidation::where('plant_id', $this->plantId)
|
||||||
->where('panel_box_serial_number', $serialNumber)
|
->where('panel_box_serial_number', $serialNumber)
|
||||||
// ->where('panel_box_code', $itemCode)
|
// ->where('panel_box_code', $itemCode)
|
||||||
@@ -882,6 +868,20 @@ class InvoiceDataTable extends Component
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$panelExist = PanelBoxValidation::where('plant_id', $this->plantId)->where('panel_box_serial_number', $serialNumber)->where('panel_box_code', $itemCode)->where('panel_box_supplier', $supplier)->first();
|
||||||
|
|
||||||
|
if(!$panelExist){
|
||||||
|
Notification::make()
|
||||||
|
->title('Panel Not Verified')
|
||||||
|
->body("Panel Quality Inspection failed.<br>Panel Box Code: $itemCode, Item Code: {$this->currentItemCode}, Serial Number: $serialNumber.</br>")
|
||||||
|
->danger()
|
||||||
|
->seconds(2)
|
||||||
|
->send();
|
||||||
|
$this->capacitorInput = '';
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->package = InvoiceValidation::with('stickerMasterRelation')
|
$this->package = InvoiceValidation::with('stickerMasterRelation')
|
||||||
|
|||||||
Reference in New Issue
Block a user