diff --git a/app/Filament/Imports/ItemImporter.php b/app/Filament/Imports/ItemImporter.php index d4a8b8b44..ae0577234 100644 --- a/app/Filament/Imports/ItemImporter.php +++ b/app/Filament/Imports/ItemImporter.php @@ -59,17 +59,19 @@ class ItemImporter extends Importer public function resolveRecord(): ?Item { $warnMsg = []; + $iCode = trim($this->data['code']); + $description = trim($this->data['description']); $plant = Plant::where('name', $this->data['plant'])->first(); if (!$plant) { $warnMsg[] = "Plant not found"; // '" . $this->data['plant'] . "' } - if (Str::length($this->data['code']) < 6 || !ctype_alnum($this->data['code'])) { + if (Str::length($iCode) < 6 || !ctype_alnum($iCode)) { $warnMsg[] = "Invalid item code found"; } // if (Str::length($this->data['uom']) <= 0) { // $warnMsg[] = "Invalid unit of measure found"; // } - if (Str::length($this->data['description']) < 5) { + if (Str::length($description) < 5) { $warnMsg[] = "Invalid description found"; } if (Str::length($this->data['hourly_quantity']) < 0 || !is_numeric($this->data['hourly_quantity']) || $this->data['hourly_quantity'] <= 0) { @@ -79,14 +81,14 @@ class ItemImporter extends Importer throw new RowImportFailedException(implode(', ', $warnMsg)); } return Item::updateOrCreate([ - 'code' => $this->data['code'], + 'code' => $iCode, 'plant_id' => $plant->id ], [ - 'category' => $this->data['category'], - 'description' => $this->data['description'], + 'category' => trim($this->data['category']), + 'description' => $description, 'hourly_quantity' => $this->data['hourly_quantity'], - 'uom' => $this->data['uom'] + 'uom' => trim($this->data['uom']) ] ); // return new Item;