feat: Add validation rules for Machine and Work Center names; enhance ProcessOrder table sorting; refactor StickerMasterResource for improved readability and functionality
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 25s
Laravel Pint / pint (pull_request) Failing after 2m2s
Laravel Larastan / larastan (pull_request) Failing after 2m37s

This commit is contained in:
dhanabalan
2025-11-27 10:18:36 +05:30
parent 27b4377e9e
commit c16c967757
4 changed files with 682 additions and 552 deletions

View File

@@ -12,24 +12,24 @@ use App\Models\StickerMaster;
use Filament\Actions\Exports\Enums\ExportFormat; use Filament\Actions\Exports\Enums\ExportFormat;
use Filament\Facades\Filament; use Filament\Facades\Filament;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\FileUpload; use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Forms\Get; use Filament\Forms\Get;
use Filament\Notifications\Notification;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Actions\ExportAction; use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction; use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Notifications\Notification;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use Storage;
use Str;
class ItemResource extends Resource class ItemResource extends Resource
{ {
@@ -55,22 +55,22 @@ class ItemResource extends Resource
->reactive() ->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
}) })
->default(function () { ->default(function () {
return optional(Item::latest()->first())->plant_id; return optional(Item::latest()->first())->plant_id;
}) })
->disabled(fn (Get $get) => !empty($get('id'))) ->disabled(fn (Get $get) => ! empty($get('id')))
// ->afterStateUpdated(fn ($set) => $set('block_id', null) & $set('name', null) & $set('start_time', null) & $set('duration', null) & $set('end_time', null)) // ->afterStateUpdated(fn ($set) => $set('block_id', null) & $set('name', null) & $set('start_time', null) & $set('duration', null) & $set('end_time', null))
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
// Ensure `linestop_id` is not cleared // Ensure `linestop_id` is not cleared
if (!$plantId) { if (! $plantId) {
$set('iPlantError', 'Please select a plant first.'); $set('iPlantError', 'Please select a plant first.');
return; return;
} } else {
else
{
$set('iPlantError', null); $set('iPlantError', null);
} }
}) })
@@ -91,23 +91,23 @@ class ItemResource extends Resource
->minLength(6) ->minLength(6)
// ->autocapitalize('characters') // ->autocapitalize('characters')
->reactive() ->reactive()
->disabled(fn (Get $get) => !empty($get('id'))) ->disabled(fn (Get $get) => ! empty($get('id')))
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$code = $get('code'); $code = $get('code');
// Ensure `linestop_id` is not cleared // Ensure `linestop_id` is not cleared
if (!$code) { if (! $code) {
$set('iCodeError', 'Scan the valid code.'); $set('iCodeError', 'Scan the valid code.');
return; return;
} } else {
else
{
if (strlen($code) < 6) { if (strlen($code) < 6) {
$set('iCodeError', 'Item code must be at least 6 digits.'); $set('iCodeError', 'Item code must be at least 6 digits.');
return; return;
} } elseif (! preg_match('/^[a-zA-Z0-9]{6,}$/', $code)) {
else if (!preg_match('/^[a-zA-Z0-9]{6,}$/', $code)) { $set('code', null);
$set('code',null);
$set('iCodeError', 'Item code must contain only alpha-numeric characters.'); $set('iCodeError', 'Item code must contain only alpha-numeric characters.');
return; return;
} }
$set('iCodeError', null); $set('iCodeError', null);
@@ -134,15 +134,15 @@ class ItemResource extends Resource
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$hourQuan = $get('hourly_quantity'); $hourQuan = $get('hourly_quantity');
// Ensure `linestop_id` is not cleared // Ensure `linestop_id` is not cleared
if (!$hourQuan) { if (! $hourQuan) {
$set('iHourQuanError', 'Scan the valid hourly quantity.'); $set('iHourQuanError', 'Scan the valid hourly quantity.');
return; return;
} } else {
else if (! preg_match('/^[0-9]{1,}$/', $hourQuan)) {
{ $set('hourly_quantity', null);
if (!preg_match('/^[0-9]{1,}$/', $hourQuan)) {
$set('hourly_quantity',null);
$set('iHourQuanError', 'Quantity must be integer value.'); $set('iHourQuanError', 'Quantity must be integer value.');
return; return;
} }
$set('iHourQuanError', null); $set('iHourQuanError', null);
@@ -187,6 +187,7 @@ class ItemResource extends Resource
$paginator = $livewire->getTableRecords(); $paginator = $livewire->getTableRecords();
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10; $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1; $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
return ($currentPage - 1) * $perPage + $rowLoop->iteration; return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}), }),
Tables\Columns\TextColumn::make('plant.name') Tables\Columns\TextColumn::make('plant.name')
@@ -236,9 +237,143 @@ class ItemResource extends Resource
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
]) ])
// ->filters([
// Tables\Filters\TrashedFilter::make(),
// ])
->filters([ ->filters([
Tables\Filters\TrashedFilter::make(), Tables\Filters\TrashedFilter::make(),
Filter::make('advanced_filters')
->label('Advanced Filters')
->form([
Select::make('Plant')
->label('Select Plant')
->nullable()
->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('item_id', null);
$set('operator_id', null);
}),
Select::make('code')
->label('Search by Item Code')
->nullable()
// ->options(function (callable $get) {
// $plantId = $get('Plant');
// return $plantId
// ? Item::where('plant_id', $plantId)->pluck('code', 'id')
// : Item::pluck('code', 'id');
// })
->options(function (callable $get) {
$plantId = $get('Plant');
return $plantId
? Item::where('plant_id', $plantId)->pluck('code', 'id')
: [];
})
->searchable()
->reactive(),
TextInput::make('description')
->label('Search by Description')
->placeholder(placeholder: 'Enter Description'),
TextInput::make('category')
->label('Search by Category')
->placeholder(placeholder: 'Enter Category'),
TextInput::make('uom')
->label('Search by UOM')
->placeholder(placeholder: 'Enter UOM'),
DateTimePicker::make(name: 'created_from')
->label('Created From')
->placeholder(placeholder: 'Select From DateTime')
->reactive()
->native(false),
DateTimePicker::make('created_to')
->label('Created To')
->placeholder(placeholder: 'Select To DateTime')
->reactive()
->native(false),
]) ])
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (
empty($data['Plant']) &&
empty($data['item_id']) &&
empty($data['description']) &&
empty($data['uom']) &&
empty($data['category']) &&
empty($data['created_from']) &&
empty($data['created_to'])
) {
return $query->whereRaw('1 = 0');
}
if (! empty($data['Plant'])) { // $plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']);
}
if (! empty($data['item_id'])) {
$query->where('item_id', $data['item_id']);
}
if (! empty($data['description'])) {
$query->where('description', '%'.$data['description'].'%');
}
if (! empty($data['uom'])) {
$query->where('uom', 'like', '%'.$data['uom'].'%');
}
if (! empty($data['category'])) {
$query->where('category', '%'.$data['category'].'%');
}
if (! empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
if (! empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']);
}
})
->indicateUsing(function (array $data) {
$indicators = [];
if (! empty($data['Plant'])) {
$indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name');
}
if (! empty($data['item_id'])) {
$indicators[] = 'Item Code: '.$data['item_id'];
}
if (! empty($data['description'])) {
$indicators[] = 'Description: '.$data['description'];
}
if (! empty($data['uom'])) {
$indicators[] = 'UOM: '.$data['uom'];
}
if (! empty($data['category'])) {
$indicators[] = 'Category: '.$data['category'];
}
if (! empty($data['created_from'])) {
$indicators[] = 'From: '.$data['created_from'];
}
if (! empty($data['created_to'])) {
$indicators[] = 'To: '.$data['created_to'];
}
return $indicators;
}),
])
->filtersFormMaxHeight('280px')
->actions([ ->actions([
Tables\Actions\ViewAction::make(), Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(), Tables\Actions\EditAction::make(),
@@ -251,7 +386,6 @@ class ItemResource extends Resource
]), ]),
]) ])
->headerActions([ ->headerActions([
// Tables\Actions\Action::make('Import Items') // Tables\Actions\Action::make('Import Items')
// ->label('Import Items') // ->label('Import Items')
// ->form([ // ->form([
@@ -402,7 +536,6 @@ class ItemResource extends Resource
// return; // return;
// } // }
// $uniqueCodes = array_unique($materialCodes); // $uniqueCodes = array_unique($materialCodes);
// $matchedItems = StickerMaster::with('item') // $matchedItems = StickerMaster::with('item')
@@ -483,7 +616,7 @@ class ItemResource extends Resource
->label('Import Items') ->label('Import Items')
->color('warning') ->color('warning')
->importer(ItemImporter::class) ->importer(ItemImporter::class)
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view import item'); return Filament::auth()->user()->can('view import item');
}), }),
// ->maxRows(100000), // ->maxRows(100000),
@@ -493,7 +626,7 @@ class ItemResource extends Resource
->color('warning') ->color('warning')
// ->fileName("Items Report " . date('Y-m-d H:i:s')) // ->fileName("Items Report " . date('Y-m-d H:i:s'))
->exporter(ItemExporter::class) ->exporter(ItemExporter::class)
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view export item'); return Filament::auth()->user()->can('view export item');
}), }),
// ->formats([ // ->formats([

