removed created by column from gr master importer and set filament auth user
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 17s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 16s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 15s
Laravel Pint / pint (pull_request) Successful in 3m42s
Laravel Larastan / larastan (pull_request) Failing after 6m1s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 17s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 16s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 15s
Laravel Pint / pint (pull_request) Successful in 3m42s
Laravel Larastan / larastan (pull_request) Failing after 6m1s
This commit is contained in:
@@ -46,12 +46,12 @@ class GrMasterImporter extends Importer
|
|||||||
->example('67345237')
|
->example('67345237')
|
||||||
->label('GR Number')
|
->label('GR Number')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('created_by')
|
// ImportColumn::make('created_by')
|
||||||
->requiredMapping()
|
// ->requiredMapping()
|
||||||
->exampleHeader('Created By')
|
// ->exampleHeader('Created By')
|
||||||
->example('Admin')
|
// ->example('Admin')
|
||||||
->label('Created By')
|
// ->label('Created By')
|
||||||
->rules(['required']),
|
// ->rules(['required']),
|
||||||
// ImportColumn::make('updated_by'),
|
// ImportColumn::make('updated_by'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -92,10 +92,7 @@ class GrMasterImporter extends Importer
|
|||||||
$warnMsg[] = 'GR Number cannot be empty.';
|
$warnMsg[] = 'GR Number cannot be empty.';
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = User::where('name', $this->data['created_by'])->first();
|
$userName = Filament::auth()->user()?->name;
|
||||||
if (! $user) {
|
|
||||||
$warnMsg[] = 'User not found';
|
|
||||||
}
|
|
||||||
|
|
||||||
$serialExists = GrMaster::where('plant_id', $plant->id)
|
$serialExists = GrMaster::where('plant_id', $plant->id)
|
||||||
->where('serial_number', $this->data['serial_number'])
|
->where('serial_number', $this->data['serial_number'])
|
||||||
@@ -118,18 +115,27 @@ class GrMasterImporter extends Importer
|
|||||||
throw new RowImportFailedException(implode(', ', $warnMsg));
|
throw new RowImportFailedException(implode(', ', $warnMsg));
|
||||||
}
|
}
|
||||||
|
|
||||||
GrMaster::updateOrCreate(
|
GrMaster::create([
|
||||||
[
|
|
||||||
'plant_id' => $plant->id,
|
'plant_id' => $plant->id,
|
||||||
'gr_number' => $this->data['gr_number'] ?? null,
|
'gr_number' => $this->data['gr_number'] ?? null,
|
||||||
'serial_number' => $this->data['serial_number'],
|
'serial_number' => $this->data['serial_number'],
|
||||||
],
|
|
||||||
[
|
|
||||||
'item_id' => $item->id,
|
'item_id' => $item->id,
|
||||||
'created_by' => $userName,
|
'created_by' => $userName,
|
||||||
'updated_by' => $userName,
|
'updated_by' => $userName,
|
||||||
]
|
]);
|
||||||
);
|
|
||||||
|
// GrMaster::updateOrCreate(
|
||||||
|
// [
|
||||||
|
// 'plant_id' => $plant->id,
|
||||||
|
// 'gr_number' => $this->data['gr_number'] ?? null,
|
||||||
|
// 'serial_number' => $this->data['serial_number'],
|
||||||
|
// 'item_id' => $item->id,
|
||||||
|
// ],
|
||||||
|
// [
|
||||||
|
// 'created_by' => $userName,
|
||||||
|
// 'updated_by' => $userName,
|
||||||
|
// ]
|
||||||
|
// );
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
// return new GrMaster();
|
// return new GrMaster();
|
||||||
|
|||||||
Reference in New Issue
Block a user