poc/pds
1
0
Fork 1
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Updated QR validation functionality to allow with and without item code

Browse Source
This commit is contained in:
dhanabalan
2025-07-31 12:26:16 +05:30
parent 216b62f8bf
commit 7bf2e8182b
1 changed files with 576 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

574
app/Filament/Resources/QualityValidationResource.php
View File

@@ -32,8 +32,7 @@ use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Tables\Filters\Filter;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Validation\ValidationException;
use Notification;
class QualityValidationResource extends Resource
{
@@ -218,27 +217,27 @@ class QualityValidationResource extends Resource
}
// Proceed with validation logic for new scanned QR code
if (!$state || trim($state) === '') {
if (!$state || trim($state) == '') {
$set('validationError', null);
return;
}
// // Check if QR format contains '|'
if (strpos($state, '|') === false) {
if (strpos($state, '|') == false) {
$set('validationError', 'Scan valid QR code. (Ex: Item_Code|Serial_Number)');
return;
}
if (!preg_match('/^[a-zA-Z0-9]{6,}+\|[1-9][a-zA-Z0-9]{8,}+(\|)?$/', $state)) {
if (strpos($state, '|') === false) {
$set('validationError', 'Scan valid QR code. (Ex: Item_Code|Serial_Number )');
$set('item_id', null);
$set('item_description', null);
$set('serial_number', null);
return;
}
else
{
// if (strpos($state, '|') == false) {
// $set('validationError', 'Scan valid QR code. (Ex: Item_Code|Serial_Number)');
// $set('item_id', null);
// $set('item_description', null);
// $set('serial_number', null);
// return;
// }
// else
// {
$splits = explode('|', $state);
$iCode = trim($splits[0]);
$sNumber = isset($splits[1]) ? trim($splits[1]) : null;
@@ -259,7 +258,7 @@ class QualityValidationResource extends Resource
$set('validationError', 'Serial Number must be at least 9 digits.');
return;
}
}
// }
}
else
@@ -287,7 +286,7 @@ class QualityValidationResource extends Resource
$set('item_id', null);
return;
}
else if ($serialNumber === '') {
else if ($serialNumber == '') {
$set('validationError', 'Waiting for full QR scan...');
return;
}
@@ -356,7 +355,7 @@ class QualityValidationResource extends Resource
$userInput = $get($field);
$expectedValue = $stickerMaster->$field;
if ($userInput !== null && $userInput !== $expectedValue) {
if ($userInput != null && $userInput != $expectedValue) {
$set('validationError', "Invalid input for $field. Expected: $expectedValue");
return; // Stop execution if any validation fails
}
@@ -398,7 +397,7 @@ class QualityValidationResource extends Resource
// $visiblePartValidations = [];
// foreach ($partValidationColumns as $column) {
// if ($stickerMaster->$column !== null) {
// if ($stickerMaster->$column != null) {
// $visiblePartValidations[] = $column;
// }
// }
@@ -410,7 +409,7 @@ class QualityValidationResource extends Resource
$colFld = substr($colFld, 0, -3);
}
if ($stickerMaster->$colFld !== null) {
if ($stickerMaster->$colFld != null) {
$set($column . '_visible', true);
} else {
$set($column . '_visible', false);
@@ -418,7 +417,7 @@ class QualityValidationResource extends Resource
}
foreach ($partValidationColumns as $column) {
if ($stickerMaster->$column !== null) {
if ($stickerMaster->$column != null) {
$set($column . '_visible', true);
} else {
$set($column . '_visible', false);
@@ -479,14 +478,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('serial_number_pump_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('serial_number_pump_error', 'Serial number does not match.');
$set('serial_number_pump_qr', null);
return;
}
else
else {
$set('serial_number_pump_error', null);
$set('serial_number_pump_qr', $serialNumber);
$set('serial_number_pump', '1');
return;
}
}
if (strlen($state) < 9) {
$set('serial_number_pump_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('serial_number_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -508,7 +530,6 @@ class QualityValidationResource extends Resource
$set('serial_number_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('serial_number_pump_error', 'Scan valid QR code.');
return;
@@ -536,7 +557,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode)
if ($itemCode != $expectedItemCode)
{
$set('serial_number_pump_error', 'Item code does not match.');
return;
@@ -548,7 +569,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('serial_number_pump_error', null);
return;
}
@@ -579,105 +600,6 @@ class QualityValidationResource extends Resource
->readOnly(fn (callable $get) => !$get('id'))
->hidden(fn (callable $get) => !$get('serial_number_pumpset_qr_visible'))
->default(''),
// ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
// $set('serial_number_pumpset_error', null);
// if (empty($state)) {
// $set('serial_number_pumpset_error', null);
// return;
// }
// // if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
// if (strpos($state, '|') === false) {
// $set('serial_number_pumpset_error', 'Scan valid QR code.');
// return;
// }
// else
// {
// $splits = explode('|', $state);
// $iCode = trim($splits[0]);
// $sNumber = isset($splits[1]) ? trim($splits[1]) : null;
// if (!ctype_alnum($iCode)) {
// $set('serial_number_pumpset_error', 'Item code must contain alpha-numeric values.');
// return;
// }
// else if (strlen($iCode) < 6) {
// $set('serial_number_pumpset_error', 'Item code must be at least 6 digits.');
// return;
// }
// else if (strlen($sNumber) < 9) {
// $set('serial_number_pumpset_error', 'Serial Number must be at least 9 digits.');
// return;
// }
// else if (!ctype_alnum($sNumber)) {
// $set('serial_number_pumpset_error', 'Serial Number must contain alpha-numeric values.');
// return;
// }
// }
// $set('serial_number_pumpset_error', 'Scan valid QR code.');
// return;
// }
// else
// {
// $set('serial_number_pumpset_error', null);
// }
// // Split state by pipeline "|"
// $parts = explode('|', $state);
// $itemCode = trim($parts[0]);
// $serialNumber = trim($parts[1]);
// $serialNumber = preg_replace('/\/[MmPpCc]$/', '', $serialNumber); // Remove
// // Retrieve visible serial numbers
// // $visibleSerialNumbers = array_filter([
// // $get('serial_number_motor_qr_visible') ? trim((string) $get('serial_number_motor')) : null,
// // $get('serial_number_pump_qr_visible') ? trim((string) $get('serial_number_pump')) : null,
// // $get('serial_number_pumpset_qr_visible') ? trim((string) $get('serial_number_pumpset')) : null,
// // ]);
// $visibleSerialNumber = $get('serial_number');
// $expectedItemCode = trim((string) $get('item_id'));
// if ($itemCode !== $expectedItemCode)
// {
// $set('serial_number_pumpset_error', 'Item code does not match.');
// return;
// }
// $set('serial_number_pumpset_qr', $serialNumber);
// $set('serial_number_pumpset', '1');
// // $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
// $isMatch = ($visibleSerialNumber == $serialNumber);
// if (!$serialNumber || trim($serialNumber) === '') {
// $set('serial_number_pumpset_error', null);
// return;
// }
// if (!$isMatch)
// {
// $set('serial_number_pumpset_error', 'Serial number does not match.');
// return;
// }
// else {
// $set('serial_number_pumpset_error', null);
// $set('serial_number_pumpset_qr', $serialNumber);
// $set('serial_number_pumpset', '1');
// }
// })
// ->extraAttributes(fn ($get) => [
// 'class' => $get('serial_number_pumpset_error') ? 'border-red-500' : '',
// ])
// ->hint(fn ($get) => $get('serial_number_pumpset_error') ? $get('serial_number_pumpset_error') : null)
// ->hintColor('danger'),
Forms\Components\Hidden::make('pack_slip_motor'),
@@ -696,14 +618,37 @@ class QualityValidationResource extends Resource
return;
}
//if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('pack_slip_motor_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('pack_slip_motor_error', 'Serial number does not match.');
$set('pack_slip_motor_qr', null);
return;
}
else
else {
$set('pack_slip_motor_error', null);
$set('pack_slip_motor_qr', $serialNumber);
$set('pack_slip_motor', '1');
return;
}
}
if (strlen($state) < 9) {
$set('pack_slip_motor_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('pack_slip_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -725,7 +670,6 @@ class QualityValidationResource extends Resource
$set('pack_slip_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('pack_slip_motor_error', 'Scan valid QR code');
return;
@@ -753,7 +697,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('pack_slip_motor_error', 'Item code does not match.');
return;
}
@@ -766,7 +710,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('pack_slip_motor_error', null);
return;
}
@@ -807,14 +751,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('pack_slip_pump_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('pack_slip_pump_error', 'Serial number does not match.');
$set('pack_slip_pump_qr', null);
return;
}
else
else {
$set('pack_slip_pump_error', null);
$set('pack_slip_pump_qr', $serialNumber);
$set('pack_slip_pump', '1');
return;
}
}
if (strlen($state) < 9) {
$set('pack_slip_pump_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('pack_slip_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -836,7 +803,6 @@ class QualityValidationResource extends Resource
$set('pack_slip_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('pack_slip_pump_error', 'Scan valid QR code.');
return;
@@ -863,7 +829,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('pack_slip_pump_error', 'Item code does not match.');
return;
}
@@ -874,7 +840,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('pack_slip_pump_error', null);
return;
}
@@ -914,14 +880,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('pack_slip_pumpset_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('pack_slip_pumpset_error', 'Serial number does not match.');
$set('pack_slip_pumpset_qr', null);
return;
}
else
else {
$set('pack_slip_pumpset_error', null);
$set('pack_slip_pumpset_qr', $serialNumber);
$set('pack_slip_pumpset', '1');
return;
}
}
if (strlen($state) < 9) {
$set('pack_slip_pumpset_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('pack_slip_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -943,7 +932,6 @@ class QualityValidationResource extends Resource
$set('pack_slip_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('pack_slip_pumpset_error', 'Scan valid QR code.');
return;
@@ -971,7 +959,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('pack_slip_pumpset_error', 'Item code does not match.');
return;
}
@@ -982,7 +970,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('pack_slip_pumpset_error', null);
return;
}
@@ -1023,14 +1011,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('name_plate_motor_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('name_plate_motor_error', 'Serial number does not match.');
$set('name_plate_motor_qr', null);
return;
}
else
else {
$set('name_plate_motor_error', null);
$set('name_plate_motor_qr', $serialNumber);
$set('name_plate_motor', '1');
return;
}
}
if (strlen($state) < 9) {
$set('name_plate_motor_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('name_plate_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1052,7 +1063,6 @@ class QualityValidationResource extends Resource
$set('name_plate_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('name_plate_motor_error', 'Scan valid QR code.');
return;
@@ -1079,7 +1089,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('name_plate_motor_error', 'Item code does not match.');
return;
}
@@ -1089,7 +1099,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('name_plate_motor_error', null);
return;
}
@@ -1130,14 +1140,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('name_plate_pump_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('name_plate_pump_error', 'Serial number does not match.');
$set('name_plate_pump_qr', null);
return;
}
else
else {
$set('name_plate_pump_error', null);
$set('name_plate_pump_qr', $serialNumber);
$set('name_plate_pump', '1');
return;
}
}
if (strlen($state) < 9) {
$set('name_plate_pump_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('name_plate_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1159,7 +1192,6 @@ class QualityValidationResource extends Resource
$set('name_plate_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('name_plate_pump_error', 'Scan valid QR code.');
return;
@@ -1186,7 +1218,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('name_plate_pump_error', 'Item code does not match.');
return;
}
@@ -1196,7 +1228,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('name_plate_pump_error', null);
return;
}
@@ -1237,14 +1269,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('name_plate_pumpset_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('name_plate_pumpset_error', 'Serial number does not match.');
$set('name_plate_pumpset_qr', null);
return;
}
else
else {
$set('name_plate_pumpset_error', null);
$set('name_plate_pumpset_qr', $serialNumber);
$set('name_plate_pumpset', '1');
return;
}
}
if (strlen($state) < 9) {
$set('name_plate_pumpset_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('name_plate_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1266,7 +1321,6 @@ class QualityValidationResource extends Resource
$set('name_plate_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('name_plate_pumpset_error', 'Scan valid QR code.');
return;
@@ -1293,7 +1347,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('name_plate_pumpset_error', 'Item code does not match.');
return;
}
@@ -1303,7 +1357,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('name_plate_pumpset_error', null);
return;
}
@@ -1345,14 +1399,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('tube_sticker_motor_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('tube_sticker_motor_error', 'Serial number does not match.');
$set('tube_sticker_motor_qr', null);
return;
}
else
else {
$set('tube_sticker_motor_error', null);
$set('tube_sticker_motor_qr', $serialNumber);
$set('tube_sticker_motor', '1');
return;
}
}
if (strlen($state) < 9) {
$set('tube_sticker_motor_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('tube_sticker_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1374,7 +1451,6 @@ class QualityValidationResource extends Resource
$set('tube_sticker_motor_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('tube_sticker_motor_error', 'Scan valid QR code.');
return;
@@ -1401,7 +1477,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('tube_sticker_motor_error', 'Item code does not match.');
return;
}
@@ -1411,7 +1487,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('tube_sticker_motor_error', null);
return;
}
@@ -1452,14 +1528,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('tube_sticker_pump_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('tube_sticker_pump_error', 'Serial number does not match.');
$set('tube_sticker_pump_qr', null);
return;
}
else
else {
$set('tube_sticker_pump_error', null);
$set('tube_sticker_pump_qr', $serialNumber);
$set('tube_sticker_pump', '1');
return;
}
}
if (strlen($state) < 9) {
$set('tube_sticker_pump_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('tube_sticker_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1481,7 +1580,6 @@ class QualityValidationResource extends Resource
$set('tube_sticker_pump_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('tube_sticker_pump_error', 'Scan valid QR code.');
return;
@@ -1508,7 +1606,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('tube_sticker_pump_error', 'Item code does not match.');
return;
}
@@ -1518,7 +1616,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('tube_sticker_pump_error', null);
return;
}
@@ -1559,12 +1657,37 @@ class QualityValidationResource extends Resource
return;
}
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') === false) {
$set('tube_sticker_pumpset_error', 'Scan valid QR code.');
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if ($visibleSerialNumber != $serialNumber)
{
$set('tube_sticker_pumpset_error', 'Serial number does not match.');
$set('tube_sticker_pumpset_qr', null);
return;
}
else
else {
$set('tube_sticker_pumpset_error', null);
$set('tube_sticker_pumpset_qr', $serialNumber);
$set('tube_sticker_pumpset', '1');
return;
}
}
if (strlen($state) < 9) {
$set('tube_sticker_pumpset_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('tube_sticker_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1586,7 +1709,6 @@ class QualityValidationResource extends Resource
$set('tube_sticker_pumpset_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('tube_sticker_pumpset_error', 'Scan valid QR code.');
return;
@@ -1615,7 +1737,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('tube_sticker_pumpset_error', 'Item code does not match.');
return;
}
@@ -1625,7 +1747,7 @@ class QualityValidationResource extends Resource
// $isMatch = in_array($serialNumber, $visibleSerialNumbers, true);
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('tube_sticker_pumpset_error', null);
return;
}
@@ -1666,14 +1788,37 @@ class QualityValidationResource extends Resource
return;
}
// if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[MmPpCc]\|?$/', $state)) {
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state)) {
if (strpos($state, '|') == false)
{
if (preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $state))
{
$visibleSerialNumber = $get('serial_number');
$serialNumber = $state;
if (strpos($state, '|') === false) {
$set('warranty_card_error', 'Scan valid QR code.');
if ($visibleSerialNumber != $serialNumber)
{
$set('warranty_card_error', 'Serial number does not match.');
$set('warranty_card_qr', null);
return;
}
else
else {
$set('warranty_card_error', null);
$set('warranty_card_qr', $serialNumber);
$set('warranty_card', '1');
return;
}
}
if (strlen($state) < 9) {
$set('warranty_card_error', 'Serial Number must be at least 9 digits.');
return;
}
else if (!ctype_alnum($state)) {
$set('warranty_card_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
else if (strpos($state, '|') == true && !preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $state))
{
$splits = explode('|', $state);
$iCode = trim($splits[0]);
@@ -1695,7 +1840,6 @@ class QualityValidationResource extends Resource
$set('warranty_card_error', 'Serial Number must contain alpha-numeric values.');
return;
}
}
$set('warranty_card_error', 'Scan valid QR code.');
return;
@@ -1723,7 +1867,7 @@ class QualityValidationResource extends Resource
$expectedItemCode = trim((string) $get('item_id'));
if ($itemCode !== $expectedItemCode) {
if ($itemCode != $expectedItemCode) {
$set('warranty_card_error', 'Item code does not match.');
return;
}
@@ -1734,7 +1878,7 @@ class QualityValidationResource extends Resource
$isMatch = ($visibleSerialNumber == $serialNumber);
if (!$serialNumber || trim($serialNumber) === '') {
if (!$serialNumber || trim($serialNumber) == '') {
$set('warranty_card_error', null);
return;
}
@@ -1776,12 +1920,12 @@ class QualityValidationResource extends Resource
$expectedValue = $stickerMaster->part_validation1;
if ($state === null || trim($state) === '') {
if ($state == null || trim($state) == '') {
$set('part_validation1_error', null);
return;
}
if ($state === $expectedValue)
if ($state == $expectedValue)
{
$set('part_validation1_error', null);
}
@@ -1817,12 +1961,12 @@ class QualityValidationResource extends Resource
$expectedValue = $stickerMaster->part_validation2;
if ($state === null || trim($state) === '') {
if ($state == null || trim($state) == '') {
$set('part_validation2_error', null);
return;
}
if ($state === $expectedValue)
if ($state == $expectedValue)
{
$set('part_validation2_error', null);
}
@@ -1856,14 +2000,14 @@ class QualityValidationResource extends Resource
return;
}
if ($state === null || trim($state) === '') {
if ($state == null || trim($state) == '') {
$set('part_validation3_error', null);
return;
}
$expectedValue = $stickerMaster->part_validation3;
if ($state === $expectedValue)
if ($state == $expectedValue)
{
$set('part_validation3_error', null);
}
@@ -1900,12 +2044,12 @@ class QualityValidationResource extends Resource
$expectedValue = $stickerMaster->part_validation4;
// If input is empty, reset the error
if ($state === null || trim($state) === '') {
if ($state == null || trim($state) == '') {
$set('part_validation4_error', null);
return;
}
if ($state === $expectedValue)
if ($state == $expectedValue)
{
$set('part_validation4_error', null);
}
@@ -1943,12 +2087,12 @@ class QualityValidationResource extends Resource
$expectedValue = $stickerMaster->part_validation5;
// If input is empty, reset the error
if ($state === null || trim($state) === '') {
if ($state == null || trim($state) == '') {
$set('part_validation5_error', null);
return;
}
if ($state === $expectedValue)
if ($state == $expectedValue)
{
$set('part_validation5_error', null);
}