Merge pull request 'removed created by column from gr master importer and set filament auth user' (#1444) from ranjith-dev into master
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
Reviewed-on: #1444
This commit was merged in pull request #1444.
This commit is contained in:
@@ -46,12 +46,12 @@ class GrMasterImporter extends Importer
|
||||
->example('67345237')
|
||||
->label('GR Number')
|
||||
->rules(['required']),
|
||||
ImportColumn::make('created_by')
|
||||
->requiredMapping()
|
||||
->exampleHeader('Created By')
|
||||
->example('Admin')
|
||||
->label('Created By')
|
||||
->rules(['required']),
|
||||
// ImportColumn::make('created_by')
|
||||
// ->requiredMapping()
|
||||
// ->exampleHeader('Created By')
|
||||
// ->example('Admin')
|
||||
// ->label('Created By')
|
||||
// ->rules(['required']),
|
||||
// ImportColumn::make('updated_by'),
|
||||
];
|
||||
}
|
||||
@@ -92,10 +92,7 @@ class GrMasterImporter extends Importer
|
||||
$warnMsg[] = 'GR Number cannot be empty.';
|
||||
}
|
||||
|
||||
$user = User::where('name', $this->data['created_by'])->first();
|
||||
if (! $user) {
|
||||
$warnMsg[] = 'User not found';
|
||||
}
|
||||
$userName = Filament::auth()->user()?->name;
|
||||
|
||||
$serialExists = GrMaster::where('plant_id', $plant->id)
|
||||
->where('serial_number', $this->data['serial_number'])
|
||||
@@ -118,18 +115,27 @@ class GrMasterImporter extends Importer
|
||||
throw new RowImportFailedException(implode(', ', $warnMsg));
|
||||
}
|
||||
|
||||
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,
|
||||
]
|
||||
);
|
||||
GrMaster::create([
|
||||
'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,
|
||||
]);
|
||||
|
||||
// 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 new GrMaster();
|
||||
|
||||
Reference in New Issue
Block a user