Updated part_validation store logic
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
This commit is contained in:
@@ -163,12 +163,23 @@ class StickerMasterImporter extends Importer
|
||||
public function resolveRecord(): ?StickerMaster
|
||||
{
|
||||
$warnMsg = [];
|
||||
$plantCod = $this->data['plant'];
|
||||
$itemCod = $this->data['item'];
|
||||
$plantCod = trim($this->data['plant']);
|
||||
$itemCod = trim($this->data['item']);
|
||||
$panelCod = trim($this->data['panel_box_code']);
|
||||
$plant = null;
|
||||
$item = null;
|
||||
$plantId = null;
|
||||
$itemId = null;
|
||||
$parts = null;
|
||||
$validParts = null;
|
||||
$part1 = trim($this->data['part_validation1']);
|
||||
$part2 = trim($this->data['part_validation2']);
|
||||
$part3 = trim($this->data['part_validation3']);
|
||||
$part4 = trim($this->data['part_validation4']);
|
||||
$part5 = trim($this->data['part_validation5']);
|
||||
$laserPart1 = trim($this->data['laser_part_validation1']);
|
||||
$laserPart2 = trim($this->data['laser_part_validation2']);
|
||||
|
||||
$createdBy = Filament::auth()->user()->name;
|
||||
$updatedBy = Filament::auth()->user()->name;
|
||||
if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
|
||||
@@ -194,6 +205,23 @@ class StickerMasterImporter extends Importer
|
||||
} else {
|
||||
$itemId = $item->id;
|
||||
|
||||
if (! $laserPart1) {
|
||||
$laserPart1 = $laserPart2;
|
||||
$laserPart2 = null;
|
||||
}
|
||||
|
||||
if (Str::length($panelCod) > 0 && (Str::length($panelCod) < 6 || ! ctype_alnum($panelCod))) {
|
||||
$warnMsg[] = 'Invalid panel box code found';
|
||||
} elseif ($panelCod) {
|
||||
$parts = [$part1, $part2, $part3, $part4];
|
||||
$validParts = array_values(array_filter($parts, fn ($p) => ! empty($p)));
|
||||
[$part1, $part2, $part3, $part4] = array_pad($validParts, 4, '');
|
||||
} else {
|
||||
$parts = [$part1, $part2, $part3, $part4, $part5];
|
||||
$validParts = array_values(array_filter($parts, fn ($p) => ! empty($p)));
|
||||
[$part1, $part2, $part3, $part4, $part5] = array_pad($validParts, 5, '');
|
||||
}
|
||||
|
||||
if (Str::length($this->data['serial_number_motor']) > 0 && $this->data['serial_number_motor'] != '1') {
|
||||
$warnMsg[] = 'Serial number motor must be 1 or empty';
|
||||
}
|
||||
@@ -233,9 +261,6 @@ class StickerMasterImporter extends Importer
|
||||
if (Str::length($this->data['warranty_card']) > 0 && $this->data['warranty_card'] != '1') {
|
||||
$warnMsg[] = 'Warranty card must be 1 or empty';
|
||||
}
|
||||
if (Str::length($this->data['panel_box_code']) > 0 && (Str::length($this->data['panel_box_code']) < 6 || ! ctype_alnum($this->data['panel_box_code']))) {
|
||||
$warnMsg[] = 'Invalid panel box code found';
|
||||
}
|
||||
if (Str::length($this->data['load_rate']) < 0 || ! is_numeric($this->data['load_rate']) || $this->data['load_rate'] < 0) {
|
||||
$warnMsg[] = 'Load rate must be greater than or equal to 0';
|
||||
}
|
||||
@@ -280,13 +305,13 @@ class StickerMasterImporter extends Importer
|
||||
'tube_sticker_pump' => $this->data['tube_sticker_pump'],
|
||||
'tube_sticker_pumpset' => $this->data['tube_sticker_pumpset'],
|
||||
'warranty_card' => $this->data['warranty_card'],
|
||||
'part_validation1' => $this->data['part_validation1'],
|
||||
'part_validation2' => $this->data['part_validation2'],
|
||||
'part_validation3' => $this->data['part_validation3'],
|
||||
'part_validation4' => $this->data['part_validation4'],
|
||||
'part_validation5' => $this->data['part_validation5'],
|
||||
'laser_part_validation1' => $this->data['laser_part_validation1'],
|
||||
'laser_part_validation2' => $this->data['laser_part_validation2'],
|
||||
'part_validation1' => $part1,
|
||||
'part_validation2' => $part2,
|
||||
'part_validation3' => $part3,
|
||||
'part_validation4' => $part4,
|
||||
'part_validation5' => $part5,
|
||||
'laser_part_validation1' => $laserPart1,
|
||||
'laser_part_validation2' => $laserPart2,
|
||||
'panel_box_code' => $this->data['panel_box_code'],
|
||||
'load_rate' => $this->data['load_rate'],
|
||||
'bundle_quantity' => $this->data['bundle_quantity'],
|
||||
|
||||
Reference in New Issue
Block a user