Added view rights against plant on view report and Updated alignment on resource
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s

This commit is contained in:
dhanabalan
2026-01-14 09:31:12 +05:30
parent 4a4259612b
commit f4a6496411

View File

@@ -5,31 +5,24 @@ namespace App\Filament\Resources;
use App\Filament\Exports\PalletValidationExporter; use App\Filament\Exports\PalletValidationExporter;
use App\Filament\Imports\PalletValidationImporter; use App\Filament\Imports\PalletValidationImporter;
use App\Filament\Resources\PalletValidationResource\Pages; use App\Filament\Resources\PalletValidationResource\Pages;
use App\Filament\Resources\PalletValidationResource\RelationManagers;
use App\Models\Item;
use App\Models\LocatorInvoiceValidation; use App\Models\LocatorInvoiceValidation;
use App\Models\PalletValidation; use App\Models\PalletValidation;
use App\Models\Plant; use App\Models\Plant;
use App\Models\StickerMaster;
use Filament\Facades\Filament; use Filament\Facades\Filament;
use Filament\Forms; use Filament\Forms;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Section; use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
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\Components\Actions;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Log;
use Filament\Tables\Actions\Action;
use Filament\Forms\Components\DateTimePicker;
use Filament\Tables\Filters\Filter;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
class PalletValidationResource extends Resource class PalletValidationResource extends Resource
{ {
@@ -55,6 +48,7 @@ class PalletValidationResource 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();
}) })
->afterStateUpdated(function ($state, callable $set) { ->afterStateUpdated(function ($state, callable $set) {
@@ -68,14 +62,13 @@ class PalletValidationResource extends Resource
->label('Scan Pallet No') ->label('Scan Pallet No')
->reactive() ->reactive()
->required() ->required()
->readonly() //fn ($get) => (bool)$get('pallet_number_locked') || $get('serial_number') || $get('removeSno_number') ->readonly() // fn ($get) => (bool)$get('pallet_number_locked') || $get('serial_number') || $get('removeSno_number')
->extraAttributes([ ->extraAttributes([
'x-data' => '{ value: "" }', 'x-data' => '{ value: "" }',
'x-model' => 'value', 'x-model' => 'value',
'x-on:keydown.enter.prevent' => '$wire.processPalletNo()', 'x-on:keydown.enter.prevent' => '$wire.processPalletNo()',
]) ])
->suffixAction(fn ($get,$set) => ->suffixAction(fn ($get, $set) => Forms\Components\Actions\Action::make('addPallet')
Forms\Components\Actions\Action::make('addPallet')
->label('') ->label('')
->button() ->button()
->icon('heroicon-o-plus') ->icon('heroicon-o-plus')
@@ -94,7 +87,7 @@ class PalletValidationResource extends Resource
$month = now()->format('m'); $month = now()->format('m');
$prefix = "EP-{$year}{$month}"; $prefix = "EP-{$year}{$month}";
$lastPallet1 = PalletValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first(); //->where('plant_id', $plantId) $lastPallet1 = PalletValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first(); // ->where('plant_id', $plantId)
$lastPallet2 = LocatorInvoiceValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first(); $lastPallet2 = LocatorInvoiceValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first();
$newNumber = '001'; // $lastPallet ? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) : '001'; $newNumber = '001'; // $lastPallet ? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) : '001';
if ($lastPallet1 && $lastPallet2) { if ($lastPallet1 && $lastPallet2) {
@@ -105,14 +98,12 @@ class PalletValidationResource extends Resource
} else { } else {
$newNumber = str_pad(intval($serialPart2) + 1, strlen($serialPart2), '0', STR_PAD_LEFT); $newNumber = str_pad(intval($serialPart2) + 1, strlen($serialPart2), '0', STR_PAD_LEFT);
} }
} } elseif ($lastPallet1) {
else if ($lastPallet1) {
$serialPart1 = substr($lastPallet1->pallet_number, strlen($prefix)); $serialPart1 = substr($lastPallet1->pallet_number, strlen($prefix));
// OR // OR
// $serialPart = str_replace($prefix, '', $lastPallet->pallet_number); // $serialPart = str_replace($prefix, '', $lastPallet->pallet_number);
$newNumber = str_pad(intval($serialPart1) + 1, strlen($serialPart1), '0', STR_PAD_LEFT); $newNumber = str_pad(intval($serialPart1) + 1, strlen($serialPart1), '0', STR_PAD_LEFT);
} } elseif ($lastPallet2) {
else if ($lastPallet2) {
$serialPart2 = substr($lastPallet2->pallet_number, strlen($prefix)); $serialPart2 = substr($lastPallet2->pallet_number, strlen($prefix));
// OR // OR
// $serialPart = str_replace($prefix, '', $lastPallet->pallet_number); // $serialPart = str_replace($prefix, '', $lastPallet->pallet_number);
@@ -133,7 +124,7 @@ class PalletValidationResource extends Resource
->label('Scan Serial No') ->label('Scan Serial No')
->reactive() ->reactive()
->minLength(9) ->minLength(9)
->readOnly(fn (callable $get) => !$get('pallet_number') || $get('removeSno_number')) ->readOnly(fn (callable $get) => ! $get('pallet_number') || $get('removeSno_number'))
->extraAttributes([ ->extraAttributes([
'x-on:keydown.enter.prevent' => '$wire.processPalletSNo()', 'x-on:keydown.enter.prevent' => '$wire.processPalletSNo()',
]), ]),
@@ -141,7 +132,7 @@ class PalletValidationResource extends Resource
->label('Remove Serial No') ->label('Remove Serial No')
->reactive() ->reactive()
->minLength(9) ->minLength(9)
->readOnly(fn (callable $get) => !$get('pallet_number') || $get('serial_number')) ->readOnly(fn (callable $get) => ! $get('pallet_number') || $get('serial_number'))
->extraAttributes([ ->extraAttributes([
'x-data' => '{ value: "" }', 'x-data' => '{ value: "" }',
'x-model' => 'value', 'x-model' => 'value',
@@ -169,12 +160,13 @@ class PalletValidationResource extends Resource
$plantId = $get('plant_id'); $plantId = $get('plant_id');
if (!$plantId) { if (! $plantId) {
return []; return [];
} }
return PalletValidation::query() return PalletValidation::query()
->where('plant_id', $plantId) ->where('plant_id', $plantId)
->where(function($query) { ->where(function ($query) {
$query->whereNull('pallet_status') $query->whereNull('pallet_status')
->orWhere('pallet_status', ''); ->orWhere('pallet_status', '');
}) })
@@ -182,11 +174,11 @@ class PalletValidationResource extends Resource
->orderBy('pallet_number', 'asc') ->orderBy('pallet_number', 'asc')
->pluck('pallet_number') ->pluck('pallet_number')
->unique() ->unique()
->mapWithKeys(fn($number) => [$number => $number]) ->mapWithKeys(fn ($number) => [$number => $number])
->toArray(); ->toArray();
}), }),
Forms\Components\View::make('forms.components.save-pallet-button') Forms\Components\View::make('forms.components.save-pallet-button'),
]) ])
->columns(5), ->columns(5),
Forms\Components\TextInput::make('id') Forms\Components\TextInput::make('id')
@@ -199,7 +191,6 @@ class PalletValidationResource 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')
@@ -212,6 +203,7 @@ class PalletValidationResource 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')
@@ -286,6 +278,7 @@ class PalletValidationResource extends Resource
// }) // })
->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()
@@ -306,19 +299,20 @@ class PalletValidationResource extends Resource
->label('Pallet Number') ->label('Pallet Number')
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
if (!$plantId) { if (! $plantId) {
return []; return [];
} }
return PalletValidation::where('plant_id', $plantId) return PalletValidation::where('plant_id', $plantId)
// ->whereNotNull('pallet_number') // ->whereNotNull('pallet_number')
// ->where('pallet_number', '!=', '') // ->where('pallet_number', '!=', '')
->where('pallet_number', 'like', 'EP-' . '%') ->where('pallet_number', 'like', 'EP-'.'%')
// ->where(function($query) { // ->where(function($query) {
// $query->where('pallet_number', '!=', null)->where('pallet_number', '!=', ''); // $query->where('pallet_number', '!=', null)->where('pallet_number', '!=', '');
// }) // })
->orderBy('pallet_number', 'desc') ->orderBy('pallet_number', 'desc')
->get() ->get()
//->unique('pallet_number') // ->unique('pallet_number')
->pluck('pallet_number', 'pallet_number') ->pluck('pallet_number', 'pallet_number')
->toArray(); ->toArray();
}) })
@@ -336,12 +330,13 @@ class PalletValidationResource extends Resource
->label('Locator Number') ->label('Locator Number')
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
if (!$plantId) { if (! $plantId) {
return []; return [];
} }
return PalletValidation::where('plant_id', $plantId) return PalletValidation::where('plant_id', $plantId)
->whereNotNull('locator_number') ->whereNotNull('locator_number')
->where('locator_number','!=', '') ->where('locator_number', '!=', '')
->orderBy('locator_number', 'asc') ->orderBy('locator_number', 'asc')
->get() ->get()
->unique('locator_number') ->unique('locator_number')
@@ -391,23 +386,29 @@ class PalletValidationResource 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']);
} else {
$userHas = Filament::auth()->user()->plant_id;
if ($userHas && strlen($userHas) > 0) {
return $query->whereRaw('1 = 0');
}
} }
if (!empty($data['pallet_number'])) { if (! empty($data['pallet_number'])) {
$query->where('pallet_number', $data['pallet_number']); $query->where('pallet_number', $data['pallet_number']);
} }
if (!empty($data['serial_number'])) { if (! empty($data['serial_number'])) {
$query->where('serial_number', $data['serial_number']); $query->where('serial_number', $data['serial_number']);
} }
if (!empty($data['pallet_status'])) { if (! empty($data['pallet_status'])) {
$query->where('pallet_status', $data['pallet_status']); $query->where('pallet_status', $data['pallet_status']);
} }
if (!empty($data['locator_number'])) { if (! empty($data['locator_number'])) {
$query->where('locator_number', $data['locator_number']); $query->where('locator_number', $data['locator_number']);
} }
@@ -415,87 +416,93 @@ class PalletValidationResource extends Resource
// $query->where('locator_quantity', $data['locator_quantity']); // $query->where('locator_quantity', $data['locator_quantity']);
// } // }
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) && if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { // isset($data['locator_quantity']) &&
$query->where('locator_quantity', $data['locator_quantity']);//(int) $query->where('locator_quantity', $data['locator_quantity']); // (int)
} }
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']);
} }
if (!empty($data['created_by'])) { if (! empty($data['created_by'])) {
$query->where('created_by', $data['created_by']); $query->where('created_by', $data['created_by']);
} }
if (!empty($data['scanned_from'])) { if (! empty($data['scanned_from'])) {
$query->where('scanned_at', '>=', $data['scanned_from']); $query->where('scanned_at', '>=', $data['scanned_from']);
} }
if (!empty($data['scanned_to'])) { if (! empty($data['scanned_to'])) {
$query->where('scanned_at', '<=', $data['scanned_to']); $query->where('scanned_at', '<=', $data['scanned_to']);
} }
if (!empty($data['scanned_by'])) { if (! empty($data['scanned_by'])) {
$query->where('scanned_by', $data['scanned_by']); $query->where('scanned_by', $data['scanned_by']);
} }
}) })
->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');
} else {
$userHas = Filament::auth()->user()->plant_id;
if ($userHas && strlen($userHas) > 0) {
return 'Plant: Choose plant to filter records.';
}
} }
if (!empty($data['pallet_number'])) { if (! empty($data['pallet_number'])) {
$indicators[] = 'Pallet Number: ' . $data['pallet_number']; $indicators[] = 'Pallet Number: '.$data['pallet_number'];
} }
if (!empty($data['serial_number'])) { if (! empty($data['serial_number'])) {
$indicators[] = 'Serial Number: ' . $data['serial_number']; $indicators[] = 'Serial Number: '.$data['serial_number'];
} }
if (!empty($data['pallet_status'])) { if (! empty($data['pallet_status'])) {
$indicators[] = 'Pallet Status: ' . $data['pallet_status']; $indicators[] = 'Pallet Status: '.$data['pallet_status'];
} }
if (!empty($data['locator_number'])) { if (! empty($data['locator_number'])) {
$indicators[] = 'Locator Number: ' . $data['locator_number']; $indicators[] = 'Locator Number: '.$data['locator_number'];
} }
// if (!empty($data['locator_quantity'])) { // if (!empty($data['locator_quantity'])) {
// $indicators[] = 'Locator Quantity: ' . $data['locator_quantity']; // $indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
// } // }
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) && if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { // isset($data['locator_quantity']) &&
$indicators[] = 'Locator Quantity: ' . $data['locator_quantity']; $indicators[] = 'Locator Quantity: '.$data['locator_quantity'];
} }
if (!empty($data['created_from'])) { if (! empty($data['created_from'])) {
$indicators[] = 'From: ' . $data['created_from']; $indicators[] = 'From: '.$data['created_from'];
} }
if (!empty($data['created_to'])) { if (! empty($data['created_to'])) {
$indicators[] = 'To: ' . $data['created_to']; $indicators[] = 'To: '.$data['created_to'];
} }
if (!empty($data['created_by'])) { if (! empty($data['created_by'])) {
$indicators[] = 'Created By: ' . $data['created_by']; $indicators[] = 'Created By: '.$data['created_by'];
} }
if (!empty($data['scanned_from'])) { if (! empty($data['scanned_from'])) {
$indicators[] = 'Scanned From: ' . $data['scanned_from']; $indicators[] = 'Scanned From: '.$data['scanned_from'];
} }
if (!empty($data['scanned_to'])) { if (! empty($data['scanned_to'])) {
$indicators[] = 'Scanned To: ' . $data['scanned_to']; $indicators[] = 'Scanned To: '.$data['scanned_to'];
} }
if (!empty($data['scanned_by'])) { if (! empty($data['scanned_by'])) {
$indicators[] = 'Scanned By: ' . $data['scanned_by']; $indicators[] = 'Scanned By: '.$data['scanned_by'];
} }
return $indicators; return $indicators;
}) }),
]) ])
->filtersFormMaxHeight('280px') ->filtersFormMaxHeight('280px')
->actions([ ->actions([
@@ -521,6 +528,7 @@ class PalletValidationResource extends Resource
// ->options(Plant::pluck('name', 'id')->toArray()) // ->options(Plant::pluck('name', 'id')->toArray())
->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();
}) })
->required() ->required()
@@ -532,18 +540,18 @@ class PalletValidationResource extends Resource
->required() ->required()
->reactive() ->reactive()
->columnSpan(1) ->columnSpan(1)
//->optionsLimit(500) // ->optionsLimit(500)
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('plant'); $plantId = $get('plant');
if (!$plantId) { if (! $plantId) {
return []; return [];
} }
return PalletValidation::query()->where('plant_id', $plantId) return PalletValidation::query()->where('plant_id', $plantId)
// ->whereNotNull('pallet_number') // ->whereNotNull('pallet_number')
// ->where('pallet_number', '!=', '') // ->where('pallet_number', '!=', '')
->where('pallet_number', 'like', 'EP-' . '%') ->where('pallet_number', 'like', 'EP-'.'%')
->select('pallet_number') ->select('pallet_number')
->distinct() ->distinct()
->orderBy('pallet_number', 'desc') ->orderBy('pallet_number', 'desc')
@@ -555,24 +563,25 @@ class PalletValidationResource extends Resource
]) ])
->action(function (array $data) { ->action(function (array $data) {
$selectedPalletNumber = $data['pallet_list']; $selectedPalletNumber = $data['pallet_list'];
return redirect()->route('download-reprint-qr-pdf', ['palletNo' => $selectedPalletNumber]); return redirect()->route('download-reprint-qr-pdf', ['palletNo' => $selectedPalletNumber]);
}) })
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view reprint pallet number'); return Filament::auth()->user()->can('view reprint pallet number');
}), }),
ImportAction::make() ImportAction::make()
->importer(PalletValidationImporter::class) ->importer(PalletValidationImporter::class)
->label('Import Pallet') ->label('Import Pallet')
->color('warning') ->color('warning')
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view import pallet validation'); return Filament::auth()->user()->can('view import pallet validation');
}), }),
ExportAction::make() ExportAction::make()
->exporter(PalletValidationExporter::class) ->exporter(PalletValidationExporter::class)
->label('Export Pallet') ->label('Export Pallet')
->color('warning') ->color('warning')
->visible(function() { ->visible(function () {
return Filament::auth()->user()->can('view export pallet validation'); return Filament::auth()->user()->can('view export pallet validation');
}), }),
]); ]);