Refactored ProcessOrderImporter to standardize column headers and improve error messaging
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 11s
Gemini PR Review / review (pull_request) Failing after 23s
Laravel Larastan / larastan (pull_request) Failing after 2m3s
Laravel Pint / pint (pull_request) Failing after 2m14s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 11s
Gemini PR Review / review (pull_request) Failing after 23s
Laravel Larastan / larastan (pull_request) Failing after 2m3s
Laravel Pint / pint (pull_request) Failing after 2m14s
This commit is contained in:
@@ -6,11 +6,11 @@ use App\Models\Item;
|
|||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use App\Models\ProcessOrder;
|
use App\Models\ProcessOrder;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
|
||||||
use Filament\Actions\Imports\ImportColumn;
|
use Filament\Actions\Imports\ImportColumn;
|
||||||
use Filament\Actions\Imports\Importer;
|
use Filament\Actions\Imports\Importer;
|
||||||
use Filament\Actions\Imports\Models\Import;
|
use Filament\Actions\Imports\Models\Import;
|
||||||
use Str;
|
use Str;
|
||||||
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
|
|
||||||
|
|
||||||
class ProcessOrderImporter extends Importer
|
class ProcessOrderImporter extends Importer
|
||||||
{
|
{
|
||||||
@@ -21,27 +21,28 @@ class ProcessOrderImporter extends Importer
|
|||||||
return [
|
return [
|
||||||
ImportColumn::make('plant')
|
ImportColumn::make('plant')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Plant Code')
|
->exampleHeader('PLANT CODE')
|
||||||
->example('1000')
|
->example('1000')
|
||||||
->label('Plant Code')
|
->label('PLANT CODE')
|
||||||
->relationship(resolveUsing:'code')
|
->relationship(resolveUsing: 'code')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('item')
|
ImportColumn::make('item')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Item Code')
|
->exampleHeader('ITEM CODE')
|
||||||
->example('123456')
|
->example('123456')
|
||||||
->label('Item Code')
|
->label('ITEM CODE')
|
||||||
->relationship(resolveUsing: 'code')
|
->relationship(resolveUsing: 'code')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('process_order')
|
ImportColumn::make('process_order')
|
||||||
->exampleHeader('Process Order')
|
->exampleHeader('PROCESS ORDER')
|
||||||
->example('200000166843')
|
->example('202500123456')
|
||||||
->label('Process Order')
|
->label('PROCESS ORDER')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('created_by')
|
ImportColumn::make('created_by')
|
||||||
->exampleHeader('Created By')
|
->exampleHeader('CREATED BY')
|
||||||
->example('RAW01234')
|
->example('RAW01234')
|
||||||
->label('Created By'),
|
->label('CREATED BY')
|
||||||
|
->rules(['required']),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,26 +53,23 @@ class ProcessOrderImporter extends Importer
|
|||||||
$itemCode = Item::where('code', $this->data['item'])->first();
|
$itemCode = Item::where('code', $this->data['item'])->first();
|
||||||
$iCode = trim($this->data['item']);
|
$iCode = trim($this->data['item']);
|
||||||
|
|
||||||
if (!$plant) {
|
if (! $plant) {
|
||||||
$warnMsg[] = "Plant not found";
|
$warnMsg[] = 'Plant not found';
|
||||||
}
|
} elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
|
||||||
else if (Str::length($iCode) < 6 || !ctype_alnum($iCode)) {
|
$warnMsg[] = 'Invalid item code found';
|
||||||
$warnMsg[] = "Invalid item code found";
|
} elseif (! $itemCode) {
|
||||||
}
|
$warnMsg[] = 'Item Code not found';
|
||||||
else if(!$itemCode)
|
|
||||||
{
|
|
||||||
$warnMsg[] = "Item Code not found";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$processOrder = trim($this->data['process_order'] ?? '');
|
$processOrder = trim($this->data['process_order'] ?? '');
|
||||||
|
|
||||||
if ($processOrder == '') {
|
if ($processOrder == '') {
|
||||||
$warnMsg[] = "Process Order cannot be empty";
|
$warnMsg[] = 'Process Order cannot be empty';
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = User::where('name', $this->data['created_by'])->first();
|
$user = User::where('name', $this->data['created_by'])->first();
|
||||||
if (!$user) {
|
if (! $user) {
|
||||||
$warnMsg[] = "User not found";
|
$warnMsg[] = 'User not found';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($plant && $processOrder != '') {
|
if ($plant && $processOrder != '') {
|
||||||
@@ -81,11 +79,11 @@ class ProcessOrderImporter extends Importer
|
|||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($existingOrder && $existingOrder->item_id !== ($itemCode->id ?? null)) {
|
if ($existingOrder && $existingOrder->item_id !== ($itemCode->id ?? null)) {
|
||||||
$warnMsg[] = "Same Process Order already exists for this Plant with a different Item Code";
|
$warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($warnMsg)) {
|
if (! empty($warnMsg)) {
|
||||||
throw new RowImportFailedException(implode(', ', $warnMsg));
|
throw new RowImportFailedException(implode(', ', $warnMsg));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,21 +91,21 @@ class ProcessOrderImporter extends Importer
|
|||||||
'plant_id' => $plant->id,
|
'plant_id' => $plant->id,
|
||||||
'item_id' => $itemCode->id,
|
'item_id' => $itemCode->id,
|
||||||
'process_order' => trim($this->data['process_order']),
|
'process_order' => trim($this->data['process_order']),
|
||||||
'coil_number' => "0",
|
'coil_number' => '0',
|
||||||
'order_quantity' => 0,
|
'order_quantity' => 0,
|
||||||
'received_quantity' => 0,
|
'received_quantity' => 0,
|
||||||
'created_by' => $user->name,
|
'created_by' => $user->name,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
//return new ProcessOrder();
|
// return new ProcessOrder();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getCompletedNotificationBody(Import $import): string
|
public static function getCompletedNotificationBody(Import $import): string
|
||||||
{
|
{
|
||||||
$body = 'Your process order import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
|
$body = 'Your process order import has completed and '.number_format($import->successful_rows).' '.str('row')->plural($import->successful_rows).' imported.';
|
||||||
|
|
||||||
if ($failedRowsCount = $import->getFailedRowsCount()) {
|
if ($failedRowsCount = $import->getFailedRowsCount()) {
|
||||||
$body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to import.';
|
$body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to import.';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $body;
|
return $body;
|
||||||
|
|||||||
Reference in New Issue
Block a user