Added view rights against plant on view report and Updated alignments and load available item code logic on resource
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s
This commit is contained in:
@@ -5,11 +5,15 @@ namespace App\Filament\Resources;
|
|||||||
use App\Filament\Exports\ProcessOrderExporter;
|
use App\Filament\Exports\ProcessOrderExporter;
|
||||||
use App\Filament\Imports\ProcessOrderImporter;
|
use App\Filament\Imports\ProcessOrderImporter;
|
||||||
use App\Filament\Resources\ProcessOrderResource\Pages;
|
use App\Filament\Resources\ProcessOrderResource\Pages;
|
||||||
|
use App\Models\Item;
|
||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use App\Models\ProcessOrder;
|
use App\Models\ProcessOrder;
|
||||||
use Filament\Facades\Filament;
|
use Filament\Facades\Filament;
|
||||||
use Filament\Forms;
|
use Filament\Forms;
|
||||||
use Filament\Forms\Components\Actions\Action;
|
use Filament\Forms\Components\Actions\Action;
|
||||||
|
use Filament\Forms\Components\DateTimePicker;
|
||||||
|
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\Get;
|
||||||
use Filament\Forms\Set;
|
use Filament\Forms\Set;
|
||||||
@@ -18,19 +22,13 @@ 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 Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
|
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
|
||||||
use Smalot\PdfParser\Parser;
|
use Smalot\PdfParser\Parser;
|
||||||
use Storage;
|
use Storage;
|
||||||
use Filament\Forms\Components\DateTimePicker;
|
|
||||||
use Filament\Tables\Filters\Filter;
|
|
||||||
use Filament\Forms\Components\Select;
|
|
||||||
use App\Models\Line;
|
|
||||||
use Filament\Forms\Components\TextInput;
|
|
||||||
use App\Models\Item;
|
|
||||||
use App\Models\User;
|
|
||||||
|
|
||||||
// use App\Models\PalletValidation;
|
// use App\Models\PalletValidation;
|
||||||
// use Dom\Text;
|
// use Dom\Text;
|
||||||
@@ -173,16 +171,16 @@ class ProcessOrderResource extends Resource
|
|||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$itemId = $get('item_id');
|
$itemId = $get('item_id');
|
||||||
$processOrder = $value;
|
$processOrder = $value;
|
||||||
//$currentId = $get('id'); // current editing record id
|
// $currentId = $get('id'); // current editing record id
|
||||||
|
|
||||||
if (! $plantId || ! $processOrder) {
|
if (! $plantId || ! $processOrder) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$existing = ProcessOrder::where('plant_id', $plantId)
|
$existing = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->where('item_id', '!=', $itemId)
|
->where('item_id', '!=', $itemId)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($existing) {
|
if ($existing) {
|
||||||
|
|
||||||
@@ -288,14 +286,14 @@ class ProcessOrderResource extends Resource
|
|||||||
->disk('local')
|
->disk('local')
|
||||||
->directory('uploads/temp')
|
->directory('uploads/temp')
|
||||||
->preserveFilenames()
|
->preserveFilenames()
|
||||||
->visible(function() {
|
->visible(function () {
|
||||||
return Filament::auth()->user()->can('view process order packing slip');
|
return Filament::auth()->user()->can('view process order packing slip');
|
||||||
})
|
})
|
||||||
->reactive(),
|
->reactive(),
|
||||||
Forms\Components\Actions::make([
|
Forms\Components\Actions::make([
|
||||||
Action::make('uploadNow')
|
Action::make('uploadNow')
|
||||||
->label('Upload PDF Now')
|
->label('Upload PDF Now')
|
||||||
->visible(function() {
|
->visible(function () {
|
||||||
return Filament::auth()->user()->can('view process order packing slip');
|
return Filament::auth()->user()->can('view process order packing slip');
|
||||||
})
|
})
|
||||||
->action(function ($get, callable $set) {
|
->action(function ($get, callable $set) {
|
||||||
@@ -385,7 +383,7 @@ class ProcessOrderResource extends Resource
|
|||||||
|
|
||||||
Action::make('downloadAttachment')
|
Action::make('downloadAttachment')
|
||||||
->label('Download PDF')
|
->label('Download PDF')
|
||||||
->visible(function() {
|
->visible(function () {
|
||||||
return Filament::auth()->user()->can('view process order packing slip');
|
return Filament::auth()->user()->can('view process order packing slip');
|
||||||
})
|
})
|
||||||
->action(function ($get) {
|
->action(function ($get) {
|
||||||
@@ -482,6 +480,7 @@ class ProcessOrderResource 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')
|
||||||
@@ -561,133 +560,141 @@ class ProcessOrderResource 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')
|
Filter::make('advanced_filters')
|
||||||
->label('Advanced Filters')
|
->label('Advanced Filters')
|
||||||
->form([
|
->form([
|
||||||
Select::make('Plant')
|
Select::make('Plant')
|
||||||
->label('Select Plant')
|
->label('Select Plant')
|
||||||
->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()
|
})
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->reactive()
|
||||||
$set('Item', null);
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
}),
|
$set('Item', null);
|
||||||
Select::make('Item')
|
}),
|
||||||
->label('Item Code')
|
Select::make('Item')
|
||||||
->nullable()
|
->label('Search by Item Code')
|
||||||
->searchable()
|
->nullable()
|
||||||
->options(function (callable $get) {
|
->searchable()
|
||||||
|
->reactive()
|
||||||
|
->options(function (callable $get) {
|
||||||
$plantId = $get('Plant');
|
$plantId = $get('Plant');
|
||||||
|
|
||||||
if(empty($plantId)) {
|
return Item::whereHas('processOrders', function ($query) use ($plantId) {
|
||||||
return [];
|
if ($plantId) {
|
||||||
}
|
$query->where('plant_id', $plantId);
|
||||||
|
}
|
||||||
return Item::where('plant_id', $plantId)->pluck('code', 'id');
|
})->pluck('code', 'id');
|
||||||
|
|
||||||
//return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
|
||||||
})
|
})
|
||||||
->reactive()
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
$set('process_order', null);
|
||||||
$set('process_order', null);
|
}),
|
||||||
}),
|
TextInput::make('process_order')
|
||||||
TextInput::make('process_order')
|
->label('Process Order')
|
||||||
->label('Process Order')
|
->placeholder('Enter Process Order'),
|
||||||
->placeholder('Enter Process Order'),
|
TextInput::make('sfg_number')
|
||||||
TextInput::make('sfg_number')
|
->label('Sfg Number')
|
||||||
->label('Sfg Number')
|
->placeholder(placeholder: 'Enter Sfg Number'),
|
||||||
->placeholder(placeholder: 'Enter Sfg Number'),
|
TextInput::make('machine_name')
|
||||||
TextInput::make('machine_name')
|
->label('Machine Name')
|
||||||
->label('Machine Name')
|
->placeholder(placeholder: 'Enter Machine Name'),
|
||||||
->placeholder(placeholder: 'Enter Machine Name'),
|
DateTimePicker::make(name: 'created_from')
|
||||||
DateTimePicker::make(name: 'created_from')
|
->label('Created From')
|
||||||
->label('Created From')
|
->placeholder(placeholder: 'Select From DateTime')
|
||||||
->placeholder(placeholder: 'Select From DateTime')
|
->reactive()
|
||||||
->reactive()
|
->native(false),
|
||||||
->native(false),
|
DateTimePicker::make('created_to')
|
||||||
DateTimePicker::make('created_to')
|
->label('Created To')
|
||||||
->label('Created To')
|
->placeholder(placeholder: 'Select To DateTime')
|
||||||
->placeholder(placeholder: 'Select To DateTime')
|
->reactive()
|
||||||
->reactive()
|
->native(false),
|
||||||
->native(false),
|
])
|
||||||
])
|
->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 (empty($data['Plant']) && empty($data['Item']) && empty($data['process_order']) && empty($data['sfg_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['machine_name'])) {
|
||||||
if (empty($data['Plant']) && empty($data['Item']) && empty($data['process_order']) && empty($data['sfg_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['machine_name'])) {
|
return $query->whereRaw('1 = 0');
|
||||||
return $query->whereRaw('1 = 0');
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['Plant'])) {
|
if (! empty($data['Plant'])) {
|
||||||
$query->where('plant_id', $data['Plant']);
|
$query->where('plant_id', $data['Plant']);
|
||||||
}
|
} else {
|
||||||
|
$userHas = Filament::auth()->user()->plant_id;
|
||||||
|
|
||||||
if (!empty($data['Item'])) {
|
if ($userHas && strlen($userHas) > 0) {
|
||||||
$query->where('item_id', $data['Item']);
|
return $query->whereRaw('1 = 0');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($data['process_order'])) {
|
if (! empty($data['Item'])) {
|
||||||
$query->where('process_order', $data['process_order']);
|
$query->where('item_id', $data['Item']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($data['sfg_number'])) {
|
if (! empty($data['process_order'])) {
|
||||||
$query->where('sfg_number', $data['sfg_number']);
|
$query->where('process_order', $data['process_order']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($data['machine_name'])) {
|
if (! empty($data['sfg_number'])) {
|
||||||
// $query->where('machine_name', $data['machine_name']);
|
$query->where('sfg_number', $data['sfg_number']);
|
||||||
$query->where('machine_name', 'like', '%' . $data['machine_name'] . '%');
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['created_from'])) {
|
if (! empty($data['machine_name'])) {
|
||||||
$query->where('created_at', '>=', $data['created_from']);
|
// $query->where('machine_name', $data['machine_name']);
|
||||||
}
|
$query->where('machine_name', 'like', '%'.$data['machine_name'].'%');
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($data['created_to'])) {
|
if (! empty($data['created_from'])) {
|
||||||
$query->where('created_at', '<=', $data['created_to']);
|
$query->where('created_at', '>=', $data['created_from']);
|
||||||
}
|
}
|
||||||
//$query->orderBy('created_at', 'asc');
|
|
||||||
})
|
|
||||||
->indicateUsing(function (array $data) {
|
|
||||||
$indicators = [];
|
|
||||||
|
|
||||||
if (!empty($data['Plant'])) {
|
if (! empty($data['created_to'])) {
|
||||||
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
|
$query->where('created_at', '<=', $data['created_to']);
|
||||||
}
|
}
|
||||||
|
// $query->orderBy('created_at', 'asc');
|
||||||
|
})
|
||||||
|
->indicateUsing(function (array $data) {
|
||||||
|
$indicators = [];
|
||||||
|
|
||||||
if (!empty($data['Item'])) {
|
if (! empty($data['Plant'])) {
|
||||||
$indicators[] = 'Item: ' . Item::where('id', $data['Item'])->value('code');
|
$indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name');
|
||||||
}
|
} else {
|
||||||
|
$userHas = Filament::auth()->user()->plant_id;
|
||||||
|
|
||||||
if (!empty($data['process_order'])) {
|
if ($userHas && strlen($userHas) > 0) {
|
||||||
$indicators[] = 'Process Order: ' . $data['process_order'];
|
return 'Plant: Choose plant to filter records.';
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($data['sfg_number'])) {
|
if (! empty($data['Item'])) {
|
||||||
$indicators[] = 'Sfg Number: ' . $data['sfg_number'];
|
$indicators[] = 'Item: '.Item::where('id', $data['Item'])->value('code');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($data['machine_name'])) {
|
if (! empty($data['process_order'])) {
|
||||||
$indicators[] = 'Machine Name: ' . $data['machine_name'];
|
$indicators[] = 'Process Order: '.$data['process_order'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($data['created_from'])) {
|
if (! empty($data['sfg_number'])) {
|
||||||
$indicators[] = 'From: ' . $data['created_from'];
|
$indicators[] = 'Sfg Number: '.$data['sfg_number'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($data['created_to'])) {
|
if (! empty($data['machine_name'])) {
|
||||||
$indicators[] = 'To: ' . $data['created_to'];
|
$indicators[] = 'Machine Name: '.$data['machine_name'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $indicators;
|
if (! empty($data['created_from'])) {
|
||||||
})
|
$indicators[] = 'From: '.$data['created_from'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! empty($data['created_to'])) {
|
||||||
|
$indicators[] = 'To: '.$data['created_to'];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $indicators;
|
||||||
|
}),
|
||||||
])
|
])
|
||||||
->filtersFormMaxHeight('280px')
|
->filtersFormMaxHeight('280px')
|
||||||
->actions([
|
->actions([
|
||||||
@@ -730,16 +737,16 @@ class ProcessOrderResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->searchable()
|
->searchable()
|
||||||
->options(function (callable $get) {
|
->options(function (callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
|
|
||||||
if(empty($plantId)) {
|
if (empty($plantId)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
return Item::where('plant_id', $plantId)->pluck('code', 'id');
|
return Item::where('plant_id', $plantId)->pluck('code', 'id');
|
||||||
|
|
||||||
//return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
||||||
})
|
})
|
||||||
->reactive()
|
->reactive()
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
$set('process_order', null);
|
$set('process_order', null);
|
||||||
@@ -763,30 +770,31 @@ class ProcessOrderResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->searchable()
|
->searchable()
|
||||||
->options(function (callable $get) {
|
->options(function (callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
$itemId = $get('Item');
|
$itemId = $get('Item');
|
||||||
$processOrder = $get('process_order');
|
$processOrder = $get('process_order');
|
||||||
|
|
||||||
if(empty($plantId) || empty($itemId) || empty($processOrder)) {
|
if (empty($plantId) || empty($itemId) || empty($processOrder)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
return ProcessOrder::where('plant_id', $plantId)
|
return ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('item_id', $itemId)
|
->where('item_id', $itemId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->pluck('coil_number', 'coil_number');
|
->pluck('coil_number', 'coil_number');
|
||||||
|
|
||||||
//return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
||||||
})
|
})
|
||||||
->reactive()
|
->reactive()
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
$itemId = $get('Item');
|
$itemId = $get('Item');
|
||||||
$processOrder = $get('process_order');
|
$processOrder = $get('process_order');
|
||||||
|
|
||||||
if(!$plantId || !$itemId || !$processOrder || !$state) {
|
if (! $plantId || ! $itemId || ! $processOrder || ! $state) {
|
||||||
$set('received_quantity', null);
|
$set('received_quantity', null);
|
||||||
$set('machine_name', null);
|
$set('machine_name', null);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -815,12 +823,13 @@ class ProcessOrderResource extends Resource
|
|||||||
// })
|
// })
|
||||||
->action(function (array $data) {
|
->action(function (array $data) {
|
||||||
$username = Filament::auth()->user()->name;
|
$username = Filament::auth()->user()->name;
|
||||||
|
|
||||||
return redirect()->route('download-reprint-process-pdf', [
|
return redirect()->route('download-reprint-process-pdf', [
|
||||||
'plant' => $data['plant'],
|
'plant' => $data['plant'],
|
||||||
'item' => $data['Item'],
|
'item' => $data['Item'],
|
||||||
'process_order' => $data['process_order'],
|
'process_order' => $data['process_order'],
|
||||||
'coil_number' => $data['coil_number'],
|
'coil_number' => $data['coil_number'],
|
||||||
'name' => $username,
|
'name' => $username,
|
||||||
]);
|
]);
|
||||||
})
|
})
|
||||||
->visible(function () {
|
->visible(function () {
|
||||||
|
|||||||
Reference in New Issue
Block a user