diff --git a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php index cfc84e3..13a4139 100644 --- a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php +++ b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php @@ -2455,7 +2455,7 @@ class CreateInvoiceValidation extends CreateRecord $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); } - $pattern0 = '/^(?[^|]+)\|(?[^|]+)\|(?[^|]+)\|(?[0-9]+(?:\.[0-9]+)?)kg$/i'; + $pattern0 = '/^(?[^|]+)\|(?[^|]+)\|(?[^|]+)\|(?[0-9]+(?:\.[0-9]+)?)\s?kg$/i'; $pattern1 = '/^(?[^|]+)\|(?[^|]+)\|(?[^|]+)\|(?[^|]+)\/(?.+)$/i'; $pattern2 = '/^(?[^|]+)\|(?[^|]+)\|(?[^|]+)\|(?.+)$/i'; $pattern3 = '/^(?[^|]+)\|(?[^|]+)-(?.+)$/i'; @@ -2470,7 +2470,7 @@ class CreateInvoiceValidation extends CreateRecord if (preg_match($pattern0, $serNo, $matches)) { $itemCode = $matches['item_code']; $this->currentItemCode = $itemCode; - $curScanQty = $matches['batch_quantity']; + $curScanQty = trim($matches['batch_quantity']); $serialNumber = $matches['batch_id'].'-'.$matches['batch_count']; $serNo = null;