View File

@@ -159,6 +159,7 @@ class MachineResource extends Resource
->hintColor('danger'), ->hintColor('danger'),
Forms\Components\TextInput::make('name') Forms\Components\TextInput::make('name')
->label('Name') ->label('Name')
->minLength(5)
->placeholder('Scan the valid Machine Name') ->placeholder('Scan the valid Machine Name')
->required() ->required()
->rule(function (callable $get) { ->rule(function (callable $get) {
@@ -169,6 +170,7 @@ class MachineResource extends Resource
}), }),
Forms\Components\TextInput::make('work_center') Forms\Components\TextInput::make('work_center')
->label('Work Center') ->label('Work Center')
->minLength(6)
->placeholder('Scan the valid Work Center') ->placeholder('Scan the valid Work Center')
->required() ->required()
->rule(function (callable $get) { ->rule(function (callable $get) {

View File

@@ -370,8 +370,7 @@ class ProcessOrderResource extends Resource
->label('Created At') ->label('Created At')
->alignCenter() ->alignCenter()
->dateTime() ->dateTime()
->sortable() ->sortable(),
->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('created_by') Tables\Columns\TextColumn::make('created_by')
->label('Created By') ->label('Created By')
->alignCenter() ->alignCenter()

View File

@@ -3,35 +3,33 @@
namespace App\Filament\Resources; namespace App\Filament\Resources;
use App\Filament\Exports\StickerMasterExporter; use App\Filament\Exports\StickerMasterExporter;
//use App\Filament\Imports\ShiftImporter; // use App\Filament\Imports\ShiftImporter;
use App\Filament\Imports\StickerMasterImporter; use App\Filament\Imports\StickerMasterImporter;
use App\Filament\Resources\StickerMasterResource\Pages; use App\Filament\Resources\StickerMasterResource\Pages;
use App\Models\Item; use App\Models\Item;
use App\Models\Plant; use App\Models\Plant;
//use App\Filament\Resources\StickerMasterResource\RelationManagers; // use App\Filament\Resources\StickerMasterResource\RelationManagers;
use App\Models\StickerMaster; use App\Models\StickerMaster;
//use Closure; // use Closure;
use Filament\Facades\Filament; use Filament\Facades\Filament;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Select; use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Notifications\Notification;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Filament\Forms\Components\FileUpload;
use Filament\Notifications\Notification;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\TextInput;
use Filament\Tables\Filters\Filter;
use App\Models\InvoiceValidation;
// use Illuminate\Validation\Rule; // use Illuminate\Validation\Rule;
@@ -55,14 +53,14 @@ class StickerMasterResource extends Resource
->nullable() ->nullable()
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
}) })
->default(function () { ->default(function () {
return optional(StickerMaster::latest()->first())->plant_id; return optional(StickerMaster::latest()->first())->plant_id;
}) })
->disabled(fn (Get $get) => !empty($get('id'))) //disable in edit if user try to change ->disabled(fn (Get $get) => ! empty($get('id'))) // disable in edit if user try to change
->afterStateUpdated(fn (callable $set) => ->afterStateUpdated(fn (callable $set) => $set('item_id', null) & // when plant changed remove all the data which is in text input box
$set('item_id', null) & //when plant changed remove all the data which is in text input box
$set('item_description', null) & $set('item_description', null) &
$set('item_error', null) & $set('item_error', null) &
$set('panel_box_code', null) & $set('panel_box_code', null) &
@@ -95,7 +93,7 @@ class StickerMasterResource extends Resource
Forms\Components\Select::make('item_id') Forms\Components\Select::make('item_id')
->label('Item Code') ->label('Item Code')
->options(function (callable $get) { ->options(function (callable $get) {
if (!$get('plant_id')) { if (! $get('plant_id')) {
return []; return [];
} }
@@ -118,29 +116,33 @@ class StickerMasterResource extends Resource
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$itemId = $get('item_id'); $itemId = $get('item_id');
//If plant_id is changed or empty, reset everything // If plant_id is changed or empty, reset everything
if (blank($plantId)) { if (blank($plantId)) {
$set('item_id', null); $set('item_id', null);
$set('item_error', null); $set('item_error', null);
$set('item_description', null); $set('item_description', null);
return; return;
} }
if (blank($itemId)) { if (blank($itemId)) {
$set('item_error', null); $set('item_error', null);
$set('item_description', null); $set('item_description', null);
return; return;
} }
$availableItems = \App\Models\Item::where('plant_id', $plantId)->exists(); $availableItems = \App\Models\Item::where('plant_id', $plantId)->exists();
if (!$availableItems) { if (! $availableItems) {
$set('item_error', null); $set('item_error', null);
return; return;
} }
// Ensure `item_id` is not cleared // Ensure `item_id` is not cleared
if (!$plantId || !$itemId) { if (! $plantId || ! $itemId) {
$set('item_description', null); $set('item_description', null);
return; return;
} }
@@ -158,8 +160,7 @@ class StickerMasterResource extends Resource
$duplicateSticker = StickerMaster::where('plant_id', $plantId) $duplicateSticker = StickerMaster::where('plant_id', $plantId)
->where('item_id', $itemId) ->where('item_id', $itemId)
->exists(); ->exists();
if(!$get('id')) if (! $get('id')) {
{
$set('item_error', $duplicateSticker ? 'Item Code already exists for the selected plant.' : null); $set('item_error', $duplicateSticker ? 'Item Code already exists for the selected plant.' : null);
} }
}) })
@@ -242,38 +243,31 @@ class StickerMasterResource extends Resource
->reactive() ->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($state) if ($state) {
{
$set('panel_box_code', null); $set('panel_box_code', null);
$set('load_rate', 0); $set('load_rate', 0);
} }
if ($state !== "2") if ($state !== '2') {
{
$set('bundle_quantity', null); $set('bundle_quantity', null);
} } else {
else
{
$set('bundle_quantity', 2); $set('bundle_quantity', 2);
} }
//$plantId = $get('plant_id'); // $plantId = $get('plant_id');
}) })
->nullable(), ->nullable(),
Forms\Components\TextInput::make('bundle_quantity') Forms\Components\TextInput::make('bundle_quantity')
->label('Bundle Quantity') ->label('Bundle Quantity')
->integer() ->integer()
->readOnly(fn (callable $get) => $get('material_type') !== "2") ->readOnly(fn (callable $get) => $get('material_type') !== '2')
->nullable() ->nullable()
->minValue(2) ->minValue(2)
->reactive() ->reactive()
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if($get('material_type') !== "2") if ($get('material_type') !== '2') {
{
$set('bundle_quantity', null); $set('bundle_quantity', null);
} } elseif ($get('bundle_quantity') < 2) {
else if ($get('bundle_quantity') < 2)
{
$set('bundle_quantity', 2); $set('bundle_quantity', 2);
} }
}), }),
@@ -283,9 +277,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('serial_number_pumpset'); // return $get('serial_number_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_motor')) if ($get('serial_number_motor')) {
{
$set('serial_number_pumpset', false); $set('serial_number_pumpset', false);
} }
}) })
@@ -296,9 +289,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('serial_number_pumpset'); // return $get('serial_number_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_pump')) if ($get('serial_number_pump')) {
{
$set('serial_number_pumpset', false); $set('serial_number_pumpset', false);
} }
}) })
@@ -309,9 +301,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('serial_number_motor') || $get('serial_number_pump'); // return $get('serial_number_motor') || $get('serial_number_pump');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_pumpset')) if ($get('serial_number_pumpset')) {
{
$set('serial_number_motor', false); $set('serial_number_motor', false);
$set('serial_number_pump', false); $set('serial_number_pump', false);
} }
@@ -323,9 +314,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('pack_slip_pumpset'); // return $get('pack_slip_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_motor')) if ($get('pack_slip_motor')) {
{
$set('pack_slip_pumpset', false); $set('pack_slip_pumpset', false);
} }
}) })
@@ -336,9 +326,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('pack_slip_pumpset'); // return $get('pack_slip_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_pump')) if ($get('pack_slip_pump')) {
{
$set('pack_slip_pumpset', false); $set('pack_slip_pumpset', false);
} }
}) })
@@ -349,9 +338,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('pack_slip_motor') || $get('pack_slip_pump'); // return $get('pack_slip_motor') || $get('pack_slip_pump');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_pumpset')) if ($get('pack_slip_pumpset')) {
{
$set('pack_slip_motor', false); $set('pack_slip_motor', false);
$set('pack_slip_pump', false); $set('pack_slip_pump', false);
} }
@@ -363,9 +351,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('name_plate_pumpset'); // return $get('name_plate_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_motor')) if ($get('name_plate_motor')) {
{
$set('name_plate_pumpset', false); $set('name_plate_pumpset', false);
} }
}) })
@@ -376,9 +363,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('name_plate_pumpset'); // return $get('name_plate_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_pump')) if ($get('name_plate_pump')) {
{
$set('name_plate_pumpset', false); $set('name_plate_pumpset', false);
} }
}) })
@@ -389,9 +375,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('name_plate_motor') || $get('name_plate_pump'); // return $get('name_plate_motor') || $get('name_plate_pump');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_pumpset')) if ($get('name_plate_pumpset')) {
{
$set('name_plate_motor', false); $set('name_plate_motor', false);
$set('name_plate_pump', false); $set('name_plate_pump', false);
} }
@@ -403,9 +388,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('tube_sticker_pumpset'); // return $get('tube_sticker_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_motor')) if ($get('tube_sticker_motor')) {
{
$set('tube_sticker_pumpset', false); $set('tube_sticker_pumpset', false);
} }
}) })
@@ -416,9 +400,8 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('tube_sticker_pumpset'); // return $get('tube_sticker_pumpset');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_pump')) if ($get('tube_sticker_pump')) {
{
$set('tube_sticker_pumpset', false); $set('tube_sticker_pumpset', false);
} }
}) })
@@ -430,14 +413,13 @@ class StickerMasterResource extends Resource
// ->disabled(function ($get) { // ->disabled(function ($get) {
// return $get('tube_sticker_motor') || $get('tube_sticker_pump'); // return $get('tube_sticker_motor') || $get('tube_sticker_pump');
// }) // })
->afterStateUpdated(function ($state, callable $set,callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_pumpset')) if ($get('tube_sticker_pumpset')) {
{
$set('tube_sticker_motor', false); $set('tube_sticker_motor', false);
$set('tube_sticker_pump', false); $set('tube_sticker_pump', false);
} }
}) })
->dehydrateStateUsing(fn ($state) => $state ? $state : null), //to pass null value ->dehydrateStateUsing(fn ($state) => $state ? $state : null), // to pass null value
Forms\Components\Checkbox::make('warranty_card') Forms\Components\Checkbox::make('warranty_card')
->nullable() ->nullable()
@@ -452,7 +434,6 @@ class StickerMasterResource extends Resource
public static function table(Table $table): Table public static function table(Table $table): Table
{ {
return $table return $table
->columns([ ->columns([
// Tables\Columns\TextColumn::make('id') // Tables\Columns\TextColumn::make('id')
// ->label('ID') // ->label('ID')
@@ -464,6 +445,7 @@ class StickerMasterResource extends Resource
$paginator = $livewire->getTableRecords(); $paginator = $livewire->getTableRecords();
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10; $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1; $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
return ($currentPage - 1) * $perPage + $rowLoop->iteration; return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}), }),
Tables\Columns\TextColumn::make('plant.name') Tables\Columns\TextColumn::make('plant.name')
@@ -579,6 +561,7 @@ class StickerMasterResource extends Resource
if (is_null($state) || $state === '') { if (is_null($state) || $state === '') {
return ''; return '';
} }
return match ($state) { return match ($state) {
1 => 'Individual', 1 => 'Individual',
2 => 'Bundle', 2 => 'Bundle',
@@ -617,6 +600,7 @@ class StickerMasterResource extends Resource
->nullable() ->nullable()
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
}) })
->reactive() ->reactive()
@@ -635,9 +619,10 @@ class StickerMasterResource extends Resource
// }) // })
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
return $plantId return $plantId
? Item::where('plant_id', $plantId)->pluck('code', 'id') ? Item::where('plant_id', $plantId)->pluck('code', 'id')
: []; : Item::pluck('code', 'id');
}) })
->searchable() ->searchable()
->reactive(), ->reactive(),
@@ -667,9 +652,9 @@ class StickerMasterResource extends Resource
->query(function ($query, array $data) { ->query(function ($query, array $data) {
// Hide all records initially if no filters are applied // Hide all records initially if no filters are applied
if ( if (
empty($data['material_type']) &&
empty($data['Plant']) && empty($data['Plant']) &&
empty($data['item_id']) && empty($data['item_id']) &&
empty($data['material_type']) &&
empty($data['panel_box_code']) && empty($data['panel_box_code']) &&
empty($data['created_from']) && empty($data['created_from']) &&
empty($data['created_to']) empty($data['created_to'])
@@ -677,27 +662,27 @@ class StickerMasterResource extends Resource
return $query->whereRaw('1 = 0'); return $query->whereRaw('1 = 0');
} }
if (!empty($data['Plant'])) { //$plant = $data['Plant'] ?? null if (! empty($data['Plant'])) { // $plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']); $query->where('plant_id', $data['Plant']);
} }
if (!empty($data['item_id'])) { if (! empty($data['item_id'])) {
$query->where('item_id', $data['item_id']); $query->where('item_id', $data['item_id']);
} }
if (!empty($data['material_type'])) { if (! empty($data['material_type'])) {
$query->where('material_type', $data['material_type']); $query->where('material_type', $data['material_type']);
} }
if (!empty($data['panel_box_code'])) { if (! empty($data['panel_box_code'])) {
$query->where('panel_box_code', 'like', '%' . $data['panel_box_code'] . '%'); $query->where('panel_box_code', 'like', '%'.$data['panel_box_code'].'%');
} }
if (!empty($data['created_from'])) { if (! empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']); $query->where('created_at', '>=', $data['created_from']);
} }
if (!empty($data['created_to'])) { if (! empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']); $query->where('created_at', '<=', $data['created_to']);
} }
@@ -705,28 +690,39 @@ class StickerMasterResource extends Resource
->indicateUsing(function (array $data) { ->indicateUsing(function (array $data) {
$indicators = []; $indicators = [];
if (!empty($data['Plant'])) { if (! empty($data['Plant'])) {
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name'); $indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name');
} }
if (!empty($data['item_id'])) { if (! empty($data['item_id'])) {
$indicators[] = 'Item Code: ' . $data['item_id']; $indicators[] = 'Item Code: '.Item::where('id', $data['item_id'])->value('code');
} }
if (!empty($data['panel_box_code'])) { if (! empty($data['material_type'])) {
$indicators[] = 'Panel Box Code: ' . $data['panel_box_code']; if ($data['material_type'] == 1) {
$indicators[] = 'Material Type: Individual';
} elseif ($data['material_type'] == 2) {
$indicators[] = 'Material Type: Bundle';
} elseif ($data['material_type'] == 3) {
$indicators[] = 'Material Type: Quantity';
}
// $indicators[] = 'Material Type: '.$data['material_type'];
} }
if (!empty($data['created_from'])) { if (! empty($data['panel_box_code'])) {
$indicators[] = 'From: ' . $data['created_from']; $indicators[] = 'Panel Box Code: '.$data['panel_box_code'];
} }
if (!empty($data['created_to'])) { if (! empty($data['created_from'])) {
$indicators[] = 'To: ' . $data['created_to']; $indicators[] = 'From: '.$data['created_from'];
}
if (! empty($data['created_to'])) {
$indicators[] = 'To: '.$data['created_to'];
} }
return $indicators; return $indicators;
}) }),
]) ])
->filtersFormMaxHeight('280px') ->filtersFormMaxHeight('280px')
->actions([ ->actions([
@@ -747,6 +743,7 @@ class StickerMasterResource extends Resource
Select::make('plant_id') Select::make('plant_id')
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
}) })
->label('Select Plant') ->label('Select Plant')
@@ -760,7 +757,7 @@ class StickerMasterResource extends Resource
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
if (!$plantId) { if (! $plantId) {
return []; return [];
} }
@@ -789,7 +786,7 @@ class StickerMasterResource extends Resource
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$itemId = $get('item_id'); $itemId = $get('item_id');
if (!$plantId || !$itemId) { if (! $plantId || ! $itemId) {
return []; return [];
} }
@@ -797,25 +794,25 @@ class StickerMasterResource extends Resource
->where('item_id', $itemId) ->where('item_id', $itemId)
->first(); ->first();
if (!$sticker) { if (! $sticker) {
return []; return [];
} }
$options = []; $options = [];
if (!empty($sticker->part_validation1)) { if (! empty($sticker->part_validation1)) {
$options['part_validation1'] = 'Part Validation 1'; $options['part_validation1'] = 'Part Validation 1';
} }
if (!empty($sticker->part_validation2)) { if (! empty($sticker->part_validation2)) {
$options['part_validation2'] = 'Part Validation 2'; $options['part_validation2'] = 'Part Validation 2';
} }
if (!empty($sticker->part_validation3)) { if (! empty($sticker->part_validation3)) {
$options['part_validation3'] = 'Part Validation 3'; $options['part_validation3'] = 'Part Validation 3';
} }
if (!empty($sticker->part_validation4)) { if (! empty($sticker->part_validation4)) {
$options['part_validation4'] = 'Part Validation 4'; $options['part_validation4'] = 'Part Validation 4';
} }
@@ -835,8 +832,8 @@ class StickerMasterResource extends Resource
->storeFiles(false) // prevent auto-storing, we will store manually ->storeFiles(false) // prevent auto-storing, we will store manually
->reactive() ->reactive()
->required() ->required()
->disk('local') //'local' refers to the local storage disk defined in config/filesystems.php, typically pointing to storage/app. ->disk('local') // 'local' refers to the local storage disk defined in config/filesystems.php, typically pointing to storage/app.
->visible(fn (Get $get) => !empty($get('plant_id'))) ->visible(fn (Get $get) => ! empty($get('plant_id')))
->directory('uploads/PartValidation'), ->directory('uploads/PartValidation'),
]) ])
->action(function (array $data) { ->action(function (array $data) {
@@ -853,10 +850,10 @@ class StickerMasterResource extends Resource
->where('item_id', $itemId) ->where('item_id', $itemId)
->first(); ->first();
if (!$sticker) { if (! $sticker) {
Notification::make() Notification::make()
->title('Unknown Sticker Master') ->title('Unknown Sticker Master')
->body("Sticker Master data not found.") ->body('Sticker Master data not found.')
->danger() ->danger()
->seconds(2) ->seconds(2)
->send(); ->send();
@@ -873,12 +870,12 @@ class StickerMasterResource extends Resource
->send(); ->send();
} }
$newFileName = $value . '.png'; $newFileName = $value.'.png';
$directory = "uploads/PartValidation/{$plantCode}"; $directory = "uploads/PartValidation/{$plantCode}";
$disk = Storage::disk('local'); $disk = Storage::disk('local');
if (!$disk->exists($directory)) { if (! $disk->exists($directory)) {
$disk->makeDirectory($directory, 0755, true); $disk->makeDirectory($directory, 0755, true);
} }
@@ -887,21 +884,20 @@ class StickerMasterResource extends Resource
// $newFileName, // $newFileName,
// 'local' // 'local'
// ); // );
try try {
{
$path = $uploadedFile->storeAs( $path = $uploadedFile->storeAs(
$directory, $directory,
$newFileName, $newFileName,
'local' 'local'
); );
} } catch (\Exception $e) {
catch (\Exception $e) {
Notification::make() Notification::make()
->title('Upload Failed') ->title('Upload Failed')
->body("Failed to upload image: " . $e->getMessage()) ->body('Failed to upload image: '.$e->getMessage())
->danger() ->danger()
->seconds(3) ->seconds(3)
->send(); ->send();
return; return;
} }
@@ -909,26 +905,26 @@ class StickerMasterResource extends Resource
Notification::make() Notification::make()
->title('Success') ->title('Success')
->body("Uploaded part validation image successfully") ->body('Uploaded part validation image successfully')
->success() ->success()
->seconds(2) ->seconds(2)
->send(); ->send();
}) })
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view import part validation'); return Filament::auth()->user()->can('view import part validation');
}), }),
ImportAction::make() ImportAction::make()
->label('Import Sticker Masters') ->label('Import Sticker Masters')
->color('warning') ->color('warning')
->importer(StickerMasterImporter::class) ->importer(StickerMasterImporter::class)
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view import sticker master'); return Filament::auth()->user()->can('view import sticker master');
}), }),
ExportAction::make() ExportAction::make()
->label('Export Sticker Masters') ->label('Export Sticker Masters')
->color('warning') ->color('warning')
->exporter(StickerMasterExporter::class) ->exporter(StickerMasterExporter::class)
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view export sticker master'); return Filament::auth()->user()->can('view export sticker master');
}), }),
]); ]);