Changed logic for in quality validation
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Gemini PR Review / Gemini PR Review (pull_request) Successful in 19s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 13s
Laravel Pint / pint (pull_request) Failing after 13m31s
Laravel Larastan / larastan (pull_request) Failing after 14m22s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Gemini PR Review / Gemini PR Review (pull_request) Successful in 19s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 13s
Laravel Pint / pint (pull_request) Failing after 13m31s
Laravel Larastan / larastan (pull_request) Failing after 14m22s
This commit is contained in:
@@ -1628,6 +1628,7 @@ class QualityValidationResource extends Resource
|
||||
// ])
|
||||
// ->hint(fn ($get) => $get('pack_slip_pump_error') ? $get('pack_slip_pump_error') : null)
|
||||
// ->hintColor('danger'),
|
||||
|
||||
Forms\Components\Group::make()
|
||||
->schema(function (callable $get) {
|
||||
|
||||
@@ -1654,14 +1655,6 @@ class QualityValidationResource extends Resource
|
||||
|
||||
if (strpos($state, '|') == false) {
|
||||
|
||||
if (! preg_match('/[|\-][Pp]/', $state)) {
|
||||
$set("pack_slip_pump_error_$i", 'Pack Slip Pump QR must contain |P, |p, -P, or -p.');
|
||||
$set("pack_slip_pump_qr_$i", null);
|
||||
return;
|
||||
}
|
||||
|
||||
$state = preg_replace('/-p$/i', '', $state);
|
||||
|
||||
if (strlen($state) < 9) {
|
||||
$set("pack_slip_pump_error_$i", 'Serial Number must be at least 9 digits.');
|
||||
return;
|
||||
@@ -1683,41 +1676,23 @@ class QualityValidationResource extends Resource
|
||||
return;
|
||||
}
|
||||
|
||||
if (! preg_match('/[|\-][Pp]/', $state)) {
|
||||
$set("pack_slip_pump_error_$i", 'Pack Slip Pump QR must contain |P, |p, -P, or -p.');
|
||||
$set("pack_slip_pump_qr_$i", null);
|
||||
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
|
||||
$set("pack_slip_pump_error_$i", 'Scan valid QR code.');
|
||||
return;
|
||||
}
|
||||
|
||||
// $parts = explode('|', $state);
|
||||
|
||||
$parts = preg_split('/[|-]/', $state, 2);
|
||||
$parts = explode('|', $state);
|
||||
|
||||
$itemCode = trim($parts[0]);
|
||||
|
||||
$serialNumber = trim($parts[1]);
|
||||
|
||||
|
||||
if (preg_match('/^[^|]+\|[^|]+\|[Pp]$/', $state)) {
|
||||
$parts = explode('|', $state, 2);
|
||||
|
||||
if (count($parts) == 2) {
|
||||
$itemCode = trim($parts[0]);
|
||||
$serialNumber = trim($parts[1]);
|
||||
|
||||
if ($itemCode != $get('item_id')) {
|
||||
$set("pack_slip_motor_error_$i", 'Item code does not match.');
|
||||
return;
|
||||
}
|
||||
$serialNumber = preg_replace('/[|-][Pp]$/', '', trim($serialNumber));
|
||||
}
|
||||
}
|
||||
else {
|
||||
$serialNumber = preg_replace('/[|-][Pp]$/', '', trim($state));
|
||||
}
|
||||
|
||||
$serialNumber = preg_replace('/\/[MmPpCc]$/', '', $serialNumber);
|
||||
|
||||
if ($itemCode != $get('item_id')) {
|
||||
$set("pack_slip_pump_error_$i", 'Item code does not match.');
|
||||
return;
|
||||
}
|
||||
|
||||
if ($visibleSerialNumber != $serialNumber) {
|
||||
$set("pack_slip_pump_error_$i", 'Serial number does not match.');
|
||||
@@ -2910,14 +2885,6 @@ class QualityValidationResource extends Resource
|
||||
|
||||
if (strpos($state, '|') == false) {
|
||||
|
||||
if (! preg_match('/[|\-][Tt]/', $state)) {
|
||||
$set("tube_sticker_pump_error_$i", 'Tube Sticker Pump QR must contain |T, |t, -T, or -t.');
|
||||
$set("tube_sticker_pump_qr_$i", null);
|
||||
return;
|
||||
}
|
||||
|
||||
$state = preg_replace('/-p$/i', '', $state);
|
||||
|
||||
if (strlen($state) < 9) {
|
||||
$set("tube_sticker_pump_error_$i", 'Serial Number must be at least 9 digits.');
|
||||
return;
|
||||
@@ -2939,10 +2906,10 @@ class QualityValidationResource extends Resource
|
||||
return;
|
||||
}
|
||||
|
||||
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
|
||||
// $set("tube_sticker_pump_error_$i", 'Scan valid QR code.');
|
||||
// return;
|
||||
// }
|
||||
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
|
||||
$set("tube_sticker_pump_error_$i", 'Scan valid QR code.');
|
||||
return;
|
||||
}
|
||||
|
||||
$parts = explode('|', $state);
|
||||
|
||||
@@ -2950,36 +2917,12 @@ class QualityValidationResource extends Resource
|
||||
|
||||
$serialNumber = trim($parts[1]);
|
||||
|
||||
if (! preg_match('/[|\-][Tt]/', $state)) {
|
||||
$set("tube_sticker_pump_error_$i", 'Tube Sticker Pump QR must contain |T, |t, -T, or -t.');
|
||||
$set("tube_sticker_pump_qr_$i", null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (preg_match('/^[^|]+\|[^|]+\|[Tt]$/', $state)) {
|
||||
$parts = explode('|', $state, 2);
|
||||
|
||||
if (count($parts) == 2) {
|
||||
$itemCode = trim($parts[0]);
|
||||
$serialNumber = trim($parts[1]);
|
||||
|
||||
if ($itemCode != $get('item_id')) {
|
||||
$set("tube_sticker_pump_error_$i", 'Item code does not match.');
|
||||
return;
|
||||
}
|
||||
$serialNumber = preg_replace('/[|-][Tt]$/', '', trim($serialNumber));
|
||||
}
|
||||
}
|
||||
else {
|
||||
$serialNumber = preg_replace('/[|-][Tt]$/', '', trim($state));
|
||||
}
|
||||
|
||||
$serialNumber = preg_replace('/\/[MmPpCc]$/', '', $serialNumber);
|
||||
|
||||
// if ($itemCode != $get('item_id')) {
|
||||
// $set("tube_sticker_pump_error_$i", 'Item code does not match.');
|
||||
// return;
|
||||
// }
|
||||
if ($itemCode != $get('item_id')) {
|
||||
$set("tube_sticker_pump_error_$i", 'Item code does not match.');
|
||||
return;
|
||||
}
|
||||
|
||||
if ($visibleSerialNumber != $serialNumber) {
|
||||
$set("tube_sticker_pump_error_$i", 'Serial number does not match.');
|
||||
|
||||
Reference in New Issue
Block a user