diff --git a/app/Filament/Imports/UserImporter.php b/app/Filament/Imports/UserImporter.php index fecfe8e93..da3758d28 100644 --- a/app/Filament/Imports/UserImporter.php +++ b/app/Filament/Imports/UserImporter.php @@ -18,7 +18,7 @@ class UserImporter extends Importer public static function getColumns(): array { return [ - ImportColumn::make('plant') + ImportColumn::make('plant_id') ->requiredMapping() ->exampleHeader('Plant Code') ->example('1000') @@ -54,10 +54,13 @@ class UserImporter extends Importer public function resolveRecord(): ?User { $warnMsg = []; - $plantCod = $this->data['plant']; + $plantCod = $this->data['plant_id']; $plant = null; - if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) { + if (Str::length($plantCod) > 0 && (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod))) { $warnMsg[] = 'Invalid plant code found!'; + } elseif (Str::length($plantCod) <= 0) { + $plant = null; + $plantCod = null; } else { $plant = Plant::where('code', $plantCod)->first(); if (! $plant) {