Merge pull request 'removed sticker mapping migration file' (#58) from ranjith-dev into master

Reviewed-on: #58

app/Exports/ProductionPlanExport.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Exports;
-
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\FromArray;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-
-class ProductionPlanExport implements FromArray, WithHeadings, WithMapping
-{
-
-    protected array $data;
-    protected array $dates;
-
-    public function __construct(array $data, array $dates)
-    {
-        $this->data = $data;
-        $this->dates = $dates;
-    }
-
-    public function array(): array
-    {
-        return $this->data;
-    }
-
-    public function headings(): array
-    {
-        $headings = [
-            'Plant Name',
-            'Line Name',
-            'Item Code',
-        ];
-
-        // Add dynamic headings for each date: Target / Produced
-        foreach ($this->dates as $date) {
-            $headings[] = $date . ' - Target Plan';
-            $headings[] = $date . ' - Produced Quantity';
-        }
-
-        return $headings;
-    }
-
-    public function map($row): array
-    {
-         $mapped = [
-            $row['plant_name'] ?? '',
-            $row['line_name'] ?? '',
-            $row['item_code'] ?? '',
-        ];
-
-        // Add daily target and produced quantity for each date
-        foreach ($this->dates as $date) {
-            // $mapped[] = $row['daily_target_dynamic'] ?? 0;
-            $mapped[] = $row['daily_target_dynamic'][$date] ?? '-';
-            $mapped[] = $row['produced_quantity'][$date] ?? 0;
-        }
-
-        return $mapped;
-    }
-
-}

app/Filament/Exports/StickerDetailExporter.php

@@ -29,8 +29,6 @@ class StickerDetailExporter extends Exporter
             ->label('ELEMENT ID'),
             ExportColumn::make('element_type')
             ->label('ELEMENT TYPE'),
-            ExportColumn::make('characteristics_type')
-            ->label('CHARACTERISTICS TYPE'),
             ExportColumn::make('string_value')
             ->label('STRING VALUE'),
             ExportColumn::make('string_font')
@@ -49,8 +47,6 @@ class StickerDetailExporter extends Exporter
             ->label('SHAPE NAME'),
             ExportColumn::make('shape_pen_size')
             ->label('SHAPE PEN SIZE'),
-            ExportColumn::make('curve_radius')
-            ->label('CURVE RADIUS'),
             ExportColumn::make('shape_x1_value')
             ->label('SHAPE X1 VALUE'),
             ExportColumn::make('shape_y1_value')
@@ -59,6 +55,10 @@ class StickerDetailExporter extends Exporter
             ->label('SHAPE X2 VALUE'),
             ExportColumn::make('shape_y2_value')
             ->label('SHAPE Y2 VALUE'),
+            ExportColumn::make('image_path')
+            ->label('IMAGE PATH'),
+            ExportColumn::make('image_type')
+            ->label('IMAGE TYPE'),
             ExportColumn::make('image_x')
             ->label('IMAGE X'),
             ExportColumn::make('image_y')

app/Filament/Exports/StickerMappingMasterExporter.php

@@ -21,117 +21,28 @@ class StickerMappingMasterExporter extends Exporter
                     // Increment and return the row number
                     return ++$rowNumber;
                 }),
-            ExportColumn::make('plant.code')
-            ->label('PLANT CODE'),
-            ExportColumn::make('itemCharacteristic.item.code')
+            ExportColumn::make('plant.name')
+            ->label('PLANT'),
+            ExportColumn::make('item.code')
             ->label('ITEM CODE'),
-            ExportColumn::make('sticker_structure1_id')
-            ->label('STICKER 1')
-            ->getStateUsing(function ($record) {
-                return $record->sticker1Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker1_machine_id')
-            ->label('WC STICKER 1')
-            ->getStateUsing(function ($record) {
-                return $record->sticker1Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker1_print_ip')
-            ->label('STICKER 1 PRINT IP'),
-            ExportColumn::make('sticker_structure2_id')
-            ->label('STICKER 2')
-            ->getStateUsing(function ($record) {
-                return $record->sticker2Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker2_machine_id')
-            ->label('WC STICKER 2')
-            ->getStateUsing(function ($record) {
-                return $record->sticker2Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker2_print_ip')
-            ->label('STICKER 2 PRINT IP'),
-            ExportColumn::make('sticker_structure3_id')
-            ->label('STICKER 3')
-            ->getStateUsing(function ($record) {
-                return $record->sticker3Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker3_machine_id')
-            ->label('WC STICKER 3')
-            ->getStateUsing(function ($record) {
-                return $record->sticker3Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker3_print_ip')
-            ->label('STICKER 3 PRINT IP'),
-            ExportColumn::make('sticker_structure4_id')
-            ->label('STICKER 4')
-            ->getStateUsing(function ($record) {
-                return $record->sticker4Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker4_machine_id')
-            ->label('WC STICKER 4')
-            ->getStateUsing(function ($record) {
-                return $record->sticker4Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker4_print_ip')
-            ->label('STICKER 4 PRINT IP'),
-            ExportColumn::make('sticker_structure5_id')
-            ->label('STICKER 5')
-            ->getStateUsing(function ($record) {
-                return $record->sticker5Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker5_machine_id')
-            ->label('WC STICKER 5')
-            ->getStateUsing(function ($record) {
-                return $record->sticker5Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker5_print_ip')
-            ->label('STICKER 5 PRINT IP'),
-            ExportColumn::make('sticker_structure6_id')
-            ->label('STICKER 6')
-            ->getStateUsing(function ($record) {
-                return $record->sticker6Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker6_machine_id')
-            ->label('WC STICKER 6')
-            ->getStateUsing(function ($record) {
-                return $record->sticker6Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker6_print_ip')
-            ->label('STICKER 6 PRINT IP'),
-            ExportColumn::make('sticker_structure7_id')
-            ->label('STICKER 7')
-            ->getStateUsing(function ($record) {
-                return $record->sticker7Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker7_machine_id')
-            ->label('WC STICKER 7')
-            ->getStateUsing(function ($record) {
-                return $record->sticker2Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker7_print_ip')
-            ->label('STICKER 7 PRINT IP'),
-            ExportColumn::make('sticker_structure8_id')
-            ->label('STICKER 8')
-            ->getStateUsing(function ($record) {
-                return $record->sticker8Structure?->sticker_id ?? '-';
-            }),
-            ExportColumn::make('sticker8_machine_id')
-            ->label('WC STICKER 8')
-            ->getStateUsing(function ($record) {
-                return $record->sticker8Machine?->work_center ?? '-';
-            }),
-            ExportColumn::make('sticker8_print_ip')
-            ->label('STICKER 8 PRINT IP'),
+            ExportColumn::make('sticker1')
+            ->label('STICKER LABEL 1'),
+            ExportColumn::make('sticker2')
+            ->label('STICKER LABEL 2'),
+            ExportColumn::make('sticker3')
+            ->label('STICKER LABEL 3'),
+            ExportColumn::make('sticker4')
+            ->label('STICKER LABEL 4'),
+            ExportColumn::make('sticker5')
+            ->label('STICKER LABEL 5'),
             ExportColumn::make('created_at')
             ->label('CREATED AT'),
             ExportColumn::make('updated_at')
             ->label('UPDATED AT'),
             ExportColumn::make('created_by')
             ->label('CREATED BY'),
-            ExportColumn::make('updated_by')
-            ->label('UPDATED BY'),
-            ExportColumn::make('deleted_at')
-            ->enabledByDefault(false)
-            ->label('DELETED AT'),
+            ExportColumn::make('updated_by'),
+            ExportColumn::make('deleted_at'),
         ];
     }
 

app/Filament/Exports/StickerStructureDetailExporter.php

@@ -13,43 +13,21 @@ class StickerStructureDetailExporter extends Exporter
 
     public static function getColumns(): array
     {
-        static $rowNumber = 0;
         return [
-            ExportColumn::make('no')
-                ->label('NO')
-                ->state(function ($record) use (&$rowNumber) {
-                    // Increment and return the row number
-                    return ++$rowNumber;
-                }),
-            ExportColumn::make('plant.code')
-            ->label('PLANT CODE'),
-            ExportColumn::make('itemCharacteristic.item.code')
-            ->label('ITEM CODE'),
-            ExportColumn::make('sticker_id')
-            ->label('STICKER ID'),
-            ExportColumn::make('sticker_width')
-            ->label('STICKER WIDTH'),
-            ExportColumn::make('sticker_height')
-            ->label('STICKER HEIGHT'),
-            ExportColumn::make('sticker_lmargin')
-            ->label('STICKER LEFT MARGIN'),
-            ExportColumn::make('sticker_rmargin')
-            ->label('STICKER RIGHT MARGIN'),
-            ExportColumn::make('sticker_tmargin')
-            ->label('STICKER TOP MARGIN'),
-            ExportColumn::make('sticker_bmargin')
-            ->label('STICKER BOTTOM MARGIN'),
-            ExportColumn::make('created_at')
-            ->label('CREATED AT'),
-            ExportColumn::make('updated_at')
-            ->label('UPDATED AT'),
-            ExportColumn::make('created_by')
-            ->label('CREATED BY'),
-            ExportColumn::make('updated_by')
-            ->label('UPDATED BY'),
-            ExportColumn::make('deleted_at')
-            ->enabledByDefault(false)
-            ->label('DELETED AT'),
+            ExportColumn::make('id')
+                ->label('ID'),
+            ExportColumn::make('sticker_id'),
+            ExportColumn::make('sticker_width'),
+            ExportColumn::make('sticker_height'),
+            ExportColumn::make('sticker_lmargin'),
+            ExportColumn::make('sticker_rmargin'),
+            ExportColumn::make('sticker_tmargin'),
+            ExportColumn::make('sticker_bmargin'),
+            ExportColumn::make('created_at'),
+            ExportColumn::make('updated_at'),
+            ExportColumn::make('created_by'),
+            ExportColumn::make('updated_by'),
+            ExportColumn::make('deleted_at'),
         ];
     }
 

app/Filament/Imports/ProductionPlanImporter.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Imports;
 
 use App\Models\Block;
-use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProductionPlan;
@@ -24,33 +23,11 @@ class ProductionPlanImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            // ImportColumn::make('created_at')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Created DateTime')
-            //     ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
-            //     ->label('Created DateTime')
-            //     ->rules(['required']),
-
-            ImportColumn::make('plant')
+            ImportColumn::make('created_at')
                 ->requiredMapping()
-                ->exampleHeader('Plant Code')
-                ->example(['1000', '1000'])
-                ->label('Plant Code')
-                ->relationship(resolveUsing: 'code')
-                ->rules(['required']),
-            ImportColumn::make('line')
-                ->requiredMapping()
-                ->exampleHeader('Line Name')
-                ->example(['4 inch pump line', '4 inch pump line'])
-                ->label('Line Name')
-                ->relationship(resolveUsing: 'name')
-                ->rules(['required']),
-            ImportColumn::make('item')
-                ->requiredMapping()
-                ->exampleHeader('Item Code')
-                ->example(['123456', '210987'])
-                ->label('Item Code')
-                ->relationship(resolveUsing: 'code')
+                ->exampleHeader('Created DateTime')
+                ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
+                ->label('Created DateTime')
                 ->rules(['required']),
             ImportColumn::make('plan_quantity')
                 ->requiredMapping()
@@ -59,111 +36,175 @@ class ProductionPlanImporter extends Importer
                 ->label('Plan Quantity')
                 ->numeric()
                 ->rules(['required', 'integer']),
-            // ImportColumn::make('production_quantity')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Production Quantity')
-            //     ->example(['0', '0'])
-            //     ->label('Production Quantity')
-            //     ->numeric()
-            //     ->rules(['required', 'integer']),
-
-            // ImportColumn::make('block_reference')
-            //     ->requiredMapping() // Or optionalMapping() if not always present
-            //     ->exampleHeader('Block Name')
-            //     ->example(['Block A', 'Block A'])
-            //     ->label('Block Name')
-            //     ->rules(['required']), // Or remove if not required
-            // ImportColumn::make('shift')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Shift Name') // ID
-            //     ->example(['Day', 'Night']) // '2', '7'
-            //     ->label('Shift Name') // ID
-            //     ->relationship(resolveUsing: 'name')
-            //     ->rules(['required']),
-
-            // ImportColumn::make('updated_at')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Updated DateTime')
-            //     ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
-            //     ->label('Updated DateTime')
-            //     ->rules(['required']),
-            // ImportColumn::make('operator_id')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Operator ID')
-            //     ->example([Filament::auth()->user()->name, Filament::auth()->user()->name])
-            //     ->label('Operator ID')
-            //     ->rules(['required']),
+            ImportColumn::make('production_quantity')
+                ->requiredMapping()
+                ->exampleHeader('Production Quantity')
+                ->example(['0', '0'])
+                ->label('Production Quantity')
+                ->numeric()
+                ->rules(['required', 'integer']),
+            ImportColumn::make('line')
+                ->requiredMapping()
+                ->exampleHeader('Line Name')
+                ->example(['4 inch pump line', '4 inch pump line'])
+                ->label('Line Name')
+                ->relationship(resolveUsing:'name')
+                ->rules(['required']),
+            ImportColumn::make('block_reference')
+                ->requiredMapping() // Or optionalMapping() if not always present
+                ->exampleHeader('Block Name')
+                ->example(['Block A', 'Block A'])
+                ->label('Block Name')
+                ->rules(['required']), // Or remove if not required
+            ImportColumn::make('shift')
+                ->requiredMapping()
+                ->exampleHeader('Shift Name') //ID
+                ->example(['Day', 'Night']) //'2', '7'
+                ->label('Shift Name') // ID
+                ->relationship(resolveUsing: 'name')
+                ->rules(['required']),
+            ImportColumn::make('plant')
+                ->requiredMapping()
+                ->exampleHeader('Plant Name')
+                ->example(['Ransar Industries-I', 'Ransar Industries-I'])
+                ->label('Plant Name')
+                ->relationship(resolveUsing:'name')
+                ->rules(['required']),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->exampleHeader('Updated DateTime')
+                ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
+                ->label('Updated DateTime')
+                ->rules(['required']),
+            ImportColumn::make('operator_id')
+                ->requiredMapping()
+                ->exampleHeader('Operator ID')
+                ->example([Filament::auth()->user()->name, Filament::auth()->user()->name])
+                ->label('Operator ID')
+                ->rules(['required']),
         ];
     }
 
     public function resolveRecord(): ?ProductionPlan
     {
         $warnMsg = [];
-        $plantCod = $this->data['plant'];
-        $itemCod = $this->data['item'];
-        $plant = null;
+        $plant = Plant::where('name', $this->data['plant'])->first();
         $line = null;
         $block = null;
-
-        if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
-            $warnMsg[] = 'Invalid plant code found';
-        } else {
-            $plant = Plant::where('code', $plantCod)->first();
+        if (!$plant) {
+            $warnMsg[] = "Plant not found";
         }
-
-        if (! $plant) {
-            $warnMsg[] = 'Plant not found';
-        } else {
+        else {
             $line = Line::where('name', $this->data['line'])->where('plant_id', $plant->id)->first();
+            //block_reference
+            $block = Block::where('name', $this->data['block_reference'])->where('plant_id', $plant->id)->first();
+        }
+        if (!$line) {
+            $warnMsg[] = "Line not found";
+        }
+        $shift = null;
+        if (!$block) {
+            $warnMsg[] = "Block not found";
+        }
+        else {
+            $shift = Shift::where('name', $this->data['shift'])->where('plant_id', $plant->id)->where('block_id', $block->id)->first();
+        }
+        //$shift = Shift::where('id', $this->data['shift'])->where('plant_id', $plant->id)->first();
+        if (!$shift) {
+            $warnMsg[] = "Shift not found";
+        }
+        if (Str::length($this->data['plan_quantity']) < 0 || !is_numeric($this->data['plan_quantity']) || $this->data['plan_quantity'] <= 0) {
+            $warnMsg[] = "Invalid plan quantity found";
+        }
+        if (Str::length($this->data['production_quantity']) < 0 || !is_numeric($this->data['production_quantity']) || $this->data['production_quantity'] < 0) {
+            $warnMsg[] = "Invalid production quantity found";
         }
 
-        if (! $line) {
-            $warnMsg[] = 'Line not found';
+        $fromDate = $this->data['created_at'];
+        $toDate = $this->data['updated_at'];
+
+        $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+        $fdateTime = null;
+        $tdateTime = null;
+        // Try parsing with multiple formats
+        foreach ($formats as $format) {
+            try {
+                $fdateTime = Carbon::createFromFormat($format, $fromDate);
+                break;
+            } catch (\Exception $e) {
+                // Optionally collect warning messages
+                // $warnMsg[] = "Date format mismatch with format: $format";
+            }
         }
 
-        if (Str::length($itemCod) < 6 || ! is_numeric($itemCod)) {
-            $warnMsg[] = 'Invalid item code found';
-        } else {
-            $item = Item::where('code', $itemCod)->first();
+        foreach ($formats as $format) {
+            try {
+                $tdateTime = Carbon::createFromFormat($format, $toDate);
+                break;
+            } catch (\Exception $e) {
+                // Optionally collect warning messages
+                // $warnMsg[] = "Date format mismatch with format: $format";
+            }
         }
 
-        if (! $item) {
-            $warnMsg[] = 'Item not found';
+        $fDateOnly = '';
+        if (!isset($fdateTime)) {
+            // throw new \Exception('Invalid date time format');
+            $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        }
+        else {
+            $fDateOnly = $fdateTime->toDateString();
+        }
+        if (!isset($tdateTime)) {
+            $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
         }
 
-        $plantId = $plant->id;
-
-        $itemAgaPlant = Item::where('plant_id', $plantId)->where('code', $itemCod)->first();
-
-        if(!$itemAgaPlant){
-            $warnMsg[] = 'Item not found against plant code';
+        if (isset($fdateTime) && isset($tdateTime)) {
+            if ($fdateTime->greaterThan($tdateTime)) {
+                $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+            }
         }
 
-        $user = Filament::auth()->user();
+        // if (!$fromDate) {
+        //     $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        // }
+        // else if (!$toDate) {
+        //     $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        // }
 
-        $operatorName = $user->name;
-
-        if (Str::length($this->data['plan_quantity']) < 0 || ! is_numeric($this->data['plan_quantity']) || $this->data['plan_quantity'] <= 0) {
-            $warnMsg[] = 'Invalid plan quantity found';
+        $user = User::where('name', $this->data['operator_id'])->first();
+        if (!$user) {
+            $warnMsg[] = "Operator ID not found";
         }
 
-        if (! empty($warnMsg)) {
+        if (!empty($warnMsg)) {
             throw new RowImportFailedException(implode(', ', $warnMsg));
-        } else {
+        }
+        else { //if (empty($warnMsg))
             $productionPlan = ProductionPlan::where('plant_id', $plant->id)
-                ->where('line_id', $line->id)
-                ->where('item_id', $itemAgaPlant->id)
-                ->latest()
-                ->first();
+            ->where('shift_id', $shift->id)
+            ->where('line_id', $line->id)
+            ->whereDate('created_at', $fDateOnly)
+            // ->where('plan_quantity', $productionQuantity->plan_quantity)
+            ->latest()
+            ->first();
 
             if ($productionPlan) {
+                // if($productionPlan->production_quantity)
+                // {
+                //     throw new RowImportFailedException("{$productionPlan->created_at}, {$productionPlan->production_quantity}");
+                // }
+                // $warnMsg[] = "Production plan already exist on '{$fDateOnly}'!";
 
                 $productionPlan->update([
                     'plan_quantity' => $this->data['plan_quantity'],
-                    'operator_id' => $operatorName,
+                    // 'production_quantity' => $productionPlan->production_quantity,
+                    // 'created_at' => $productionPlan->created_at,//$fdateTime->format('Y-m-d H:i:s'),
+                    // 'updated_at' => $tdateTime->format('Y-m-d H:i:s'),
+                    'operator_id' => $this->data['operator_id'],
                 ]);
                 $productionPlan->save();
-
                 return null;
             }
         }
@@ -171,23 +212,28 @@ class ProductionPlanImporter extends Importer
         ProductionPlan::updateOrCreate([
             'plant_id' => $plant->id,
             'line_id' => $line->id,
-            'item_id' => $itemAgaPlant->id,
-            // 'shift_id' => $shift->id,
+            'shift_id' => $shift->id,
             'plan_quantity' => $this->data['plan_quantity'],
-            'created_at' =>now(),
-            'updated_at' => now(),
-            'operator_id' => $operatorName,
+            'production_quantity' => $this->data['production_quantity'],
+            'created_at' => $fdateTime->format('Y-m-d H:i:s'),//$this->data['created_at'],
+            'updated_at' => $tdateTime->format('Y-m-d H:i:s'),//$this->data['updated_at'],
+            'operator_id' => $this->data['operator_id'],
         ]);
-
         return null;
+        // return ProductionPlan::firstOrNew([
+        //     // Update existing records, matching them by `$this->data['column_name']`
+        //     'email' => $this->data['email'],
+        // ]);
+
+        // return new ProductionPlan();
     }
 
     public static function getCompletedNotificationBody(Import $import): string
     {
-        $body = 'Your production plan import has completed and '.number_format($import->successful_rows).' '.str('row')->plural($import->successful_rows).' imported.';
+        $body = 'Your production plan import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
 
         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;

app/Filament/Imports/StickerDetailImporter.php

@@ -2,14 +2,10 @@
 
 namespace App\Filament\Imports;
 
-use App\Models\Plant;
 use App\Models\StickerDetail;
-use App\Models\StickerStructureDetail;
-use App\Models\User;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
-use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 
 class StickerDetailImporter extends Importer
 {
@@ -18,295 +14,50 @@ class StickerDetailImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            ImportColumn::make('sticker_structure_detail_id')
+            ImportColumn::make('stickerStructureDetail')
                 ->requiredMapping()
-                ->exampleHeader('Sticker ID')
-                ->example('123456')
-                ->label('STICKER ID')
+                ->relationship()
                 ->rules(['required']),
-            ImportColumn::make('design_element_type')
-                ->requiredMapping()
-                ->exampleHeader('Design Element Type')
-                ->label('DESIGN ELEMENT TYPE')
-                ->example('Text/Shape/Image/QR'),
-            ImportColumn::make('element_id')
-                ->requiredMapping()
-                ->exampleHeader('Element ID')
-                ->label('ELEMENT ID')
-                ->example('001'),
-            ImportColumn::make('element_type')
-                ->requiredMapping()
-                ->exampleHeader('Element Type')
-                ->label('ELEMENT TYPE')
-                ->example('Static/Dynamic'),
-            ImportColumn::make('characteristics_type')
-                ->requiredMapping()
-                ->exampleHeader('Characteristics Type')
-                ->label('CHARACTERISTICS TYPE')
-                ->example('ZMM values'),
-            ImportColumn::make('string_value')
-                ->requiredMapping()
-                ->exampleHeader('String Value')
-                ->label('STRING VALUE')
-                ->example('1'),
-            ImportColumn::make('string_font')
-                ->requiredMapping()
-                ->exampleHeader('String Font')
-                ->label('STRING FONT')
-                ->example('Arial'),
-            ImportColumn::make('string_size')
-                ->requiredMapping()
-                ->exampleHeader('String Size')
-                ->label('STRING SIZE')
-                ->example('12'),
-            ImportColumn::make('element_colour')
-                ->requiredMapping()
-                ->exampleHeader('Element Colour')
-                ->label('ELEMENT COLOUR')
-                ->example('Black'),
-            ImportColumn::make('string_align')
-                ->requiredMapping()
-                ->exampleHeader('String Align')
-                ->label('STRING ALIGN')
-                ->example('Left/Center/Right'),
-            ImportColumn::make('string_x_value')
-                ->requiredMapping()
-                ->exampleHeader('String X Value')
-                ->label('STRING X VALUE')
-                ->example('10'),
-            ImportColumn::make('string_y_value')
-                ->requiredMapping()
-                ->exampleHeader('String Y Value')
-                ->label('STRING Y VALUE')
-                ->example('20'),
-            ImportColumn::make('shape_name')
-                ->requiredMapping()
-                ->exampleHeader('Shape Name')
-                ->label('SHAPE NAME')
-                ->example('Line/Rectangle/CurvedRectangle'),
-            ImportColumn::make('shape_pen_size')
-                ->requiredMapping()
-                ->exampleHeader('Shape Pen Size')
-                ->label('SHAPE PEN SIZE')
-                ->example('0.3'),
-            ImportColumn::make('curve_radius')
-                ->requiredMapping()
-                ->exampleHeader('Curve Radius')
-                ->label('CURVE RADIUS')
-                ->example('3'),
-            ImportColumn::make('shape_x1_value')
-                ->requiredMapping()
-                ->exampleHeader('Shape X1 Value')
-                ->label('SHAPE X1 VALUE')
-                ->example('10'),
-            ImportColumn::make('shape_y1_value')
-                ->requiredMapping()
-                ->exampleHeader('Shape Y1 Value')
-                ->label('SHAPE Y1 VALUE')
-                ->example('20'),
-            ImportColumn::make('shape_x2_value')
-                ->requiredMapping()
-                ->exampleHeader('Shape X2 Value')
-                ->label('SHAPE X2 VALUE')
-                ->example('30'),
-            ImportColumn::make('shape_y2_value')
-                ->requiredMapping()
-                ->exampleHeader('Shape Y2 Value')
-                ->label('SHAPE Y2 VALUE')
-                ->example('40'),
-            ImportColumn::make('image_x')
-                ->requiredMapping()
-                ->exampleHeader('Image X')
-                ->label('IMAGE X')
-                ->example('15'),
-            ImportColumn::make('image_y')
-                ->requiredMapping()
-                ->exampleHeader('Image Y')
-                ->label('IMAGE Y')
-                ->example('25'),
-            ImportColumn::make('image_width')
-                ->requiredMapping()
-                ->exampleHeader('Image Width')
-                ->label('IMAGE WIDTH')
-                ->example('100'),
-            ImportColumn::make('image_height')
-                ->requiredMapping()
-                ->exampleHeader('Image Height')
-                ->label('IMAGE HEIGHT')
-                ->example('100'),
-            ImportColumn::make('qr_value')
-                ->requiredMapping()
-                ->exampleHeader('QR Value')
-                ->label('QR VALUE')
-                ->example('246118|53246735267'),
-            ImportColumn::make('qr_align')
-                ->requiredMapping()
-                ->exampleHeader('QR Align')
-                ->label('QR ALIGN')
-                ->example('Left/Center/Right'),
-            ImportColumn::make('qr_size')
-                ->requiredMapping()
-                ->exampleHeader('QR Size')
-                ->label('QR SIZE')
-                ->example('10'),
-            ImportColumn::make('qr_x_value')
-                ->requiredMapping()
-                ->exampleHeader('QR X Value')
-                ->label('QR X VALUE')
-                ->example('30'),
-            ImportColumn::make('qr_y_value')
-                ->requiredMapping()
-                ->exampleHeader('QR Y Value')
-                ->label('QR Y VALUE')
-                ->example('40'),
-            ImportColumn::make('created_by')
-                ->requiredMapping()
-                ->exampleHeader('Created By')
-                ->label('CREATED BY')
-                ->example('RAW001234'),
+            ImportColumn::make('design_element_type'),
+            ImportColumn::make('element_id'),
+            ImportColumn::make('element_type'),
+            ImportColumn::make('string_value'),
+            ImportColumn::make('string_font'),
+            ImportColumn::make('string_size'),
+            ImportColumn::make('element_colour'),
+            ImportColumn::make('string_align'),
+            ImportColumn::make('string_x_value'),
+            ImportColumn::make('string_y_value'),
+            ImportColumn::make('shape_name'),
+            ImportColumn::make('shape_pen_size'),
+            ImportColumn::make('shape_x1_value'),
+            ImportColumn::make('shape_y1_value'),
+            ImportColumn::make('shape_x2_value'),
+            ImportColumn::make('shape_y2_value'),
+            ImportColumn::make('image_path'),
+            ImportColumn::make('image_type'),
+            ImportColumn::make('image_x'),
+            ImportColumn::make('image_y'),
+            ImportColumn::make('image_width'),
+            ImportColumn::make('image_height'),
+            ImportColumn::make('qr_value'),
+            ImportColumn::make('qr_align'),
+            ImportColumn::make('qr_size'),
+            ImportColumn::make('qr_x_value'),
+            ImportColumn::make('qr_y_value'),
+            ImportColumn::make('created_by'),
+            ImportColumn::make('updated_by'),
         ];
     }
 
     public function resolveRecord(): ?StickerDetail
     {
+        // return StickerDetail::firstOrNew([
+        //     // Update existing records, matching them by `$this->data['column_name']`
+        //     'email' => $this->data['email'],
+        // ]);
 
-        $warnMsg = [];
-
-        $sticker = $this->data['sticker_structure_detail_id'] ?? null;
-
-        $stickerCode = StickerStructureDetail::where('sticker_id', $sticker)->first();
-        if (!$stickerCode) {
-            $warnMsg[] = "Sticker Id not found in Sticker Structure Detail";
-        }
-
-        $stickerId = $stickerCode->id;
-
-        $user = User::where('name', $this->data['created_by'])->first();
-        if (!$user) {
-            $warnMsg[] = "User not found";
-        }
-
-        $designType = strtolower($this->data['design_element_type'] ?? '');
-
-        $rules = [
-            'text' => [
-                'required' => ['string_x_value', 'string_y_value'],
-                'allowed'  => [
-                    'string_value',
-                    'string_font',
-                    'string_size',
-                    'string_align',
-                    'string_colour',
-                    'string_x_value',
-                    'string_y_value',
-                ],
-            ],
-
-            'image' => [
-                'required' => ['image_x', 'image_y', 'image_width', 'image_height'],
-                'allowed'  => [
-                    'image_x',
-                    'image_y',
-                    'image_width',
-                    'image_height',
-                ],
-            ],
-
-            'shape' => [
-                'required' => ['shape_name', 'shape_pen_size', 'shape_x1_value', 'shape_y1_value', 'shape_x2_value', 'shape_y2_value'],
-                'allowed'  => [
-                    'shape_name',
-                    'shape_pen_size',
-                    'curve_radius',
-                    'shape_x1_value',
-                    'shape_y1_value',
-                    'shape_x2_value',
-                    'shape_y2_value',
-                ],
-            ],
-
-            'qr' => [
-                'required' => ['qr_value', 'qr_x_value', 'qr_y_value', 'qr_size'],
-                'allowed'  => [
-                    'qr_value',
-                    'qr_align',
-                    'qr_size',
-                    'qr_x_value',
-                    'qr_y_value',
-                ],
-            ],
-        ];
-
-         if (!isset($rules[$designType])) {
-            $warnMsg[] = "Invalid Design Element Type: {$designType}";
-        }
-
-        if (isset($rules[$designType])) {
-            foreach ($rules[$designType]['required'] as $field) {
-                if (empty($this->data[$field])) {
-                    $warnMsg[] = ucfirst($designType) . " requires {$field}";
-                }
-            }
-        }
-
-        $allElementFields = [
-            'string_value','string_font','string_size','string_align','string_colour',
-            'string_x_value','string_y_value',
-            'image_x','image_y','image_width','image_height',
-            'shape_name','shape_pen_size','curve_radius',
-            'shape_x1_value','shape_y1_value','shape_x2_value','shape_y2_value',
-            'qr_value','qr_align','qr_size','qr_x_value','qr_y_value',
-        ];
-
-        if (isset($rules[$designType])) {
-            $allowed = $rules[$designType]['allowed'];
-
-            foreach ($allElementFields as $field) {
-                if (!in_array($field, $allowed, true) && !empty($this->data[$field])) {
-                    $warnMsg[] = "Field {$field} is not allowed for {$designType} element";
-                }
-            }
-        }
-
-        if (!empty($warnMsg)) {
-            throw new RowImportFailedException(implode(' | ', $warnMsg));
-        }
-
-        StickerDetail::Create([
-            'sticker_structure_detail_id' => $stickerId,
-            'design_element_type' => $this->data['design_element_type'],
-            'element_id' => $this->data['element_id'],
-            'element_type' => $this->data['element_type'],
-            'characteristics_type' => $this->data['characteristics_type'],
-            'string_value' => $this->data['string_value'],
-            'string_font' => $this->data['string_font'],
-            'string_size' => $this->data['string_size'],
-            'element_colour' => $this->data['element_colour'],
-            'string_align' => $this->data['string_align'],
-            'string_x_value' => $this->data['string_x_value'],
-            'string_y_value' => $this->data['string_y_value'],
-            'shape_name' => $this->data['shape_name'],
-            'shape_pen_size' => $this->data['shape_pen_size'],
-            'curve_radius' => $this->data['curve_radius'],
-            'shape_x1_value' => $this->data['shape_x1_value'],
-            'shape_y1_value' => $this->data['shape_y1_value'],
-            'shape_x2_value' => $this->data['shape_x2_value'],
-            'shape_y2_value' => $this->data['shape_y2_value'],
-            'image_x' => $this->data['image_x'],
-            'image_y' => $this->data['image_y'],
-            'image_width' => $this->data['image_width'],
-            'image_height' => $this->data['image_height'],
-            'qr_value' => $this->data['qr_value'],
-            'qr_align' => $this->data['qr_align'],
-            'qr_size' => $this->data['qr_size'],
-            'qr_x_value' => $this->data['qr_x_value'],
-            'qr_y_value' => $this->data['qr_y_value'],
-            'created_by' => $this->data['created_by'],
-        ]);
-
-        return null;
-
-        //return new StickerDetail();
+        return new StickerDetail();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Imports/StickerMappingMasterImporter.php

@@ -14,56 +14,43 @@ class StickerMappingMasterImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            ImportColumn::make('plant_id')
+            ImportColumn::make('plant')
                 ->requiredMapping()
-                ->numeric()
-                ->rules(['required', 'integer']),
-            ImportColumn::make('item_id')
+                ->exampleHeader('Plant Name')
+                ->example('Ransar Industries-I')
+                ->label('Plant Name')
+                ->relationship(resolveUsing:'name')
+                ->rules(['required']),
+            ImportColumn::make('item')
                 ->requiredMapping()
-                ->numeric()
-                ->rules(['required', 'integer']),
-            ImportColumn::make('sticker1'),
-            ImportColumn::make('sticker1_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker1_print_ip'),
-            ImportColumn::make('sticker2'),
-            ImportColumn::make('sticker2_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker2_print_ip'),
-            ImportColumn::make('sticker3'),
-            ImportColumn::make('sticker3_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker3_print_ip'),
-            ImportColumn::make('sticker4'),
-            ImportColumn::make('sticker4_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker4_print_ip'),
-            ImportColumn::make('sticker5'),
-            ImportColumn::make('sticker5_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker5_print_ip'),
-            ImportColumn::make('sticker6'),
-            ImportColumn::make('sticker6_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker6_print_ip'),
-            ImportColumn::make('sticker7'),
-            ImportColumn::make('sticker7_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker7_print_ip'),
-            ImportColumn::make('sticker8'),
-            ImportColumn::make('sticker8_machine_id')
-                ->numeric()
-                ->rules(['integer']),
-            ImportColumn::make('sticker8_print_ip'),
-            ImportColumn::make('created_by'),
-            ImportColumn::make('updated_by'),
+                ->exampleHeader('Item Code')
+                ->example('630987')
+                ->label('Item Code')
+                ->relationship(resolveUsing:'code')
+                ->rules(['required']),
+            ImportColumn::make('sticker1')
+                ->label('Sticker Label 1')
+                ->exampleHeader('Sticker Label 1')
+                ->example('Label 1')
+                ->rules(['required']),
+            ImportColumn::make('sticker2')
+                ->label('Sticker Label 2')
+                ->exampleHeader('Sticker Label 2')
+                ->example('601468'),
+            ImportColumn::make('sticker3')
+                ->label('Sticker Label 3')
+                ->exampleHeader('Sticker Label 3'),
+                //->example(''),
+            ImportColumn::make('sticker4')
+                ->label('Sticker Label 4')
+                ->exampleHeader('Sticker Label 4'),
+            ImportColumn::make('sticker5')
+                ->label('Sticker Label 5')
+                ->exampleHeader('Sticker Label 5'),
+            ImportColumn::make('created_by')
+                ->label('Created By')
+                ->exampleHeader('Created By'),
+            // ImportColumn::make('updated_by'),
         ];
     }
 

app/Filament/Imports/StickerStructureDetailImporter.php

@@ -2,15 +2,10 @@
 
 namespace App\Filament\Imports;
 
-use App\Models\Item;
-use App\Models\ItemCharacteristic;
-use App\Models\Plant;
 use App\Models\StickerStructureDetail;
-use App\Models\User;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
-use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 
 class StickerStructureDetailImporter extends Importer
 {
@@ -19,133 +14,26 @@ class StickerStructureDetailImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            ImportColumn::make('plant')
-                ->requiredMapping()
-                ->exampleHeader('Plant Code')
-                ->example('1000')
-                ->label('PLANT CODE')
-                ->relationship(resolveUsing: 'code')
-                ->rules(['required']),
-            ImportColumn::make('item_characteristic_id')
-                ->requiredMapping()
-                ->exampleHeader('Item Code')
-                ->example('123456')
-                ->label('ITEM CODE')
-                ->rules(['required']),
-            ImportColumn::make('sticker_id')
-                ->requiredMapping()
-                ->exampleHeader('Sticker ID')
-                ->example('123456')
-                ->label('STICKER ID')
-                ->rules(['required']),
-            ImportColumn::make('sticker_width')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Width')
-                ->example('90')
-                ->label('STICKER WIDTH')
-                ->rules(['required']),
-            ImportColumn::make('sticker_height')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Height')
-                ->example('90')
-                ->label('STICKER HEIGHT')
-                ->rules(['required']),
-            ImportColumn::make('sticker_lmargin')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Left Margin')
-                ->example('0')
-                ->label('STICKER LEFT MARGIN')
-                ->rules(['required']),
-            ImportColumn::make('sticker_rmargin')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Right Margin')
-                ->example('0')
-                ->label('STICKER RIGHT MARGIN')
-                ->rules(['required']),
-            ImportColumn::make('sticker_tmargin')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Top Margin')
-                ->example('0')
-                ->label('STICKER TOP MARGIN')
-                ->rules(['required']),
-            ImportColumn::make('sticker_bmargin')
-                ->requiredMapping()
-                ->exampleHeader('Sticker Bottom Margin')
-                ->example('0')
-                ->label('STICKER BOTTOM MARGIN')
-                ->rules(['required']),
-            ImportColumn::make('created_by')
-                ->requiredMapping()
-                ->exampleHeader('Created By')
-                ->example('RAW001234')
-                ->label('CREATED BY')
-                ->rules(['required']),
+            ImportColumn::make('sticker_id'),
+            ImportColumn::make('sticker_width'),
+            ImportColumn::make('sticker_height'),
+            ImportColumn::make('sticker_lmargin'),
+            ImportColumn::make('sticker_rmargin'),
+            ImportColumn::make('sticker_tmargin'),
+            ImportColumn::make('sticker_bmargin'),
+            ImportColumn::make('created_by'),
+            ImportColumn::make('updated_by'),
         ];
     }
 
     public function resolveRecord(): ?StickerStructureDetail
     {
-        $warnMsg = [];
+        // return StickerStructureDetail::firstOrNew([
+        //     // Update existing records, matching them by `$this->data['column_name']`
+        //     'email' => $this->data['email'],
+        // ]);
 
-        $plant = Plant::where('code', $this->data['plant'])->first();
-
-        if (!$plant) {
-            $warnMsg[] = "Plant code not found";
-        }
-
-        // $item = null;
-        // if ($plant) {
-        //     $item = Item::where('code', $this->data['itemCharacteristic.item'])->where('plant_id', $plant->id)->first();
-        // }
-        // if (!$item) {
-        //     $warnMsg[] = "Item not found";
-        // }
-
-        $itemCode = $this->data['item_characteristic_id'] ?? null;
-
-        $item = Item::where('code', $itemCode)->first();
-        if (!$item) {
-            $warnMsg[] = "Item not found";
-        }
-
-        $itemChar = ItemCharacteristic::where('item_id', $item->id)->first();
-        if (!$itemChar) {
-            $warnMsg[] = "Item not found in item characteristic";
-        }
-
-        $user = User::where('name', $this->data['created_by'])->first();
-        if (!$user) {
-            $warnMsg[] = "User not found";
-        }
-
-        if (!empty($warnMsg)) {
-            throw new RowImportFailedException(implode(', ', $warnMsg));
-        }
-        else { //if (empty($warnMsg))
-            $stickerId = StickerStructureDetail::where('sticker_id', $this->data['sticker_id'])
-            ->first();
-
-            if ($stickerId) {
-                throw new RowImportFailedException("Sticker ID already exist!");
-            }
-        }
-
-        StickerStructureDetail::Create([
-            'plant_id' => $plant->id,
-            'item_characteristic_id' => $itemChar->id,
-            'sticker_id' => $this->data['sticker_id'],
-            'sticker_width' => $this->data['sticker_width'],
-            'sticker_height' => $this->data['sticker_height'],
-            'sticker_lmargin' => $this->data['sticker_lmargin'],
-            'sticker_rmargin' => $this->data['sticker_rmargin'],
-            'sticker_tmargin' => $this->data['sticker_tmargin'],
-            'sticker_bmargin' => $this->data['sticker_bmargin'],
-            'created_by' => $this->data['created_by'],
-        ]);
-
-        return null;
-
-        //return new StickerStructureDetail();
+        return new StickerStructureDetail();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Pages/NotificationSettings.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use Filament\Pages\Page;
-
-class NotificationSettings extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.notification-settings';
-
-
-    public static function getScripts(): array
-    {
-        return [
-            asset('js/push.js')
-        ];
-    }
-}

app/Filament/Pages/ProductionCalender.php

@@ -1,163 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\CustomerPoMaster;
-use App\Models\Plant;
-use App\Models\ProductionPlan;
-use App\Models\WireMasterPacking;
-use Filament\Facades\Filament;
-use Filament\Pages\Page;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Forms\Form;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ViewField;
-use Filament\Notifications\Notification;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Hidden;
-
-class ProductionCalender extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.production-calender';
-
-    use InteractsWithForms;
-
-    protected $listeners = ['setWorkingDays'];
-
-    public $pId;
-
-    public array $filters = [];
-
-    public function setWorkingDays($days = null)
-    {
-        $this->form->fill([
-            'working_days' => $days ?? 0,
-        ]);
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->statePath('filters')
-            ->schema([
-                Section::make('')
-                    ->schema([
-                        Select::make('plant_id')
-                            ->label('Plant')
-                            ->reactive()
-                            //->options(Plant::pluck('name', 'id'))
-                            ->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();
-                            })
-                            ->columnSpan(['default' => 10, 'sm' => 7])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('working_days', null);
-                            }),
-                        TextInput::make('working_days')
-                            ->label('No. of Working Days')
-                            ->numeric()
-                            ->readOnly()
-                            ->columnSpan(['default' => 10, 'sm' => 2])
-                            ->required()
-                            ->minValue(0)
-                            ->maxValue(31)
-                            ->placeholder('Enter working days')
-                            ->id('working_days'),
-
-                        Hidden::make('month')
-                            ->label('Month')
-                            ->id('month'),
-
-                        Hidden::make('year')
-                            ->label('Year')
-                            ->id('year'),
-
-                        Hidden::make('selected_dates')
-                            ->label('Selected Dates')
-                            ->id('selected_dates'),
-
-                        ViewField::make('save')
-                            ->view('forms.save')
-                            ->columnSpan(['default' => 10, 'sm' => 1]),
-
-                        ViewField::make('calendar')
-                            ->view('forms.calendar')
-                            ->columnspan(10),
-                    ])
-                    ->columns(10)
-            ]);
-    }
-
-    public function saveWorkingDays(){
-        $plantId = $this->filters['plant_id'] ?? null;
-        $workingDays = $this->filters['working_days'] ?? null;
-        $month = $this->filters['month'] ?? null;
-        $year = $this->filters['year'] ?? null;
-        $dates = $this->filters['selected_dates'] ?? null;
-
-        if (!$plantId) {
-            Notification::make()
-                ->title('Unknown Plant')
-                ->body("Please select a plant first!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$workingDays) {
-            Notification::make()
-                ->title('Unknown Working Days')
-                ->body("Working days can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$month) {
-            Notification::make()
-                ->title('Unknown Month')
-                ->body("month can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$year) {
-            Notification::make()
-                ->title('Unknown Year')
-                ->body("Year can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-
-        $updated = ProductionPlan::where('plant_id', $plantId)
-        ->whereMonth('created_at', $month)
-        ->whereYear('created_at', $year)
-        ->update([
-            'working_days' => $workingDays,
-            'leave_dates' => $dates,
-            'updated_at' => now(),
-        ]);
-
-        if ($updated) {
-            Notification::make()
-                ->title('Success')
-                ->body("Working days updated successfully!")
-                ->success()
-                ->send();
-        } else {
-            Notification::make()
-                ->title('No Records Updated')
-                ->body("No production plans found for this plant and month.")
-                ->warning()
-                ->send();
-        }
-    }
-
-}

app/Filament/Pages/ProductionTarget.php

@@ -1,173 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\Plant;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\DatePicker;
-use Filament\Pages\Page;
-use Filament\Forms\Form;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Notifications\Notification;
-
-class ProductionTarget extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.production-target';
-
-    public array $filters = [];
-
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->statePath('filters')
-            ->schema([
-                Section::make('')
-                    ->schema([
-                        Select::make('plant_id')
-                            ->label('Plant')
-                            ->reactive()
-                            ->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();
-                            })
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $set('line_id', null);
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$state, '', '', '');
-                            }),
-                        Select::make('line_id')
-                            ->label('Line')
-                            ->required()
-                            ->columnSpan(1)
-                            ->options(function (callable $get) {
-                                if (!$get('plant_id')) {
-                                    return [];
-                                }
-
-                                return \App\Models\Line::where('plant_id', $get('plant_id'))
-                                    ->pluck('name', 'id')
-                                    ->toArray();
-                            })
-                            ->reactive()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $plantId = $get('plant_id');
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$plantId, $state, '', '');
-                            }),
-                        Select::make('year')
-                            ->label('Year')
-                            ->reactive()
-                            ->options([
-                                '2026' => '2026',
-                                '2027' => '2027',
-                                '2028' => '2028',
-                                '2029' => '2029',
-                                '2030' => '2030',
-                                '2031' => '2031',
-                                '2032' => '2032',
-                                '2033' => '2033',
-                                '2034' => '2034',
-                                '2035' => '2035',
-                                '2036' => '2036',
-                                '2037' => '2037',
-                                '2038' => '2038',
-                                '2039' => '2039',
-                                '2040' => '2040',
-                            ])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $set('month', null);
-                                $plantId = $get('plant_id');
-                                $lineId = $get('line_id');
-                                $this->dispatch('loadData',$plantId, $lineId, $state, '');
-                            }),
-
-                        Select::make('month')
-                            ->label('Month')
-                            ->reactive()
-                            ->options([
-                                '01' => 'January',
-                                '02' => 'February',
-                                '03' => 'March',
-                                '04' => 'April',
-                                '05' => 'May',
-                                '06' => 'June',
-                                '07' => 'July',
-                                '08' => 'August',
-                                '09' => 'September',
-                                '10' => 'October',
-                                '11' => 'November',
-                                '12' => 'December',
-                            ])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get) {
-
-                                $plantId = $get('plant_id');
-                                $lineId = $get('line_id');
-                                // $month = $get('month');
-                                $year = $get('year');
-
-                                $month = (int) $get('month');
-
-                                if (!$month) {
-                                    return;
-                                }
-                                $this->dispatch('loadData', $plantId, $lineId, $month, $year);
-                            }),
-
-                    ])
-                    ->columns(4)
-            ]);
-    }
-
-    public function export(){
-
-        $plantId = $this->filters['plant_id'] ?? null;
-        $lineId = $this->filters['line_id'] ?? null;
-        $year = $this->filters['year'] ?? null;
-        $month = $this->filters['month'] ?? null;
-
-        if (! $plantId) {
-            Notification::make()
-                ->title('Plant')
-                ->body("please select plant to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $lineId) {
-            Notification::make()
-                ->title('Line')
-                ->body("please select line to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $year) {
-            Notification::make()
-                ->title('Year')
-                ->body("please select year to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $month) {
-            Notification::make()
-                ->title('Month')
-                ->body("please select month to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-
-        $this->dispatch('loadData1' ,$plantId, $lineId, $year, $month);
-    }
-}

app/Filament/Pages/RfqDashboard.php

@@ -1,163 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use Filament\Pages\Page;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
-use Filament\Tables\Filters\SelectFilter;
-use Illuminate\Support\Facades\DB;
-use App\Models\Plant;
-use App\Models\RequestQuotation;
-use App\Models\RfqTransporterBid;
-use Filament\Facades\Filament;
-use Filament\Widgets\Widget;
-use Illuminate\Support\Facades\Auth;
-use Filament\Forms\Components\Section;
-use Filament\Forms;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Forms\Contracts\HasForms;
-
-
-class RfqDashboard extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.rfq-dashboard';
-
-    protected static ?string $navigationGroup = 'RFQ Dashboard';
-
-    use HasFiltersForm;
-
-    public function mount(): void
-    {
-        session()->forget(['transport_name']);
-        session()->forget(['rfq_number']);
-        $this->filtersForm->fill([
-            'transport_name' => null,
-            'rfq_number' => null
-        ]);
-    }
-
-    public function filtersForm(Form $form): Form
-    {
-       return $form
-           ->statePath('filters')
-           ->schema([
-            Section::make('')
-                ->schema([
-            //    Select::make('plant')
-            //         ->label('Select Plant')
-            //         ->reactive()
-            //         ->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();
-            //         })
-            //         ->afterStateUpdated(function ($state,callable $set) {
-            //             session(['selected_plant' => $state]);
-            //                 // $set('rfq_number', null);
-            //                 session()->forget('rfq_number');
-            //         }),
-
-                Select::make('rfq_number')
-                    ->label('Select RFQ Number')
-                    ->reactive()
-                    ->options(function (callable $get) {
-
-                        return RequestQuotation::orderBy('rfq_number')
-                        ->pluck('rfq_number', 'id')
-                        ->toArray();
-                    })
-                    ->afterStateUpdated(function ($state, callable $set) {
-                        session(['rfq_id' => $state]);
-                        $set('transport_name', null);
-                        session()->forget('transport_name');
-                    }),
-
-                Select::make('transport_name')
-                    ->label('User name')
-                    ->reactive()
-                    ->options(function (callable $get) {
-                        $rfqId = $get('rfq_number');
-
-                        if (!$rfqId) {
-                            return [];
-                        }
-
-                        $user = Filament::auth()->user();
-
-                        if ($user->hasRole(['Super Admin', 'Rfq Supervisor'])) {
-                            return RfqTransporterBid::query()
-                                ->where('request_quotation_id', $rfqId)
-                                ->whereNotNull('transporter_name')
-                                ->distinct()
-                                ->pluck('transporter_name', 'transporter_name')
-                                ->toArray();
-                        }
-
-                        return RfqTransporterBid::query()
-                            ->where('request_quotation_id', $rfqId)
-                            ->where('transporter_name', $user->name)
-                            ->distinct()
-                            ->pluck('transporter_name', 'transporter_name')
-                            ->toArray();
-                    })
-                    ->afterStateUpdated(function ($state, callable $set) {
-                        session(['transport_name' => $state]);
-                    }),
-
-                // Select::make('transport_name')
-                //     ->label('User name')
-                //     ->reactive()
-                //     ->options(function () {
-                //         $user = Filament::auth()->user();
-
-                //         if ($user->hasRole(['Super Admin', 'Rfq Supervisor'])) {
-                //             return RfqTransporterBid::query()
-                //                 ->whereNotNull('transporter_name')
-                //                 ->distinct()
-                //                 ->pluck('transporter_name', 'transporter_name')
-                //                 ->toArray();
-                //         }
-
-                //         return RfqTransporterBid::query()
-                //         ->where('transporter_name', $user->name)
-                //         ->distinct()
-                //         ->pluck('transporter_name', 'transporter_name')
-                //         ->toArray();
-                //     })
-                //     ->afterStateUpdated(function ($state, callable $set) {
-                //         session(['transport_name' => $state]);
-                //         $set('rfq_number', null);
-                //         session()->forget('rfq_number');
-                //     }),
-
-                // Select::make('rfq_number')
-                //     ->label('Select RFQ Number')
-                //     ->reactive()
-                //     ->options(function (callable $get) {
-                //         $transportName = $get('transport_name');
-
-                //         if (!$transportName) {
-                //             return [];
-                //         }
-
-                //         return RequestQuotation::where('transporter_name', $transportName)
-                //             ->pluck('rfq_number', 'rfq_number')
-                //             ->toArray();
-                //     })
-                //     ->afterStateUpdated(function ($state) {
-                //         session(['rfq_number' => $state]);
-                //     }),
-                ])
-                ->columns(2),
-            ]);
-    }
-
-    public static function canAccess(): bool
-    {
-        return Auth::check() && Auth::user()->can('view rfq dashboard');
-    }
-}

app/Filament/Pages/RfqOverview.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\RequestQuotation;
-use Filament\Pages\Page;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
-use Illuminate\Support\Facades\Auth;
-
-class RfqOverview extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.rfq-overview';
-
-    protected static ?string $navigationGroup = 'RFQ Dashboard';
-
-    use HasFiltersForm;
-
-    public function mount(): void
-    {
-        session()->forget(['rfq_id']);
-        $this->filtersForm->fill([
-            'rfq_id' => null
-        ]);
-    }
-
-    public function filtersForm(Form $form): Form
-    {
-       return $form
-           ->statePath('filters')
-           ->schema([
-            Section::make('')
-                ->schema([
-                Select::make('rfq_number')
-                    ->label('Select RFQ Number')
-                    ->reactive()
-                    ->options(function (callable $get) {
-                        return RequestQuotation::orderBy('rfq_number')
-                        ->pluck('rfq_number', 'id')
-                        ->toArray();
-                    })
-                    ->afterStateUpdated(function ($state, callable $set) {
-                        session(['rfq_id' => $state]);
-                    }),
-                ])
-                ->columns(1),
-            ]);
-    }
-
-    public static function canAccess(): bool
-    {
-        return Auth::check() && Auth::user()->can('view rfq overview dashboard');
-    }
-}

app/Filament/Pages/StickerStructurePreviewPage.php

@@ -1,240 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\Item;
-use App\Models\ItemCharacteristic;
-use App\Models\Plant;
-use App\Models\StickerDetail;
-use App\Models\StickerStructureDetail;
-use App\Services\StickerPdfService;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\ViewField;
-use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Notifications\Notification;
-use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
-use Filament\Pages\Page;
-use Illuminate\Support\Facades\Auth;
-
-class StickerStructurePreviewPage extends Page
-{
-    use HasFiltersForm;
-
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.sticker-structure-preview-page';
-
-    protected static ?string $navigationGroup = 'Customized Sticker Printing';
-
-    public $stickerId;
-
-    public $plantId;
-
-    public $itemId;
-
-    public ?string $pdfPreview = null;
-
-    // public array $filters = [];
-
-    public function mount(): void
-    {
-        session()->forget(['stick_id', 'selected_plant', 'selected_item']);
-        $this->form->fill([
-            'sticker_id' => null,
-            'plant' => null,
-            'item' => null,
-        ]);
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->statePath('filters') // Store form state in 'filters'
-            ->schema([
-                Section::make('')
-                    ->schema([
-                        Select::make('sticker_id')
-                            ->label('Sticker ID')
-                            ->nullable()
-                            ->options(function (callable $get) {
-
-                                return StickerStructureDetail::orderByDesc('id')->pluck('sticker_id', 'sticker_id')->toArray();
-                            })
-                            ->afterStateUpdated(callback: function ($state, callable $set) {
-                                session(['stick_id' => $state]);
-                                $set('plant', null);
-                                $set('item', null);
-                                $this->pdfPreview = null;
-                            })
-                            ->searchable()
-                            ->reactive()
-                            ->required(),
-                        Select::make('plant')
-                            ->label('Select Plant')
-                            ->reactive()
-                             // ->options(Plant::pluck('name', 'id'))
-                            ->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();
-                            })
-                            ->afterStateUpdated(function ($state, callable $set) {
-                                session(['stick_id' => $state]);
-                                session(['selected_plant' => $state]);
-                                $set('item', null);
-                                session()->forget('item');
-                                $this->pdfPreview = null;
-                            }),
-                        Select::make('item')
-                            ->label('Search by Item Code')
-                            ->nullable()
-                            ->options(function (callable $get) {
-                                $plant = $get('plant');
-
-                                return $plant ? ItemCharacteristic::where('plant_id', $plant)->with('item')->get()->pluck('item.code', 'id')->toArray() : []; // ->orderBy('plant_id')
-                            })
-                            ->afterStateUpdated(function ($state, callable $set) {
-                                session(['stick_id' => $state]);
-                                session(['selected_plant' => $state]);
-                                session(['selected_item' => $state]);
-                                $this->pdfPreview = null;
-                                // $set('item_id', null);
-                                // session()->forget('item');
-                            })
-                            ->searchable()
-                            ->reactive(),
-                        // ViewField::make('generate_template')
-                        //     ->view('fields.generate-template-preview')
-                        //     ->reactive()
-                        //     // ->key(fn ($get) => 'generate-template' . ($get('sticker_id_live') ?? 'empty'))
-                        //     ->key(fn (Get $get) => 'generate-template-'.
-                        //         ($get('sticker_id') ?? 'empty').'-'.
-                        //         ($get('plant') ?? 'empty').'-'.
-                        //         ($get('item_characteristic_id') ?? 'empty')
-                        //     )
-                        //     // ->viewData(fn (Get $get) => [
-                        //     //     'sticker_id' => $get('sticker_id_live') ?? 'empty',
-                        //     // ]),
-                        //     ->viewData(fn (Get $get) => [
-                        //         'sticker_id' => $get('sticker_id') ?? 'empty',
-                        //         'plant_id' => $get('plant') ?? 'empty',
-                        //         'item_characteristic_id' => $get('item') ?? 'empty',
-                        //     ])
-                        //     ->hidden(fn (callable $get) => ($get('sticker_id') == null || $get('sticker_id') == '0' || empty($get('sticker_id'))) || (($get('plant') != null || $get('plant') != '') &&
-                        //      ($get('item') == null || $get('item') == '' || empty($get('item'))))),
-                    ])
-                    ->columns(3),
-            ]);
-    }
-
-    public function showPreview()
-    {
-        $state = $this->form->getState();
-        $stickerId = trim($state['sticker_id'] ?? '') ?: null;
-        // $stickerId = $this->form->getState()['sticker_id'];
-        // $stickerId = trim($stickerId) ?? null;
-        $this->stickerId = $stickerId;
-
-        $plantId = trim($state['plant'] ?? '') ?: null;
-        // $plantId = $this->form->getState()['plant'];
-        // $plantId = trim($plantId) ?? null;
-        $this->plantId = $plantId;
-
-        $itemId = trim($state['item'] ?? '') ?: null;
-        // $itemId = $this->form->getState()['item'];
-        // $itemId = trim($itemId) ?? null;
-        $this->itemId = $itemId;
-
-        $this->pdfPreview = null;
-
-        // $operatorName = Filament::auth()->user()->name;
-
-        if (! $stickerId) {
-            Notification::make()->title('Please select a Sticker ID first!')->danger()->duration(2000)->send();
-
-            $this->form->fill([
-                'sticker_id' => $stickerId ?? null,
-                'plant' => $plantId ?? null,
-                'item' => $itemId ?? null,
-            ]);
-
-            return;
-        } elseif ($plantId && ! $itemId) {
-            Notification::make()->title('Please select an Item Code!')->danger()->duration(2000)->send();
-
-            $this->form->fill([
-                'sticker_id' => $stickerId,
-                'plant' => $plantId ?? null,
-                'item' => $itemId ?? null,
-            ]);
-
-            return;
-        } elseif ($stickerId && $plantId && $itemId != null && $itemId != '') {
-
-            $itemCharacteristic = $itemId ? ItemCharacteristic::find($itemId) : null;
-
-            $structure = StickerStructureDetail::where('sticker_id', $stickerId)->first();
-            if (! $structure) {
-                Notification::make()->title('Sticker structure not found!')->danger()->send();
-
-                return;
-            }
-
-            $dynamicElements = StickerDetail::where('sticker_structure_detail_id', $structure->id)->get();
-
-            try {
-                $stickerPdfService = new StickerPdfService;
-                $this->pdfPreview = $stickerPdfService->generateStickerItem($stickerId, $dynamicElements, $itemCharacteristic);
-
-                Notification::make()
-                    ->title('Sticker Preview Generated!')
-                    ->success()
-                    ->duration(2000)
-                    ->send();
-            } catch (\Exception $e) {
-                Notification::make()
-                    ->title('Error generating sticker preview!')
-                    ->body($e->getMessage())
-                    ->danger()
-                    ->send();
-            }
-        } else {
-            $elements = StickerStructureDetail::where('sticker_id', $stickerId)->first();
-
-            try {
-                $stickerPdfService = new StickerPdfService;
-                $this->pdfPreview = $stickerPdfService->generateSticker($stickerId, $elements->toArray());
-
-                Notification::make()
-                    ->title('Sticker Preview Generated!')
-                    ->success()
-                    ->duration(2000)
-                    ->send();
-            } catch (\Exception $e) {
-                Notification::make()
-                    ->title('Error generating sticker preview!')
-                    ->body($e->getMessage())
-                    ->danger()
-                    ->send();
-            }
-        }
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Sticker Structure Preview';
-    }
-
-    public function getHeading(): string
-    {
-        return 'Sticker Structure Preview';
-    }
-
-    public static function canAccess(): bool
-    {
-        return Auth::check() && Auth::user()->can('view sticker structure preview');
-    }
-}

app/Filament/Pages/Welcome.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use Filament\Pages\Page;
-
-class Welcome extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.welcome';
-
-    public function getHeading(): string
-    {
-        return '';
-    }
-}

app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php

@@ -10,7 +10,6 @@ use App\Models\InvoiceValidation;
 use App\Models\Item;
 use App\Models\Plant;
 use App\Models\StickerMaster;
-use App\Notifications\PushAlertNotification;
 use Filament\Facades\Filament;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\ExposesTableToWidgets;
@@ -137,10 +136,6 @@ class CreateInvoiceValidation extends CreateRecord
                 ->send();
             $this->dispatch('playNotificationSound');
 
-            $user1 = Filament::auth()->user();
-
-            $user1->notify(new PushAlertNotification());
-
             $this->form->fill([
                 'plant_id' => $plantId,
                 'invoice_number' => $invoiceNumber,
@@ -2290,7 +2285,6 @@ class CreateInvoiceValidation extends CreateRecord
                 ->danger()
                 ->seconds(3)
                 ->send();
-
             $this->dispatch('playWarnSound');
 
             $this->form->fill([

app/Filament/Resources/ItemResource.php

@@ -82,9 +82,6 @@ class ItemResource extends Resource
                         Forms\Components\TextInput::make('category')
                             ->label('Category')
                             ->placeholder('Scan the Category'),
-                        Forms\Components\TextInput::make('category')
-                            ->label('Category')
-                            ->placeholder('Scan the Category'),
                         Forms\Components\TextInput::make('code')
                             ->required()
                             ->placeholder('Scan the valid code')

app/Filament/Resources/ProductionPlanResource.php

@@ -6,8 +6,8 @@ use AlperenErsoy\FilamentExport\Actions\FilamentExportBulkAction;
 use App\Filament\Exports\ProductionPlanExporter;
 use App\Filament\Imports\ProductionPlanImporter;
 use App\Filament\Resources\ProductionPlanResource\Pages;
+use App\Filament\Resources\ProductionPlanResource\RelationManagers;
 use App\Models\Block;
-use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProductionPlan;
@@ -16,18 +16,19 @@ use Carbon\Carbon;
 use Filament\Facades\Filament;
 use Filament\Forms;
 use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Actions\ExportAction;
 use Filament\Tables\Actions\ImportAction;
-use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Tables\Actions\ExportAction;
+use Filament\Tables\Filters\Filter;
+use Illuminate\Support\Facades\Request;
 
 class ProductionPlanResource extends Resource
 {
@@ -54,22 +55,22 @@ class ProductionPlanResource extends Resource
                             ->reactive()
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
-
-                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
+                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
                             })
                             ->default(function () {
                                 return optional(ProductionPlan::latest()->first())->plant_id;
                             })
-                            ->disabled(fn (Get $get) => ! empty($get('id')))
+                            ->disabled(fn (Get $get) => !empty($get('id')))
                             // ->afterStateUpdated(fn ($set) => $set('block_name', null))
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                 $plantId = $get('plant_id');
                                 $set('block_name', null);
-                                if (! $plantId) {
+                                if (!$plantId) {
                                     $set('ppPlantError', 'Please select a plant first.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('ppPlantError', null);
                                 }
                             })
@@ -78,6 +79,102 @@ class ProductionPlanResource extends Resource
                             ])
                             ->hint(fn ($get) => $get('ppPlantError') ? $get('ppPlantError') : null)
                             ->hintColor('danger'),
+                        Forms\Components\Select::make('block_name')
+                            ->required()
+                            // ->nullable()
+                            ->label('Block')
+                            ->options(function (callable $get) {
+                                if (!$get('plant_id')) {
+                                    return [];
+                                }
+
+                                return Block::where('plant_id', $get('plant_id'))
+                                    ->pluck('name', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive()
+                            ->default(function () {
+                                $latestShiftId = optional(ProductionPlan::latest()->first())->shift_id;
+                                return optional(Shift::where('id', $latestShiftId)->first())->block_id;
+                            })
+                            //->afterStateUpdated(fn ($set) => $set('shift_id', null))
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                if($get('id'))
+                                {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                    $getBlock = Shift::where('id', $getShift->shift_id)->first();
+                                    if($getBlock->block_id)
+                                    {
+                                        $set('block_name', $getBlock->block_id);
+                                        $set('ppBlockError', null);
+                                    }
+                                }
+
+                                $blockId = $get('block_name');
+                                $set('shift_id', null);
+
+                                if (!$blockId) {
+                                    $set('ppBlockError', 'Please select a block first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $set('ppBlockError', null);
+                                }
+                            })
+                            ->extraAttributes(fn ($get) => [
+                                'class' => $get('ppBlockError') ? 'border-red-500' : '',
+                            ])
+                            ->hint(fn ($get) => $get('ppBlockError') ? $get('ppBlockError') : null)
+                            ->hintColor('danger'),
+                        Forms\Components\Select::make('shift_id')
+                            ->relationship('shift', 'name')
+                            ->required()
+                            // ->nullable()
+                            ->autofocus(true)
+                            ->options(function (callable $get) {
+                                if (!$get('plant_id') || !$get('block_name')) {
+                                    return [];
+                                }
+
+                                return Shift::where('plant_id', $get('plant_id'))
+                                    ->where('block_id', $get('block_name'))
+                                    ->pluck('name', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive()
+                            ->default(function () {
+                                return optional(ProductionPlan::latest()->first())->shift_id;
+                            })
+                            // ->afterStateUpdated(fn ($set) => $set('line_id', null))
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                if($get('id'))
+                                {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                    if($getShift->shift_id)
+                                    {
+                                        $set('shift_id', $getShift->shift_id);
+                                        $set('ppShiftError', null);
+                                    }
+                                }
+
+                                $curShiftId = $get('shift_id');
+                                $set('line_id', null);
+
+                                if (!$curShiftId) {
+                                    $set('ppShiftError', 'Please select a shift first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $set('ppShiftError', null);
+                                }
+                            })
+                            ->extraAttributes(fn ($get) => [
+                                'class' => $get('ppShiftError') ? 'border-red-500' : '',
+                            ])
+                            ->hint(fn ($get) => $get('ppShiftError') ? $get('ppShiftError') : null)
+                            ->hintColor('danger'),
                         Forms\Components\Select::make('line_id')
                             ->relationship('line', 'name')
                             ->required()
@@ -88,7 +185,7 @@ class ProductionPlanResource extends Resource
                             //     ->toArray() // Convert collection to array
                             // )
                             ->options(function (callable $get) {
-                                if (! $get('plant_id')) {
+                                if (!$get('plant_id') || !$get('block_name') || !$get('shift_id')) {
                                     return [];
                                 }
 
@@ -100,257 +197,248 @@ class ProductionPlanResource extends Resource
                             // ->default(function () {
                             //     return optional(ProductionPlan::latest()->first())->line_id;
                             // })
-                            // ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                            //     if ($get('id')) {
-                            //         $getShift = ProductionPlan::where('id', $get('id'))->first();
-                            //         if ($getShift->line_id) {
-                            //             $set('line_id', $getShift->line_id);
-                            //             $set('ppLineError', null);
-                            //         }
-                            //     } else {
-                            //         $currentDT = Carbon::now()->toDateTimeString();
-                            //         $set('created_at', $currentDT);
-                            //         $set('update_date', null);
-                            //     }
-
-                            //     $lineId = $get('line_id');
-                            //     // $set('plan_quantity', null);
-
-                            //     if (! $lineId) {
-                            //         $set('ppLineError', 'Please select a line first.');
-
-                            //         return;
-                            //     } else {
-                            //         $isUpdate = ! empty($get('id'));
-                            //         if (! $isUpdate) {
-                            //             $exists = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 ->where('shift_id', $get('shift_id'))
-                            //                 ->where('line_id', $get('line_id'))
-                            //                 ->whereDate('created_at', today())
-                            //                 ->latest()
-                            //                 ->exists();
-
-                            //             if ($exists) {
-                            //                 $set('line_id', null);
-                            //                 $set('ppLineError', 'Production plan already updated.');
-
-                            //                 return;
-                            //             } else {
-                            //                 $existShifts = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                     ->where('shift_id', $get('shift_id'))
-                            //                     ->where('line_id', $get('line_id'))
-                            //                     ->whereDate('created_at', Carbon::yesterday())
-                            //                     ->latest()
-                            //                     ->exists();
-
-                            //                 if ($existShifts) { // if ($existShifts->count() > 0)
-                            //                     // $currentDate = date('Y-m-d');
-                            //                     $yesterday = date('Y-m-d', strtotime('-1 days'));
-
-                            //                     $shiftId = Shift::where('id', $get('shift_id'))
-                            //                         ->first();
-
-                            //                     [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                     $hRs = (int) $hRs;
-                            //                     //   $miNs = (int) $miNs;-*/
-
-                            //                     $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                     $from_dt = $yesterday.' '.$shiftId->start_time;
-
-                            //                     $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                     $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                     // Check if current date time is within the range
-                            //                     if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-                            //                         // echo "Choosed a valid shift...";
-
-                            //                         $set('line_id', null);
-                            //                         $set('ppLineError', 'Production plan already updated.');
-
-                            //                         // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                         return;
-                            //                     } else {
-                            //                         $currentDate = date('Y-m-d');
-
-                            //                         $shiftId = Shift::where('id', $get('shift_id'))
-                            //                             ->first();
-
-                            //                         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                         $hRs = (int) $hRs;
-                            //                         //   $miNs = (int) $miNs;-*/
-
-                            //                         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                         $from_dt = $currentDate.' '.$shiftId->start_time;
-
-                            //                         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                         // Check if current date time is within the range
-                            //                         if (! ($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
-                            //                             // echo "Choosed a valid shift...";
-
-                            //                             $set('line_id', null);
-                            //                             $set('ppLineError', 'Choosed a invalid shift.');
-
-                            //                             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                             return;
-                            //                         }
-                            //                     }
-
-                            //                     $set('ppLineError', null);
-
-                            //                     return;
-                            //                 } else {
-                            //                     // $currentDate = date('Y-m-d');
-                            //                     $yesterday = date('Y-m-d', strtotime('-1 days'));
-
-                            //                     $shiftId = Shift::where('id', $get('shift_id'))
-                            //                         ->first();
-
-                            //                     [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                     $hRs = (int) $hRs;
-                            //                     //   $miNs = (int) $miNs;-*/
-
-                            //                     $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                     $from_dt = $yesterday.' '.$shiftId->start_time;
-
-                            //                     $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                     $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                     // Check if current date time is within the range
-                            //                     if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-                            //                         // echo "Choosed a valid shift...";
-
-                            //                         // here i'm updating created as yesterday
-                            //                         $set('created_at', $from_dt);
-                            //                         $set('update_date', '1');
-
-                            //                         $set('ppLineError', null);
-
-                            //                         // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                         return;
-                            //                     } else {
-                            //                         $currentDate = date('Y-m-d');
-
-                            //                         $shiftId = Shift::where('id', $get('shift_id'))
-                            //                             ->first();
-
-                            //                         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                         $hRs = (int) $hRs;
-                            //                         //   $miNs = (int) $miNs;-*/
-
-                            //                         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                         $from_dt = $currentDate.' '.$shiftId->start_time;
-
-                            //                         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                         // Check if current date time is within the range
-                            //                         if (! ($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
-                            //                             // echo "Choosed a valid shift...";
-
-                            //                             $set('line_id', null);
-                            //                             $set('ppLineError', 'Choosed a invalid shift.');
-
-                            //                             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                             return;
-                            //                         }
-                            //                     }
-
-                            //                     $set('ppLineError', null);
-
-                            //                     return;
-                            //                 }
-
-                            //                 // $exists = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 //     //->where('shift_id', $get('shift_id'))
-                            //                 //     ->where('line_id', $get('line_id'))
-                            //                 //     ->whereDate('created_at', today())
-                            //                 //     ->latest()  // Orders by created_at DESC
-                            //                 //     ->first();
-
-                            //                 // if ($exists)
-                            //                 // {
-                            //                 //     $existingShifts = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 //     //->where('shift_id', $get('shift_id'))
-                            //                 //     ->where('line_id', $get('line_id'))
-                            //                 //     // ->whereDate('created_at', today())
-                            //                 //     ->whereDate('created_at', today())
-                            //                 //     ->get();
-
-                            //                 //     foreach ($existingShifts as $shift) {
-                            //                 //         $curShiftId = $shift->shift_id;
-
-                            //                 //         $currentDate = date('Y-m-d');
-
-                            //                 //         $shiftId = \App\Models\Shift::where('id', $curShiftId)
-                            //                 //         ->first();
-
-                            //                 //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                 //         $hRs = (int) $hRs;
-                            //                 //         //   $miNs = (int) $miNs;-*/
-
-                            //                 //         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                 //         $from_dt = $currentDate . ' ' . $shiftId->start_time;
-
-                            //                 //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
-
-                            //                 //         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                 //         // Check if current date time is within the range
-                            //                 //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-                            //                 //             //echo "Choosed a valid shift...";
-                            //                 //             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-
-                            //                 //             $set('line_id', null);
-                            //                 //             $set('ppLineError', 'Production plan already updated.');
-                            //                 //             return;
-                            //                 //         }
-                            //                 //         // else {
-                            //                 //             //     $set('ppLineError', 'Choosed a invalid shift...');
-                            //                 //             //     return;
-                            //                 //             // }
-                            //                 //     }
-                            //                 //     $set('ppLineError', null);
-                            //                 //     return;
-                            //                 // }
-                            //             }
-                            //         }
-                            //         $set('ppLineError', null);
-                            //     }
-                            // })
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('item_id', null);
-                                $set('plan_quantity', null);
+                                if($get('id'))
+                                {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                    if($getShift->line_id)
+                                    {
+                                        $set('line_id', $getShift->line_id);
+                                        $set('ppLineError', null);
+                                    }
+                                }
+                                else
+                                {
+                                    $currentDT = Carbon::now()->toDateTimeString();
+                                    $set('created_at', $currentDT);
+                                    $set('update_date', null);
+                                }
+
+                                $lineId = $get('line_id');
+                                // $set('plan_quantity', null);
+
+                                if (!$lineId) {
+                                    $set('ppLineError', 'Please select a line first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $isUpdate = !empty($get('id'));
+                                    if (!$isUpdate)
+                                    {
+                                        $exists = ProductionPlan::where('plant_id', $get('plant_id'))
+                                        ->where('shift_id', $get('shift_id'))
+                                        ->where('line_id', $get('line_id'))
+                                        ->whereDate('created_at', today())
+                                        ->latest()
+                                        ->exists();
+
+                                        if ($exists)
+                                        {
+                                            $set('line_id', null);
+                                            $set('ppLineError', 'Production plan already updated.');
+                                            return;
+                                        }
+                                        else
+                                        {
+                                            $existShifts = ProductionPlan::where('plant_id', $get('plant_id'))
+                                            ->where('shift_id', $get('shift_id'))
+                                            ->where('line_id', $get('line_id'))
+                                            ->whereDate('created_at', Carbon::yesterday())
+                                            ->latest()
+                                            ->exists();
+
+                                            if ($existShifts) //if ($existShifts->count() > 0)
+                                            {
+                                                //$currentDate = date('Y-m-d');
+                                                $yesterday = date('Y-m-d', strtotime('-1 days'));
+
+                                                $shiftId = Shift::where('id', $get('shift_id'))
+                                                ->first();
+
+                                                [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                $hRs = (int) $hRs;
+                                                //   $miNs = (int) $miNs;-*/
+
+                                                $totalMinutes = $hRs * 60 + $miNs;
+
+                                                $from_dt = $yesterday . ' ' . $shiftId->start_time;
+
+                                                $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                $currentDateTime = date('Y-m-d H:i:s');
+
+                                                // Check if current date time is within the range
+                                                if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                                                    //echo "Choosed a valid shift...";
+
+                                                    $set('line_id', null);
+                                                    $set('ppLineError', 'Production plan already updated.');
+                                                    // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                    return;
+                                                }
+                                                else
+                                                {
+                                                    $currentDate = date('Y-m-d');
+
+                                                    $shiftId = Shift::where('id', $get('shift_id'))
+                                                    ->first();
+
+                                                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                    $hRs = (int) $hRs;
+                                                    //   $miNs = (int) $miNs;-*/
+
+                                                    $totalMinutes = $hRs * 60 + $miNs;
+
+                                                    $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                                                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                    $currentDateTime = date('Y-m-d H:i:s');
+
+                                                    // Check if current date time is within the range
+                                                    if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
+                                                        //echo "Choosed a valid shift...";
+
+                                                        $set('line_id', null);
+                                                        $set('ppLineError', 'Choosed a invalid shift.');
+                                                        // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                        return;
+                                                    }
+                                                }
+
+                                                $set('ppLineError', null);
+                                                return;
+                                            }
+                                            else
+                                            {
+                                                //$currentDate = date('Y-m-d');
+                                                $yesterday = date('Y-m-d', strtotime('-1 days'));
+
+                                                $shiftId = Shift::where('id', $get('shift_id'))
+                                                ->first();
+
+                                                [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                $hRs = (int) $hRs;
+                                                //   $miNs = (int) $miNs;-*/
+
+                                                $totalMinutes = $hRs * 60 + $miNs;
+
+                                                $from_dt = $yesterday . ' ' . $shiftId->start_time;
+
+                                                $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                $currentDateTime = date('Y-m-d H:i:s');
+
+                                                // Check if current date time is within the range
+                                                if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                                                    //echo "Choosed a valid shift...";
+
+                                                    // here i'm updating created as yesterday
+                                                    $set('created_at', $from_dt);
+                                                    $set('update_date', '1');
+
+                                                    $set('ppLineError', null);
+                                                    // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                    return;
+                                                }
+                                                else
+                                                {
+                                                    $currentDate = date('Y-m-d');
+
+                                                    $shiftId = Shift::where('id', $get('shift_id'))
+                                                    ->first();
+
+                                                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                    $hRs = (int) $hRs;
+                                                    //   $miNs = (int) $miNs;-*/
+
+                                                    $totalMinutes = $hRs * 60 + $miNs;
+
+                                                    $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                                                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                    $currentDateTime = date('Y-m-d H:i:s');
+
+                                                    // Check if current date time is within the range
+                                                    if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
+                                                        //echo "Choosed a valid shift...";
+
+                                                        $set('line_id', null);
+                                                        $set('ppLineError', 'Choosed a invalid shift.');
+                                                        // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                        return;
+                                                    }
+                                                }
+
+                                                $set('ppLineError', null);
+                                                return;
+                                            }
+
+                                            // $exists = ProductionPlan::where('plant_id', $get('plant_id'))
+                                            //     //->where('shift_id', $get('shift_id'))
+                                            //     ->where('line_id', $get('line_id'))
+                                            //     ->whereDate('created_at', today())
+                                            //     ->latest()  // Orders by created_at DESC
+                                            //     ->first();
+
+                                            // if ($exists)
+                                            // {
+                                            //     $existingShifts = ProductionPlan::where('plant_id', $get('plant_id'))
+                                            //     //->where('shift_id', $get('shift_id'))
+                                            //     ->where('line_id', $get('line_id'))
+                                            //     // ->whereDate('created_at', today())
+                                            //     ->whereDate('created_at', today())
+                                            //     ->get();
+
+                                            //     foreach ($existingShifts as $shift) {
+                                            //         $curShiftId = $shift->shift_id;
+
+                                            //         $currentDate = date('Y-m-d');
+
+                                            //         $shiftId = \App\Models\Shift::where('id', $curShiftId)
+                                            //         ->first();
+
+                                            //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                            //         $hRs = (int) $hRs;
+                                            //         //   $miNs = (int) $miNs;-*/
+
+                                            //         $totalMinutes = $hRs * 60 + $miNs;
+
+                                            //         $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                                            //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                            //         $currentDateTime = date('Y-m-d H:i:s');
+
+                                            //         // Check if current date time is within the range
+                                            //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                                            //             //echo "Choosed a valid shift...";
+                                            //             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+
+                                            //             $set('line_id', null);
+                                            //             $set('ppLineError', 'Production plan already updated.');
+                                            //             return;
+                                            //         }
+                                            //         // else {
+                                            //             //     $set('ppLineError', 'Choosed a invalid shift...');
+                                            //             //     return;
+                                            //             // }
+                                            //     }
+                                            //     $set('ppLineError', null);
+                                            //     return;
+                                            // }
+                                        }
+                                    }
+                                    $set('ppLineError', null);
+                                }
                             })
                             ->extraAttributes(fn ($get) => [
                                 'class' => $get('ppLineError') ? 'border-red-500' : '',
                             ])
                             ->hint(fn ($get) => $get('ppLineError') ? $get('ppLineError') : null)
                             ->hintColor('danger'),
-                        Forms\Components\Select::make('item_id')
-                            ->label('Item')
-                            ->reactive()
-                            ->searchable()
-                            ->required()
-                            ->options(function (callable $get) {
-                                if (! $get('plant_id')) {
-                                    return [];
-                                }
-
-                                return Item::where('plant_id', $get('plant_id'))
-                                    ->pluck('code', 'id')
-                                    ->toArray();
-                            }),
                         Forms\Components\TextInput::make('plan_quantity')
                             ->required()
                             ->integer()
@@ -361,18 +449,21 @@ class ProductionPlanResource extends Resource
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                 $planQuan = $get('plan_quantity');
 
-                                if (! $get('update_date')) {
-                                    if (! $get('id')) {
+                                if(!$get('update_date') )
+                                {
+                                    if(!$get('id'))
+                                    {
                                         $currentDT = Carbon::now()->toDateTimeString();
                                         $set('created_at', $currentDT);
                                     }
                                 }
 
-                                if (! $planQuan) {
+                                if (!$planQuan) {
                                     $set('ppPlanQuanError', 'Scan the valid plan quantity.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('ppPlanQuanError', null);
                                 }
                             })
@@ -381,19 +472,29 @@ class ProductionPlanResource extends Resource
                             ])
                             ->hint(fn ($get) => $get('ppPlanQuanError') ? $get('ppPlanQuanError') : null)
                             ->hintColor('danger'),
-                        // Forms\Components\TextInput::make('production_quantity')
-                        //     ->required()
-                        //     ->integer()
-                        //     ->label('Production Quantity')
-                        //     ->readOnly(fn (callable $get) => ! $get('id'))
-                        //     ->default(0),
+                        Forms\Components\TextInput::make('production_quantity')
+                            ->required()
+                            ->integer()
+                            ->label('Production Quantity')
+                            ->readOnly(fn (callable $get) => !$get('id'))
+                            ->default(0),
                         Forms\Components\TextInput::make('id')
                             ->hidden()
                             ->readOnly(),
+                        Forms\Components\TextInput::make('update_date')
+                            ->hidden()
+                            ->reactive()
+                            ->readOnly(),
+                        Forms\Components\DateTimePicker::make('created_at')
+                            ->label('Created DateTime')
+                            ->hidden()
+                            ->reactive()
+                            ->required()
+                            ->readOnly(),
                         Forms\Components\Hidden::make('operator_id')
                             ->default(Filament::auth()->user()->name),
-                    ])
-                    ->columns(4),
+                        ])
+                    ->columns(2),
             ]);
     }
 
@@ -428,55 +529,34 @@ class ProductionPlanResource extends Resource
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
-                Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('line.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('item.code')
-                    ->label('Item')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
                 Tables\Columns\TextColumn::make('plan_quantity')
                     ->label('Plan Quantity')
                     ->alignCenter()
                     ->numeric()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('working_days')
-                    ->label('Working Days')
-                    ->alignCenter()
-                    ->numeric()
-                    ->sortable()
-                    ->searchable(),
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('production_quantity')
                     ->label('Production Quantity')
                     ->alignCenter()
                     ->numeric()
-                    ->sortable()
-                    ->searchable(),
-                // Tables\Columns\TextColumn::make('line.name')
-                //     ->label('Line')
-                //     ->alignCenter()
-                //     ->sortable(), // ->searchable(),
-                // Tables\Columns\TextColumn::make('shift.block.name')
-                //     ->label('Block')
-                //     ->alignCenter()
-                //     ->sortable(),
-                // Tables\Columns\TextColumn::make('shift.name')
-                //     ->label('Shift')
-                //     ->alignCenter()
-                //     ->sortable(), // ->searchable(),
-
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('line.name')
+                    ->label('Line')
+                    ->alignCenter()
+                    ->sortable(),// ->searchable(),
+                Tables\Columns\TextColumn::make('shift.block.name')
+                    ->label('Block')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('shift.name')
+                    ->label('Shift')
+                    ->alignCenter()
+                    ->sortable(),// ->searchable(),
+                Tables\Columns\TextColumn::make('plant.name')
+                    ->label('Plant')
+                    ->alignCenter()
+                    ->sortable(),// ->searchable(),
                 Tables\Columns\TextColumn::make('created_at')
                     ->label('Created At')
                     ->dateTime()
@@ -504,7 +584,7 @@ class ProductionPlanResource extends Resource
                 Filter::make('advanced_filters')
                     ->label('Advanced Filters')
                     ->form([
-                        // plant
+                        //plant
                         Select::make('Plant')
                             ->label('Select Plant')
                             ->nullable()
@@ -513,8 +593,7 @@ class ProductionPlanResource extends Resource
                             // })
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
-
-                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->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) {
@@ -523,33 +602,31 @@ class ProductionPlanResource extends Resource
                                 $set('Shift', null);
                             }),
 
-                        // line
+                        //line
                         Select::make('Line')
                             ->label('Select line')
                             ->nullable()
                             ->options(function (callable $get) {
                                 $plantId = $get('Plant');
 
-                                if (! $plantId) {
+                                if (!$plantId ) {
                                     return [];
                                 }
-
                                 return Line::where('plant_id', $plantId)
-                                    ->pluck('name', 'id');
+                                ->pluck('name', 'id');
                             })
                             ->reactive(),
 
-                        // block
+                        //block
                         Select::make('Block')
                             ->label('Select Block')
                             ->nullable()
                             ->options(function (callable $get) {
                                 $plantId = $get('Plant');
 
-                                if (! $plantId) {
+                                if (!$plantId ) {
                                     return [];
                                 }
-
                                 return Block::where('plant_id', $get('Plant'))->pluck('name', 'id');
                             })
                             ->reactive()
@@ -557,7 +634,7 @@ class ProductionPlanResource extends Resource
                                 $set('Shift', null);
                             }),
 
-                        // shift
+                        //shift
                         Select::make('Shift')
                             ->label('Select Shift')
                             ->nullable()
@@ -565,7 +642,7 @@ class ProductionPlanResource extends Resource
                                 $plantId = $get('Plant');
                                 $blockId = $get('Block');
 
-                                if (! $plantId || ! $blockId) {
+                                if (!$plantId || !$blockId) {
                                     return []; // Return empty if plant or block is not selected
                                 }
 
@@ -592,66 +669,52 @@ class ProductionPlanResource extends Resource
                             return $query->whereRaw('1 = 0');
                         }
 
-                        if (! empty($data['Plant'])) {// if ($plant = $data['Plant'] ?? null) {
-                            $query->where('plant_id', $data['Plant']);
-                        } else {
-                            $userHas = Filament::auth()->user()->plant_id;
-
-                            if ($userHas && strlen($userHas) > 0) {
-                                return $query->whereRaw('1 = 0');
-                            }
+                        if ($plant = $data['Plant'] ?? null) {
+                            $query->where('plant_id', $plant);
                         }
 
-                        if (! empty($data['Shift'])) {// if ($shift = $data['Shift'] ?? null) {
-                            $query->where('shift_id', $data['Shift']);
+                        if ($shift = $data['Shift'] ?? null) {
+                            $query->where('shift_id', $shift);
                         }
 
-
-                        if (! empty($data['Line'])) {// if ($line = $data['Line'] ?? null) {
-                            $query->where('line_id', $data['Line']);
+                        if ($line = $data['Line'] ?? null) {
+                            $query->where('line_id', $line);
                         }
 
-                        if (! empty($data['created_from'])) {// if ($from = $data['created_from'] ?? null) {
-                            $query->where('created_at', '>=', $data['created_from']);
+                        if ($from = $data['created_from'] ?? null) {
+                            $query->where('created_at', '>=', $from);
                         }
 
-                        if (! empty($data['created_to'])) {// if ($to = $data['created_to'] ?? null) {
-                            $query->where('created_at', '<=', $data['created_to']);
+                        if ($to = $data['created_to'] ?? null) {
+                            $query->where('created_at', '<=', $to);
                         }
-
                         return $query;
                     })
                     ->indicateUsing(function (array $data) {
                         $indicators = [];
 
-                        if (! empty($data['Plant'])) {
-                            $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['Plant'])) {
+                            $indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
                         }
 
-                        if (! empty($data['Shift'])) {
-                            $indicators[] = 'Shift: '.Shift::where('id', $data['Shift'])->value('name');
+                        if (!empty($data['Shift'])) {
+                            $indicators[] = 'Shift: ' . Shift::where('id', $data['Shift'])->value('name');
                         }
 
-                        if (! empty($data['Line'])) {
-                            $indicators[] = 'Line: '.Line::where('id', $data['Line'])->value('name');
+                        if (!empty($data['Line'])) {
+                            $indicators[] = 'Line: ' . Line::where('id', $data['Line'])->value('name');
                         }
 
-                        if (! empty($data['created_from'])) {
-                            $indicators[] = 'From: '.$data['created_from'];
+                        if (!empty($data['created_from'])) {
+                            $indicators[] = 'From: ' . $data['created_from'];
                         }
 
-                        if (! empty($data['created_to'])) {
-                            $indicators[] = 'To: '.$data['created_to'];
+                        if (!empty($data['created_to'])) {
+                            $indicators[] = 'To: ' . $data['created_to'];
                         }
 
                         return $indicators;
-                    }),
+                    })
             ])
             ->filtersFormMaxHeight('280px')
             ->actions([
@@ -663,7 +726,7 @@ class ProductionPlanResource extends Resource
                     Tables\Actions\DeleteBulkAction::make(),
                     Tables\Actions\ForceDeleteBulkAction::make(),
                     Tables\Actions\RestoreBulkAction::make(),
-                    FilamentExportBulkAction::make('export'),
+                    FilamentExportBulkAction::make('export')
                 ]),
             ])
             ->headerActions([
@@ -671,14 +734,14 @@ class ProductionPlanResource extends Resource
                     ->label('Import Production Plans')
                     ->color('warning')
                     ->importer(ProductionPlanImporter::class)
-                    ->visible(function () {
+                    ->visible(function() {
                         return Filament::auth()->user()->can('view import production plan');
                     }),
                 ExportAction::make()
                     ->label('Export Production Plans')
                     ->color('warning')
                     ->exporter(ProductionPlanExporter::class)
-                    ->visible(function () {
+                    ->visible(function() {
                         return Filament::auth()->user()->can('view export production plan');
                     }),
             ]);

app/Filament/Resources/RequestQuotationResource.php

@@ -1,295 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Exports\RequestQuotationExporter;
-use App\Filament\Imports\RequestQuotationImporter;
-use App\Filament\Resources\RequestQuotationResource\Pages;
-use App\Filament\Resources\RequestQuotationResource\RelationManagers;
-use App\Models\RequestQuotation;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Facades\Auth;
-use Filament\Tables\Actions\ImportAction;
-use Filament\Tables\Actions\ExportAction;
-
-class RequestQuotationResource extends Resource
-{
-    protected static ?string $model = RequestQuotation::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Request For Quotation';
-
-    public static function form(Form $form): Form
-    {
-        $canEdit = Auth::user()?->can('edit_transport_fields');
-        $canEditData = Auth::user()?->can('edit_all_transport_fields');
-        return $form
-
-            ->schema([
-                Forms\Components\TextInput::make('rfq_number')
-                    ->label('RFQ Number')
-                    ->readOnly()
-                    ->required(),
-                Forms\Components\Select::make('spot_rate_transport_master_id')
-                    ->label('Group Name')
-                    ->relationship('spotRateTransportMaster', 'group_name')
-                    ->required(),
-                Forms\Components\DateTimePicker::make('rfq_date_time')
-                    ->label('RFQ Date Time')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('pickup_address')
-                    ->label('PickUp Address')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('delivery_address')
-                    ->label('Delivery Address')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('weight')
-                    ->label('Weight')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('volumetrice_size_inch')
-                    ->label('Volumetrice')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('type_of_vehicle')
-                    ->label('Type of Vehicle')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('special_type')
-                    ->label('Special Type')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('no_of_vehicle')
-                    ->label('No of Vehicle')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('product_name')
-                    ->label('Product Name')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('loading_by')
-                    ->label('Loading By')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('unloading_by')
-                    ->label('Unloading By')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('pick_and_delivery')
-                    ->label('Pick and Delivery')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('payment_term')
-                    ->label('Payment Term')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\TextInput::make('paid_topay')
-                    ->label('Paid Today')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\DateTimePicker::make('require_date_time')
-                    ->label('Require Date Time')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                Forms\Components\DateTimePicker::make('rfq_rec_on_or_before')
-                    ->label('RFQ Receive On Or Before')
-                    ->disabled(fn () => !$canEditData)
-                    ->required(),
-                // Forms\Components\TextInput::make('transporter_name')
-                //     ->label('Transporter Name')
-                //     ->disabled(fn () => !($canEdit || $canEditData)),
-                // Forms\Components\TextInput::make('total_freight_charge')
-                //     ->label('Total Freight Charge')
-                //     ->disabled(fn () => !($canEdit || $canEditData)),
-                // Forms\Components\TextInput::make('transit_day')
-                //     ->label('Transit Day')
-                //     ->disabled(fn () => !($canEdit || $canEditData)),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By'),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By'),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('rfq_number')
-                    ->label('RFQ Number')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('spotRateTransportMaster.group_name')
-                    ->label('Group Name')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('rfq_date_time')
-                    ->label('RFQ Date Time')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('pickup_address')
-                    ->label('PickUp Address')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('delivery_address')
-                    ->label('Delivery Address')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('weight')
-                    ->label('Weight')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('volumetrice_size_inch')
-                    ->label('Volumetrice Size Inch')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type_of_vehicle')
-                    ->label('Type Of Vehicle')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('product_name')
-                    ->label('Product Name')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('loading_by')
-                    ->label('Loading By')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('unloading_by')
-                    ->label('Unloading By')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('unloading_by')
-                    ->label('Unloading By')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('pick_and_delivery')
-                    ->label('Pick and Delivery')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('payment_term')
-                    ->label('Payment Term')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('paid_topay')
-                    ->label('Paid Today')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('require_date_time')
-                    ->label('Require Date Time')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('rfq_rec_on_or_before')
-                    ->label('RFQ Receive On Or Before')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('transporter_name')
-                    ->label('Transporter Name')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('total_freight_charge')
-                    ->label('Total Freight Charge')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('transit_day')
-                    ->label('Transit Day')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->label('Deleted At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ])
-            ->headerActions([
-                ImportAction::make()
-                    ->label('Import  RequestQuotation')
-                    ->color('warning')
-                    ->importer(RequestQuotationImporter::class)
-                    ->visible(function() {
-                        return Filament::auth()->user()->can('view import request quotation');
-                    }),
-                ExportAction::make()
-                    ->label('Export RequestQuotation')
-                    ->color('warning')
-                    ->exporter(RequestQuotationExporter::class)
-                    ->visible(function() {
-                        return Filament::auth()->user()->can('view export request quotation');
-                    }),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListRequestQuotations::route('/'),
-            'create' => Pages\CreateRequestQuotation::route('/create'),
-            'view' => Pages\ViewRequestQuotation::route('/{record}'),
-            'edit' => Pages\EditRequestQuotation::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/RequestQuotationResource/Pages/CreateRequestQuotation.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RequestQuotationResource\Pages;
-
-use App\Filament\Resources\RequestQuotationResource;
-use App\Models\RequestQuotation;
-use Filament\Actions;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateRequestQuotation extends CreateRecord
-{
-    protected static string $resource = RequestQuotationResource::class;
-
-    public function mount(): void
-    {
-        parent::mount();
-
-        $this->form->fill([
-            'rfq_number' => $this->generateRfqNumber(),
-        ]);
-    }
-
-    protected function generateRfqNumber(): string
-    {
-        $year = now()->year;
-
-        $lastRfq = RequestQuotation::whereYear('created_at', $year)
-            ->orderBy('id', 'desc')
-            ->value('rfq_number');
-
-        if ($lastRfq) {
-            $lastNumber = (int) substr($lastRfq, -3);
-            $nextNumber = str_pad($lastNumber + 1, 3, '0', STR_PAD_LEFT);
-        } else {
-            $nextNumber = '001';
-        }
-
-        return "C.R.I-{$year}-{$nextNumber}";
-    }
-}

app/Filament/Resources/RequestQuotationResource/Pages/EditRequestQuotation.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RequestQuotationResource\Pages;
-
-use App\Filament\Resources\RequestQuotationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditRequestQuotation extends EditRecord
-{
-    protected static string $resource = RequestQuotationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/RequestQuotationResource/Pages/ListRequestQuotations.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RequestQuotationResource\Pages;
-
-use App\Filament\Resources\RequestQuotationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListRequestQuotations extends ListRecords
-{
-    protected static string $resource = RequestQuotationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/RequestQuotationResource/Pages/ViewRequestQuotation.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RequestQuotationResource\Pages;
-
-use App\Filament\Resources\RequestQuotationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewRequestQuotation extends ViewRecord
-{
-    protected static string $resource = RequestQuotationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Resources/RfqTransporterBidResource.php

@@ -1,345 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\RfqTransporterBidResource\Pages;
-use App\Filament\Resources\RfqTransporterBidResource\RelationManagers;
-use App\Models\RfqTransporterBid;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Validation\Rule;
-
-
-class RfqTransporterBidResource extends Resource
-{
-    protected static ?string $model = RfqTransporterBid::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Request For Quotation';
-
-
-    public static function getEloquentQuery(): Builder
-    {
-        $user = Filament::auth()->user();
-
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ])
-            ->when(
-                ! $user->hasAnyRole(['Super Admin', 'TransporterBidSupervisor']),
-                fn (Builder $query) => $query
-                    ->where('transporter_name', $user->name)
-                    ->whereNotNull('request_quotation_id')
-            );
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Select::make('request_quotation_id')
-                    ->label('RFQ Number')
-                    // ->relationship('requestQuotation', 'rfq_number')
-                    ->relationship(
-                        'requestQuotation',
-                        'rfq_number',
-                        function (Builder $query) {
-
-                            $userName = Filament::auth()->user()?->name;
-
-                            $masterIds = \App\Models\SpotRateTransportMaster::whereRaw(
-                                    "user_name::jsonb @> ?",
-                                    [json_encode([$userName])]
-                                )
-                                ->pluck('id')
-                                ->unique()
-                                ->toArray();
-
-                            if (empty($masterIds)) {
-                                $query->whereRaw('1 = 0');
-                                return;
-                            }
-
-                            $query->whereIn('spot_rate_transport_master_id', $masterIds);
-                        }
-                    )
-                    ->reactive()
-                    // ->disabled(fn ($record) => !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor']))
-                    ->disabled(fn ($record) =>
-                        !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor'])
-                        && $record
-                    )
-                    ->afterStateUpdated(function ($state, callable $set) {
-                        $rfq = \App\Models\RequestQuotation::find($state);
-                        if ($rfq) {
-                            $set('pickup_address', $rfq->pickup_address);
-                            $set('delivery_address', $rfq->delivery_address);
-                            $set('type_of_vehicle', $rfq->type_of_vehicle);
-                            $set('weight', $rfq->weight);
-                            $set('volumetrice_size_inch', $rfq->volumetrice_size_inch);
-                            $set('no_of_vehicle', $rfq->no_of_vehicle);
-                            $set('product_name', $rfq->product_name);
-                            $set('pick_and_delivery', $rfq->pick_and_delivery);
-                            $set('payment_term', $rfq->payment_term);
-                            $set('paid_topay', $rfq->paid_topay);
-                            $set('loading_by', $rfq->loading_by);
-                            $set('unloading_by', $rfq->unloading_by);
-                            $set('special_type', $rfq->special_type);
-                            $set('rfq_date_time', $rfq->rfq_date_time);
-                            $set('require_date_time', $rfq->require_date_time);
-                            $set('rfq_rec_on_or_before', $rfq->rfq_rec_on_or_before);
-                        }
-                    })
-                    ->afterStateHydrated(function ($state, callable $set) {
-                        $rfq = \App\Models\RequestQuotation::find($state);
-                        if ($rfq) {
-                            $set('pickup_address', $rfq->pickup_address);
-                            $set('delivery_address', $rfq->delivery_address);
-                            $set('type_of_vehicle', $rfq->type_of_vehicle);
-                            $set('weight', $rfq->weight);
-                            $set('volumetrice_size_inch', $rfq->volumetrice_size_inch);
-                            $set('no_of_vehicle', $rfq->no_of_vehicle);
-                            $set('product_name', $rfq->product_name);
-                            $set('pick_and_delivery', $rfq->pick_and_delivery);
-                            $set('payment_term', $rfq->payment_term);
-                            $set('paid_topay', $rfq->paid_topay);
-                            $set('loading_by', $rfq->loading_by);
-                            $set('unloading_by', $rfq->unloading_by);
-                            $set('special_type', $rfq->special_type);
-                            $set('rfq_date_time', $rfq->rfq_date_time);
-                            $set('require_date_time', $rfq->require_date_time);
-                            $set('rfq_rec_on_or_before', $rfq->rfq_rec_on_or_before);
-                        }
-                    })
-                    ->required(),
-                Forms\Components\Section::make('RFQ Details')
-                    ->visible(fn ($get) => $get('request_quotation_id') != null)
-                    ->reactive()
-                    ->schema([
-                        TextInput::make('pickup_address')->label('Pickup Address')->disabled(),
-                        TextInput::make('delivery_address')->label('Delivery Address')->disabled(),
-                        TextInput::make('type_of_vehicle')->label('Vehicle Type')->disabled(),
-                        TextInput::make('weight')->label('Weight')->disabled(),
-                        TextInput::make('volumetrice_size_inch')->label('Volumetric Size')->disabled(),
-                        TextInput::make('no_of_vehicle')->label('No. of Vehicle')->disabled(),
-                        TextInput::make('product_name')->label('Product Name')->disabled(),
-                        TextInput::make('pick_and_delivery')->label('Pick & Delivery')->disabled(),
-                        TextInput::make('payment_term')->label('Payment Term')->disabled(),
-                        TextInput::make('paid_topay')->label('Paid / To Pay')->disabled(),
-                        TextInput::make('loading_by')->label('Loading By')->disabled(),
-                        TextInput::make('unloading_by')->label('Unloading By')->disabled(),
-                        TextInput::make('special_type')->label('Special Type')->disabled(),
-                        TextInput::make('rfq_date_time')->label('RFQ Created On')->disabled(),
-                        TextInput::make('require_date_time')->label('Required Date')->disabled(),
-                        TextInput::make('rfq_rec_on_or_before')->label('RFQ Received On/Before')->disabled(),
-                    ]),
-                Forms\Components\TextInput::make('transporter_name')
-                    ->label('Transporter Name')
-                    ->readOnly()
-                    ->default(Filament::auth()->user()?->name)
-                    ->required()
-                    ->rule(function (callable $get) {
-                        return Rule::unique('rfq_transporter_bids', 'transporter_name')
-                            ->where('request_quotation_id', $get('request_quotation_id'))
-                            ->ignore($get('id'));
-                    }),
-                Forms\Components\TextInput::make('total_freight_charge')
-                    ->label('Total Freight Charge')
-                    ->required()
-                    // ->disabled(fn ($record) => $record && $record->created_by != Filament::auth()->user()?->name)
-                    // ->hidden(fn ($record) => !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor']) && $record->transporter_name != Filament::auth()->user()?->name),
-                    ->hidden(fn ($record) =>
-                        !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor'])
-                        && ($record && $record->transporter_name != Filament::auth()->user()?->name) // Ensure $record is not null before checking transporter_name
-                ),
-                Forms\Components\TextInput::make('transit_day')
-                    ->label('Transit Day')
-                    ->required()
-                    // ->disabled(fn ($record) => $record && $record->created_by != Filament::auth()->user()?->name),
-                    // ->hidden(fn ($record) => !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor']) && $record->transporter_name != Filament::auth()->user()?->name),
-                ->hidden(fn ($record) =>
-                    !Filament::auth()->user()?->hasAnyRole(['Super Admin', 'TransporterBidSupervisor'])
-                    && ($record && $record->transporter_name != Filament::auth()->user()?->name) // Ensure $record is not null before checking transporter_name
-                ),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-                ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('requestQuotation.rfq_number')
-                    ->label('RFQ Number')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.pickup_address')
-                    ->label('PickUp Address')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.delivery_address')
-                    ->label('Delivery Address')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.type_of_vehicle')
-                    ->label('Type Of Vehicle')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.weight')
-                    ->label('Weight')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.volumetrice_size_inch')
-                    ->label('Volumetrice Size Inch')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.no_of_vehicle')
-                    ->label('No Of Vehicle')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.product_name')
-                    ->label('Product Name')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.pick_and_delivery')
-                    ->label('Pick And Delivery')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.payment_term')
-                    ->label('Payment Term')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.paid_topay')
-                    ->label('Paid Today')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.loading_by')
-                    ->label('Loading By')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.unloading_by')
-                    ->label('Unloading By')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.special_type')
-                    ->label('Special Type')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.rfq_date_time')
-                    ->label('RFQ DateTime')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.require_date_time')
-                    ->label('RFQ Require DateTime')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('requestQuotation.rfq_rec_on_or_before')
-                    ->label('RFQ Rec On Or Before')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('created_by')
-                    ->label('Created By')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_by')
-                    ->label('Updated By')
-                    ->searchable()
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListRfqTransporterBids::route('/'),
-            'create' => Pages\CreateRfqTransporterBid::route('/create'),
-            'view' => Pages\ViewRfqTransporterBid::route('/{record}'),
-            'edit' => Pages\EditRfqTransporterBid::route('/{record}/edit'),
-        ];
-    }
-
-    // public static function getEloquentQuery(): Builder
-    // {
-    //     return parent::getEloquentQuery()
-    //         ->withoutGlobalScopes([
-    //             SoftDeletingScope::class,
-    //         ]);
-    // }
-}

app/Filament/Resources/RfqTransporterBidResource/Pages/CreateRfqTransporterBid.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RfqTransporterBidResource\Pages;
-
-use App\Filament\Resources\RfqTransporterBidResource;
-use App\Models\RfqTransporterBid;
-use App\Models\User;
-use App\Notifications\PushAlertNotification;
-use Filament\Actions;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateRfqTransporterBid extends CreateRecord
-{
-    protected static string $resource = RfqTransporterBidResource::class;
-
-
-    protected function afterCreate(): void
-    {
-        $record = $this->record;
-
-        // Calculate rank based on total_freight_charge
-        $rank = RfqTransporterBid::where('request_quotation_id', $this->record->request_quotation_id)
-            ->orderBy('total_freight_charge')
-            ->pluck('id')
-            ->search($this->record->id) + 1;
-
-        $recipients = User::role(['Super Admin', 'Rfq Supervisor'])->get();
-        $currentUser = Filament::auth()->user();
-
-
-        if ($currentUser && ! $recipients->contains('id', $currentUser->id)) {
-            $recipients->push($currentUser);
-        }
-
-        // $user1 = Filament::auth()->user();
-
-        $rfqNumber = $this->record->requestQuotation->rfq_number;
-        $body = "{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.";
-
-        Notification::make()
-            ->title('Rank Updated')
-            ->body("{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.")
-            ->success()
-            ->sendToDatabase($recipients);
-
-        // Push notification
-        foreach ($recipients as $user) {
-            $user->notify(
-                new PushAlertNotification(
-                    'New Bid Added',
-                    $body
-                )
-            );
-        }
-
-        \Log::info('Create bid notification sent', [
-            'bid_id' => $record->id,
-            'rank' => $rank,
-            'recipients' => $recipients->pluck('id'),
-        ]);
-    }
-}

app/Filament/Resources/RfqTransporterBidResource/Pages/EditRfqTransporterBid.php

@@ -1,175 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RfqTransporterBidResource\Pages;
-
-use App\Filament\Resources\RfqTransporterBidResource;
-use App\Models\RequestQuotation;
-use App\Models\RfqTransporterBid;
-use App\Models\SpotRateTransportMaster;
-use App\Models\User;
-use App\Notifications\PushAlertNotification;
-use Filament\Actions;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\EditRecord;
-use Illuminate\Support\Facades\Log;
-
-class EditRfqTransporterBid extends EditRecord
-{
-    protected static string $resource = RfqTransporterBidResource::class;
-
-    protected function afterSave(): void
-    {
-        if (! $this->record->wasChanged('total_freight_charge')) {
-            return;
-        }
-
-        $rank = RfqTransporterBid::where('request_quotation_id', $this->record->request_quotation_id)
-            ->orderBy('total_freight_charge')
-            ->pluck('id')
-            ->search($this->record->id) + 1;
-
-        $requestQuotation = RequestQuotation::findOrFail(
-            $this->record->request_quotation_id
-        );
-
-        $spotRateId = $requestQuotation->spot_rate_transport_master_id;
-
-        $spotRate = SpotRateTransportMaster::findOrFail($spotRateId);
-
-        $userNames = $spotRate->user_name;
-
-        Log::info('User names from spot rate', [
-            'user_name_raw' => $spotRate->user_name,
-        ]);
-
-        if (!is_array($userNames)) {
-            Log::warning('user_name is not array, resetting', [
-                'user_name' => $userNames,
-            ]);
-            $userNames = [];
-        }
-
-
-        $users = User::whereIn('name', $userNames)->get();
-
-        Log::info('Matched users', [
-            'count' => $users->count(),
-            'user_ids' => $users->pluck('id'),
-        ]);
-
-        // $recipients = User::role(['Super Admin', 'Rfq Supervisor', 'TransporterBid Employee'])->get();
-
-        // $recipients1 = User::role(['Super Admin', 'Rfq Supervisor', 'TransporterBid Employee'])->whereHas('pushSubscriptions')->get();
-
-        $currentUser = Filament::auth()->user();
-
-        // if ($currentUser && ! $recipients1->contains('id', $currentUser->id)) {
-        //     $recipients1->push($currentUser);
-        // }
-
-        // if ($currentUser && ! $recipients->contains('id', $currentUser->id)) {
-        //     $recipients->push($currentUser);
-        // }
-
-        // $user1 = Filament::auth()->user();
-
-
-        $rfqNumber = $this->record->requestQuotation->rfq_number;
-        $body = "{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.";
-
-        // Notification::make()
-        //     ->title('Rank Updated')
-        //     ->body("{$currentUser->name} current rank is #{$rank}")
-        //     ->success()
-        //     ->sendToDatabase($recipients);
-
-        //     \Log::info('Notification sent', [
-        //     'rank' => $rank,
-        //     'recipients' => $recipients->pluck('id'),
-        // ]);
-
-        Notification::make()
-        ->title('Rank Updated')
-        ->body("{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.")
-        ->success()
-        ->sendToDatabase($users);
-
-        // foreach ($recipients1 as $user) {
-        //     $user->notify(
-        //         new PushAlertNotification(
-        //             'Rank Updated',
-        //             $body
-        //         )
-        //     );
-        // }
-
-        // foreach ($users as $user) {
-
-        // Log::info('Checking push subscription for user', [
-        //     'user_id' => $user->id,
-        //     'name' => $user->name,
-        //     'subscription_count' => $user->pushSubscriptions()->count(),
-        // ]);
-        //     if ($user->pushSubscriptions()->exists()) {
-
-        //         Log::info('Sending push notification', [
-        //             'user_id' => $user->id,
-        //         ]);
-        //         $user->notify(
-        //             new PushAlertNotification(
-        //                 'Rank Updated',
-        //                 $body
-        //             )
-        //         );
-        //     }
-        //     else {
-        //         Log::warning('User has NO push subscription', [
-        //             'user_id' => $user->id,
-        //         ]);
-        //     }
-        // }
-
-
-            foreach ($users as $user) {
-
-                $count = $user->pushSubscriptions()->count();
-
-                Log::info('Checking push subscription for user', [
-                    'user_id' => $user->id,
-                    'name' => $user->name,
-                    'subscription_count' => $count,
-                ]);
-
-                if ($count == 0) {
-                    Log::warning('User has NO push subscription', [
-                        'user_id' => $user->id,
-                    ]);
-                    continue;
-                }
-
-                Log::info('Sending push notification', [
-                    'user_id' => $user->id,
-                ]);
-
-                // ✅ THIS IS ALL YOU NEED
-                $user->notify(new PushAlertNotification(
-                    'Rank Updated',
-                    $body
-                ));
-            }
-
-
-
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/RfqTransporterBidResource/Pages/ListRfqTransporterBids.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RfqTransporterBidResource\Pages;
-
-use App\Filament\Resources\RfqTransporterBidResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListRfqTransporterBids extends ListRecords
-{
-    protected static string $resource = RfqTransporterBidResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/RfqTransporterBidResource/Pages/ViewRfqTransporterBid.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RfqTransporterBidResource\Pages;
-
-use App\Filament\Resources\RfqTransporterBidResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewRfqTransporterBid extends ViewRecord
-{
-    protected static string $resource = RfqTransporterBidResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Resources/SpotRateTransportMasterResource.php

@@ -1,130 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\SpotRateTransportMasterResource\Pages;
-use App\Filament\Resources\SpotRateTransportMasterResource\RelationManagers;
-use App\Models\SpotRateTransportMaster;
-use App\Models\User;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Validation\Rule;
-use Illuminate\Support\Facades\DB;
-
-class SpotRateTransportMasterResource extends Resource
-{
-    protected static ?string $model = SpotRateTransportMaster::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Request For Quotation';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('group_name')
-                    ->label('Group Name')
-                    ->required(),
-                Forms\Components\Select::make('user_name')
-                    ->label('User')
-                    ->multiple()
-                    ->preload()
-                    ->reactive()
-                   ->options(
-                        User::pluck('name', 'name')->toArray()
-                    )
-                    ->searchable()
-                    ->required(),
-                Forms\Components\Hidden::make('id')
-                    ->label('id'),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('group_name')
-                    ->label('Group Name')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('user_name')
-                    ->label('User Name')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListSpotRateTransportMasters::route('/'),
-            'create' => Pages\CreateSpotRateTransportMaster::route('/create'),
-            'view' => Pages\ViewSpotRateTransportMaster::route('/{record}'),
-            'edit' => Pages\EditSpotRateTransportMaster::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/SpotRateTransportMasterResource/Pages/CreateSpotRateTransportMaster.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\SpotRateTransportMasterResource\Pages;
-
-use App\Filament\Resources\SpotRateTransportMasterResource;
-use App\Models\SpotRateTransportMaster;
-use Filament\Actions;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateSpotRateTransportMaster extends CreateRecord
-{
-    protected static string $resource = SpotRateTransportMasterResource::class;
-
-    protected function beforeCreate(): void
-    {
-        $groupName = $this->data['group_name'] ?? null;
-        $userNames = $this->data['user_name'] ?? [];
-
-        foreach ($userNames as $userName) {
-
-            $query = SpotRateTransportMaster::where('group_name', $groupName)
-                ->whereJsonContains('user_name', $userName);
-
-            if ($query->exists()) {
-
-                Notification::make()
-                    ->title('Duplicate User')
-                    ->body("User {$userName} already exists in this group.")
-                    ->danger()
-                    ->persistent()
-                    ->send();
-
-                // Prevent create
-                $this->halt();
-                return;
-            }
-        }
-    }
-
-
-
-}

app/Filament/Resources/SpotRateTransportMasterResource/Pages/EditSpotRateTransportMaster.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\SpotRateTransportMasterResource\Pages;
-
-use App\Filament\Resources\SpotRateTransportMasterResource;
-use App\Models\SpotRateTransportMaster;
-use Filament\Actions;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\EditRecord;
-
-class EditSpotRateTransportMaster extends EditRecord
-{
-    protected static string $resource = SpotRateTransportMasterResource::class;
-
-    protected function beforeSave(): void
-    {
-        $groupName = $this->data['group_name'] ?? null;
-        $userNames = $this->data['user_name'] ?? [];
-        $recordId = $this->record->id ?? null;
-
-        foreach ($userNames as $userName) {
-
-            $query = SpotRateTransportMaster::where('group_name', $groupName)
-                ->whereJsonContains('user_name', $userName);
-
-            // Exclude current record for update
-            if ($recordId) {
-                $query->where('id', '!=', $recordId);
-            }
-
-            if ($query->exists()) {
-
-                Notification::make()
-                    ->title('Duplicate User')
-                    ->body("User {$userName} already exists in this group.")
-                    ->danger()
-                    ->persistent()
-                    ->send();
-
-                // Prevent save/update
-                $this->halt();
-                return;
-            }
-        }
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/SpotRateTransportMasterResource/Pages/ListSpotRateTransportMasters.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\SpotRateTransportMasterResource\Pages;
-
-use App\Filament\Resources\SpotRateTransportMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListSpotRateTransportMasters extends ListRecords
-{
-    protected static string $resource = SpotRateTransportMasterResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/SpotRateTransportMasterResource/Pages/ViewSpotRateTransportMaster.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\SpotRateTransportMasterResource\Pages;
-
-use App\Filament\Resources\SpotRateTransportMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewSpotRateTransportMaster extends ViewRecord
-{
-    protected static string $resource = SpotRateTransportMasterResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Resources/StickerDetailResource.php

@@ -194,19 +194,19 @@ class StickerDetailResource extends Resource
                     ->label('Shape Y2 Value')
                     ->reactive()
                     ->visible(fn ($get) => $get('design_element_type') == 'Shape'),
-                // Forms\Components\FileUpload::make('image_path')
-                //     ->label('Image')
-                //     ->image()
-                //     ->directory('sticker-images')
-                //     ->visibility('public')
-                //     ->preserveFilenames(false)
-                //     ->required(false)
-                //     ->reactive()
-                //     ->visible(fn ($get) => $get('design_element_type') == 'Image'),
-                // Forms\Components\TextInput::make('image_type')
-                //     ->label('Image Type')
-                //     ->reactive()
-                //     ->visible(fn ($get) => $get('design_element_type') == 'Image'),
+                Forms\Components\FileUpload::make('image_path')
+                    ->label('Image')
+                    ->image()
+                    ->directory('sticker-images')
+                    ->visibility('public')
+                    ->preserveFilenames(false)
+                    ->required(false)
+                    ->reactive()
+                    ->visible(fn ($get) => $get('design_element_type') == 'Image'),
+                Forms\Components\TextInput::make('image_type')
+                    ->label('Image Type')
+                    ->reactive()
+                    ->visible(fn ($get) => $get('design_element_type') == 'Image'),
                 Forms\Components\TextInput::make('image_x')
                     ->label('Image X')
                     ->reactive()
@@ -322,6 +322,12 @@ class StickerDetailResource extends Resource
                 Tables\Columns\TextColumn::make('shape_y2_value')
                     ->label('Shape Y2 Value')
                     ->alignCenter(),
+                Tables\Columns\TextColumn::make('image_path')
+                    ->label('Image Path')
+                    ->alignCenter(),
+                Tables\Columns\TextColumn::make('image_type')
+                    ->label('Image Type')
+                    ->alignCenter(),
                 Tables\Columns\TextColumn::make('image_x')
                     ->label('Image X')
                     ->alignCenter(),

app/Filament/Resources/StickerMappingMasterResource.php

@@ -6,24 +6,18 @@ use App\Filament\Exports\StickerMappingMasterExporter;
 use App\Filament\Imports\StickerMappingMasterImporter;
 use App\Filament\Resources\StickerMappingMasterResource\Pages;
 use App\Filament\Resources\StickerMappingMasterResource\RelationManagers;
-use App\Models\Item;
-use App\Models\ItemCharacteristic;
-use App\Models\Machine;
+use App\Models\Plant;
 use App\Models\StickerMappingMaster;
-use App\Models\StickerStructureDetail;
 use Filament\Facades\Filament;
 use Filament\Forms;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Tables\Actions\ExportAction;
 use Filament\Tables\Actions\ImportAction;
+use Filament\Tables\Actions\ExportAction;
 
 class StickerMappingMasterResource extends Resource
 {
@@ -31,424 +25,143 @@ class StickerMappingMasterResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
-    protected static ?string $navigationGroup = 'Customized Sticker Printing';
-
-    // public static function form(Form $form): Form
-    // {
-    //     return $form
-    //         ->schema([
-    //             Forms\Components\TextInput::make('plant_id')
-    //                 ->required()
-    //                 ->numeric(),
-    //             Forms\Components\TextInput::make('item_id')
-    //                 ->required()
-    //                 ->numeric(),
-    //             Forms\Components\Textarea::make('sticker1')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('sticker2')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('sticker3')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('sticker4')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('sticker5')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('created_by')
-    //                 ->columnSpanFull(),
-    //             Forms\Components\Textarea::make('updated_by')
-    //                 ->columnSpanFull(),
-    //         ]);
-    // }
+    protected static ?string $navigationGroup = 'Master Entries';
 
+    protected static ?int $navigationSort = 16;
 
     public static function form(Form $form): Form
-{
-    return $form
-        ->schema([
-            /* -------- Basic Mapping -------- */
-            Section::make('Basic Mapping')
-                ->schema([
-                    Select::make('plant_id')
-                        ->label('Plant')
-                        ->reactive()
-                        ->relationship('plant', 'name')
-                        ->required(),
-
-                    Select::make('item_characteristic_id')
-                        ->label('Item Code')
-                        ->reactive()
-                        //->relationship('item', 'code')
-                        ->options(function (callable $get) {
+    {
+        return $form
+            ->schema([
+                Forms\Components\Select::make('plant_id')
+                    ->label('Plant')
+                    ->reactive()
+                    ->relationship('plant', 'name')
+                    ->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();
+                    })
+                    ->required(),
+                Forms\Components\Select::make('item_id')
+                    ->label('Item')
+                    ->reactive()
+                    ->options(function (callable $get) {
                         $plantId = $get('plant_id');
-
-                        if (! $plantId) {
+                        if (empty($plantId)) {
                             return [];
                         }
-
-                        return ItemCharacteristic::query()
-                            ->whereHas('item', function ($query) use ($plantId) {
-                                $query->where('plant_id', $plantId);
-                            })
-                            ->with('item')
-                            ->get()
-                            ->mapWithKeys(fn ($ic) => [
-                                $ic->id => $ic->item->code,
-                            ]);
+                        return \App\Models\Item::where('plant_id', $plantId)->pluck('code', 'id');
                     })
-                    ->searchable()
                     ->required(),
-                ])
-                ->columns(2),
+                Forms\Components\TextInput::make('sticker1')
+                    ->label('Sticker Label 1')
+                    ->required(),
+                Forms\Components\TextInput::make('sticker2')
+                    ->label('Sticker Label 2'),
+                Forms\Components\TextInput::make('sticker3')
+                    ->label('Sticker Label 3'),
+                Forms\Components\TextInput::make('sticker4')
+                    ->label('Sticker Label 4'),
+                Forms\Components\TextInput::make('sticker5')
+                    ->label('Sticker Label 5'),
+                Forms\Components\Hidden::make('created_by')
+                    ->label('Created By')
+                    ->default(Filament::auth()->user()?->name),
+                Forms\Components\Hidden::make('updated_by')
+                    ->label('Updated By')
+                    ->default(Filament::auth()->user()?->name),
+            ]);
+    }
 
-            /* -------- Sticker 1 -------- */
-            Section::make('Sticker 1')
-                ->schema([
-                    Select::make('sticker_structure1_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker1_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker1Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker1_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 2 -------- */
-            Section::make('Sticker 2')
-                ->schema([
-                    Select::make('sticker_structure2_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker2_machine_id')
-                        ->label('Work Center')
-                       // ->relationship('sticker2Machine', 'name')
-                       ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker2_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 3 -------- */
-            Section::make('Sticker 3')
-                ->schema([
-                    Select::make('sticker_structure3_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker3_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker3Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker3_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 4 -------- */
-            Section::make('Sticker 4')
-                ->schema([
-                    Select::make('sticker_structure4_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker4_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker4Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker4_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 5 -------- */
-            Section::make('Sticker 5')
-                ->schema([
-                    Select::make('sticker_structure5_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker5_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker5Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker5_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 6 -------- */
-            Section::make('Sticker 6')
-                ->schema([
-                    Select::make('sticker_structure6_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker6_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker6Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker6_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 7 -------- */
-            Section::make('Sticker 7')
-                ->schema([
-                    Select::make('sticker_structure7_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker7_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker7Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker7_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-
-            /* -------- Sticker 8 -------- */
-            Section::make('Sticker 8')
-                ->schema([
-                    Select::make('sticker_structure8_id')
-                        ->label('Sticker ID')
-                        ->options(function (callable $get) {
-                            return StickerStructureDetail::pluck('sticker_id', 'id');
-                        })
-                        ->searchable(),
-                    Select::make('sticker8_machine_id')
-                        ->label('Work Center')
-                        //->relationship('sticker8Machine', 'name')
-                        ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                    TextInput::make('sticker8_print_ip')
-                        ->label('Printer IP')
-                        ->ipv4(),
-                ])
-                ->columns(2),
-        ]);
-}
     public static function table(Table $table): Table
     {
         return $table
             ->columns([
-            Tables\Columns\TextColumn::make('No.')
+                Tables\Columns\TextColumn::make('No.')
                     ->label('No.')
                     ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
-            Tables\Columns\TextColumn::make('plant.name')
-                ->label('Plant')
-                ->alignCenter()
-                ->sortable(),
-            Tables\Columns\TextColumn::make('itemCharacteristic.item.code')
-                ->label('Item')
-                ->alignCenter()
-                ->sortable(),
-            Tables\Columns\TextColumn::make('sticker1Structure.sticker_id')
-                ->label('Sticker 1')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker1Machine.work_center')
-                ->label('WC 1')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker1_print_ip')
-                ->label('Printer IP 1')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker2Structure.sticker_id')
-                ->label('Sticker 2')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker2Machine.work_center')
-                ->label('WC 2')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker2_print_ip')
-                ->label('Printer IP 2')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker3Structure.sticker_id')
-                ->label('Sticker 3')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker3Machine.work_center')
-                ->label('WC 3')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker3_print_ip')
-                ->label('Printer IP 3')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker4Structure.sticker_id')
-                ->label('Sticker 4')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker4Machine.work_center')
-                ->label('WC 4')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker4_print_ip')
-                ->label('Printer IP 4')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker5Structure.sticker_id')
-                ->label('Sticker 5')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker5Machine.work_center')
-                ->label('WC 5')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker5_print_ip')
-                ->label('Printer IP 5')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker6Structure.sticker_id')
-                ->label('Sticker 6')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker6Machine.work_center')
-                ->label('WC 6')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker6_print_ip')
-                ->label('Printer IP 6')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker7Structure.sticker_id')
-                ->label('Sticker 7')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker7Machine.work_center')
-                ->label('WC 7')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker7_print_ip')
-                ->label('Printer IP 7')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker8Structure.sticker_id')
-                ->label('Sticker 8')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker8Machine.work_center')
-                ->label('WC 8')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('sticker8_print_ip')
-                ->label('Printer IP 8')
-                ->alignCenter(),
-            Tables\Columns\TextColumn::make('created_at')
-                ->label('Created At')
-                ->alignCenter()
-                ->dateTime()
-                ->sortable()
-                ->toggleable(isToggledHiddenByDefault: true),
-            Tables\Columns\TextColumn::make('updated_at')
-                ->label('Updated At')
-                ->alignCenter()
-                ->dateTime()
-                ->sortable()
-                ->toggleable(isToggledHiddenByDefault: true),
-            Tables\Columns\TextColumn::make('deleted_at')
-                ->dateTime()
-                ->sortable()
-                ->toggleable(isToggledHiddenByDefault: true),
-        ])
-        ->filters([
-            Tables\Filters\TrashedFilter::make(),
-        ])
-        ->actions([
-            Tables\Actions\ViewAction::make(),
-            Tables\Actions\EditAction::make(),
-        ])
-        ->bulkActions([
-            Tables\Actions\BulkActionGroup::make([
-                Tables\Actions\DeleteBulkAction::make(),
-                Tables\Actions\ForceDeleteBulkAction::make(),
-                Tables\Actions\RestoreBulkAction::make(),
-            ]),
-        ])
-        ->headerActions([
-            ImportAction::make()
-                ->importer(StickerMappingMasterImporter::class)
-                ->label('Import Sticker Mapping Master')
-                ->color('warning')
-                ->visible(function () {
-                    return Filament::auth()->user()->can('view import sticker mapping master');
-                }),
-            ExportAction::make()
-                ->exporter(StickerMappingMasterExporter::class)
-                ->label('Export Sticker Mapping Master')
-                ->color('warning')
-                ->visible(function () {
-                    return Filament::auth()->user()->can('view export sticker mapping master');
-                }),
-        ]);
+                Tables\Columns\TextColumn::make('plant.name')
+                    ->label('Plant')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('item.code')
+                    ->label('Item Code')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('sticker1')
+                    ->label('Sticker Label 1')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('sticker2')
+                    ->label('Sticker Label 2')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('sticker3')
+                    ->label('Sticker Label 3')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('sticker4')
+                    ->label('Sticker Label 4')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('sticker5')
+                    ->label('Sticker Label 5')
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->label('Created At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->label('Updated At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('deleted_at')
+                    ->label('Deleted At')
+                    ->alignCenter()
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->filters([
+                Tables\Filters\TrashedFilter::make(),
+            ])
+            ->actions([
+                Tables\Actions\ViewAction::make(),
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                    Tables\Actions\ForceDeleteBulkAction::make(),
+                    Tables\Actions\RestoreBulkAction::make(),
+                ]),
+            ])
+            ->headerActions([
+                ImportAction::make()
+                    ->label('Import Sticker Mapping Masters')
+                    ->color('warning')
+                    ->importer(StickerMappingMasterImporter::class)
+                    ->visible(function() {
+                        return Filament::auth()->user()->can('view import sticker mapping master');
+                    }),
+                ExportAction::make()
+                    ->label('Export Sticker Mapping Masters')
+                    ->color('warning')
+                    ->exporter(StickerMappingMasterExporter::class)
+                    ->visible(function() {
+                        return Filament::auth()->user()->can('view export sticker mapping master');
+                    }),
+            ]);
     }
 
     public static function getRelations(): array

app/Filament/Resources/StickerValidationResource.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\StickerValidationResource\Pages;
-use App\Filament\Resources\StickerValidationResource\RelationManagers;
-use App\Models\Machine;
-use App\Models\StickerValidation;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-
-class StickerValidationResource extends Resource
-{
-    protected static ?string $model = StickerValidation::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Customized Sticker Printing';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Section::make('')
-                ->schema([
-                Forms\Components\Select::make('plant_id')
-                    ->label('Plant')
-                    ->reactive()
-                    ->relationship('plant', 'name')
-                    ->required(),
-                Forms\Components\Select::make('machine_id')
-                    ->label('Work Center')
-                    ->required()
-                    ->reactive()
-                    ->options(function (callable $get) {
-                            $plantId = $get('plant_id');
-                            if (empty($plantId)) {
-                                return [];
-                            }
-                            return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
-                        })
-                        ->searchable(),
-                Forms\Components\TextInput::make('production_order')
-                    ->label('Production Order')
-                    ->reactive()
-                    ->extraAttributes([
-                        'id' => 'production_order_input',
-                        'x-data' => '{ value: "" }',
-                        'x-model' => 'value',
-                        'wire:keydown.enter.prevent' => 'processProOrder(value)',
-                    ]),
-                Forms\Components\TextInput::make('serial_number')
-                    ->label('Serial Number')
-                    ->reactive()
-                    ->extraAttributes([
-                        'id' => 'serial_number_input',
-                        'x-data' => '{ value: "" }',
-                        'x-model' => 'value',
-                        'wire:keydown.enter.prevent' => 'processSno(value)',
-                    ]),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-           ])
-                ->columns(4),
-        ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('plant.code')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('machine.work_center')
-                    ->label('Work Center')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('production_order')
-                    ->label('Production Order')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('serial_number')
-                    ->label('Serial Number')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('status')
-                    ->label('Status')
-                    ->alignCenter()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListStickerValidations::route('/'),
-            'create' => Pages\CreateStickerValidation::route('/create'),
-            'view' => Pages\ViewStickerValidation::route('/{record}'),
-            'edit' => Pages\EditStickerValidation::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/StickerValidationResource/Pages/CreateStickerValidation.php

@@ -1,298 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StickerValidationResource\Pages;
-
-use App\Filament\Resources\StickerValidationResource;
-use App\Models\Item;
-use App\Models\ItemCharacteristic;
-use App\Models\ProductionQuantity;
-use App\Models\StickerMappingMaster;
-use App\Models\StickerValidation;
-use Filament\Actions;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateStickerValidation extends CreateRecord
-{
-    protected static string $resource = StickerValidationResource::class;
-
-    protected static string $view = 'filament.resources.sticker-validation-resource.create-sticker-validation';
-
-    public $ref_number;
-
-    public $plantId;
-
-    public $workCenter;
-
-    public $serNo;
-
-    public function getFormActions(): array
-    {
-        return [
-            $this->getCancelFormAction(),
-        ];
-    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('create');
-    }
-
-
-    public function processProOrder($value)
-    {
-        $plantId = $this->form->getState()['plant_id'];
-
-        $this->plantId = $plantId;
-
-        $this->ref_number = $value;
-
-        $this->dispatch('refreshEmptySticker', $plantId, $value);
-
-        $this->dispatch('focus-serial-number');
-    }
-
-    public function processSno($serNo)
-    {
-        $plantId = $this->form->getState()['plant_id'];
-
-        $this->plantId = $plantId;
-
-        $workCenter = $this->form->getState()['machine_id'];
-
-        $this->workCenter = $workCenter;
-
-        $this->ref_number = $this->form->getState()['production_order'];
-
-        $this->serNo = $serNo;
-
-        $user = Filament::auth()->user();
-
-        $operatorName = $user->name;
-
-        if (! preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\|?$/', $this->serNo, $matches)) {
-            Notification::make()
-                ->danger()
-                ->title('Invalid Serial QR Format')
-                ->body('Scan valid Serial QR code proceed!<br>Sample formats are:<br>123456|1234567890123| OR 123456|1234567890123')
-                ->seconds(3)
-                ->send();
-
-            $this->dispatch('playWarnSound');
-
-            $this->form->fill([
-                'plant_id' => $this->plantId,
-                'machine_id' => $this->workCenter,
-                'production_order' => $this->ref_number,
-                'serial_number' => null,
-            ]);
-
-            $this->dispatch('focus-serial-number');
-
-            return;
-        }
-
-        if (preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\|?$/', $this->serNo, $matches)) {
-            $itemCode = $matches[1];
-            $serialNumber = $matches[2];
-
-            $recFound = ProductionQuantity::where('plant_id', $this->plantId)
-            ->where('production_order', $this->ref_number)
-            ->where('serial_number', $serialNumber)
-            ->first();
-
-            if(!$recFound){
-                Notification::make()
-                ->danger()
-                ->title('Unknown Serial Number')
-                ->body("Scanned serial number '$serialNumber' not found for the given plant and production order")
-                ->seconds(3)
-                ->send();
-                $this->form->fill([
-                    'plant_id' => $this->plantId,
-                    'machine_id' => $this->workCenter,
-                    'production_order' => $this->ref_number,
-                    'serial_number' => null,
-                ]);
-                return;
-            }
-
-            $duplicate = StickerValidation::where('plant_id', $this->plantId)
-                ->where('production_order', $this->ref_number)
-                ->where('serial_number', $serialNumber)
-                ->first();
-
-            if ($duplicate) {
-                Notification::make()
-                    ->danger()
-                    ->title('Duplicate Serial Number')
-                    ->body("Serial number $serialNumber already exists for this plant and production order!")
-                    ->seconds(3)
-                    ->send();
-
-                $this->form->fill([
-                    'plant_id' => $this->plantId,
-                    'machine_id' => $this->workCenter,
-                    'production_order' => $this->ref_number,
-                    'serial_number' => null,
-                ]);
-                return;
-            }
-
-            $itemC = Item::where('code', $itemCode)
-            ->where('plant_id',$this->plantId)
-            ->first();
-
-            $itemId = $itemC->id;
-
-            $item = ItemCharacteristic::where('item_id', $itemId)
-            ->where('plant_id',$this->plantId)
-            ->first();
-
-            $itemI = $item->id;
-
-            $mapping = StickerMappingMaster::where('plant_id', $this->plantId)
-                ->where('item_characteristic_id', $itemI)
-                ->first();
-
-            if (!$mapping) {
-                Notification::make()
-                    ->danger()
-                    ->title('Sticker Mapping Not Found')
-                    ->body("No sticker mapping found for this item and plant.")
-                    ->send();
-                return;
-            }
-
-            $stickers = [];
-
-            for ($i = 1; $i <= 8; $i++) {
-                $machineColumn = "sticker{$i}_machine_id";
-                $ipColumn      = "sticker{$i}_print_ip";
-                $stickerColumn = "sticker_structure{$i}_id";
-                $itemColumn = "item_characteristic_id";
-
-                if (
-                    !empty($mapping->$machineColumn) &&
-                    !empty($mapping->$stickerColumn)
-                ) {
-                    $stickers[] = [
-                        'machine_id' => $mapping->$machineColumn,
-                        'sticker_id' => $mapping->$stickerColumn,
-                        'item_characteristic'   => $mapping->$itemColumn,
-                        'print_ip'   => $mapping->$ipColumn,
-                    ];
-                }
-            }
-
-            if (empty($stickers)) {
-                Notification::make()
-                    ->danger()
-                    ->title('No Sticker Configuration Found')
-                    ->body('No sticker and machine mappings configured for this item and plant.')
-                    ->send();
-                return;
-            }
-
-            $urls = [];
-
-            foreach ($stickers as $sticker) {
-                $urls[] = route('stickers1.pdf', [
-                    'stickerId' => $sticker['sticker_id'],
-                    'plant_id' => $this->plantId,
-                    'item_characteristic_id' => $sticker['item_characteristic'],
-                    'serial_number' => $serialNumber,
-                ]);
-            }
-
-            $this->dispatch('open-stickers-sequence', urls: $urls);
-
-            // $pdfPath = storage_path('app/private/uploads/StickerTemplateOcr/multi.pdf');
-
-            // if (! file_exists($pdfPath)) {
-            //     Notification::make()
-            //         ->danger()
-            //         ->title('Pdf Not Found')
-            //         ->body("pdf file not exist.")
-            //         ->send();
-            //     return;
-            // }
-
-            // if (! $printerName) {
-            //     Notification::make()
-            //         ->danger()
-            //         ->title('Printer Not Found')
-            //         ->body("No CUPS printer configured for IP: $iotsPrintIp")
-            //         ->send();
-            //     return;
-            // }
-
-            // putenv('CUPS_SERVER=printer.iotsignin.com');
-
-            // $cmd = "lp -d " . escapeshellarg($printerName)
-            //     . " -o fit-to-page "
-            //     . escapeshellarg($pdfPath);
-
-            // exec($cmd, $out, $status);
-
-            // if ($status != 0) {
-            //     Notification::make()
-            //         ->danger()
-            //         ->title('Print Failed')
-            //         ->body('CUPS print command failed.')
-            //         ->send();
-            //     return;
-            // }
-
-            //dd($iotsPrintIp, $matchedSticker);
-
-            StickerValidation::create([
-                'plant_id' => $this->plantId,
-                'machine_id' => $this->workCenter,
-                'production_order' => $this->ref_number ?? null,
-                'serial_number' => $serialNumber,
-                'status'  => 'Printed',
-                // 'sticker_id' => $matchedSticker,
-                'created_by' => $operatorName,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ]);
-
-            Notification::make()
-                ->success()
-                ->title('Sticker Recorded')
-                ->body("Item: $itemCode, Serial: $serialNumber recorded successfully!")
-                ->seconds(3)
-                ->send();
-
-            $this->form->fill([
-                'plant_id' => $this->plantId,
-                'machine_id' => $this->workCenter,
-                'production_order' => $this->ref_number,
-                'serial_number' => null,
-            ]);
-
-            $this->dispatch('refreshEmptySticker', $plantId, $this->ref_number);
-
-        }
-
-    }
-
-    private function getPrinterNameByIp(string $ip): ?string
-    {
-        exec('lpstat -v', $output);
-
-        foreach ($output as $line) {
-            // Example:
-            // device for TSC_WC_01: socket://192.168.1.50:9100
-            if (str_contains($line, $ip)) {
-                preg_match('/device for (.+?):/', $line, $matches);
-                return $matches[1] ?? null;
-            }
-        }
-
-        return null;
-    }
-
-}

app/Filament/Resources/StickerValidationResource/Pages/EditStickerValidation.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StickerValidationResource\Pages;
-
-use App\Filament\Resources\StickerValidationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditStickerValidation extends EditRecord
-{
-    protected static string $resource = StickerValidationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/StickerValidationResource/Pages/ListStickerValidations.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StickerValidationResource\Pages;
-
-use App\Filament\Resources\StickerValidationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListStickerValidations extends ListRecords
-{
-    protected static string $resource = StickerValidationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/StickerValidationResource/Pages/ViewStickerValidation.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StickerValidationResource\Pages;
-
-use App\Filament\Resources\StickerValidationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewStickerValidation extends ViewRecord
-{
-    protected static string $resource = StickerValidationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Widgets/RfqChart.php

@@ -1,146 +0,0 @@
-<?php
-
-namespace App\Filament\Widgets;
-
-use App\Models\RequestQuotation;
-use App\Models\RfqTransporterBid;
-use Filament\Facades\Filament;
-use Filament\Widgets\StatsOverviewWidget as BaseWidget;
-use Filament\Widgets\StatsOverviewWidget\Stat;
-
-class RfqChart extends BaseWidget
-{
-    // protected function getStats(): array
-    // {
-    //     $transporter = session('transport_name');
-    //     $rfqNumber   = session('rfq_number');
-
-    //     if (!$transporter || !$rfqNumber) {
-    //         return [
-    //             Stat::make('Total Freight Charge', '-'),
-    //             Stat::make('Rank', '-'),
-    //         ];
-    //     }
-
-    //     $selectedRfq = RequestQuotation::query()
-    //         ->where('transporter_name', $transporter)
-    //         ->where('rfq_number', $rfqNumber)
-    //         ->first();
-
-    //     if (!$selectedRfq) {
-    //         return [
-    //             Stat::make('Total Freight Charge', '-'),
-    //             Stat::make('Rank', '-'),
-    //         ];
-    //     }
-
-    //     $myAmount = (float) $selectedRfq->total_freight_charge;
-
-    //     $rank = RequestQuotation::query()
-    //         ->whereRaw(
-    //             'CAST(total_freight_charge AS DECIMAL(10,2)) < ?',
-    //             [$myAmount]
-    //         )
-    //         ->selectRaw('CAST(total_freight_charge AS DECIMAL(10,2))')
-    //         ->distinct()
-    //         ->count() + 1;
-
-    //         $medal = match (true) {
-    //             $rank == 1 => '🥇',
-    //             $rank == 2 => '🥈',
-    //             $rank == 3 => '🥉',
-    //             default     => '',
-    //         };
-
-    //     return [
-    //         Stat::make(
-    //             'Total Freight Charge',
-    //             number_format($selectedRfq->total_freight_charge, 2)
-    //         )
-    //             ->description('Transporter: ' . $selectedRfq->transporter_name)
-    //             ->color($rank == 1 ? 'success' : 'primary'),
-
-    //         Stat::make(
-    //             'Rank',
-    //             trim("{$medal} #{$rank}")
-    //         )
-    //         ->description('Among all transporters')
-    //         ->color(
-    //             $rank == 1 ? 'success' :
-    //             ($rank <= 3 ? 'warning' : 'gray')
-    //         ),
-    //     ];
-    // }
-
-    protected function getStats(): array
-    {
-        $transporter = session('transport_name');
-        $rfqNumber   = session('rfq_id');
-
-        if (!$transporter || !$rfqNumber) {
-            return [
-                Stat::make('Total Freight Charge', '-'),
-                Stat::make('Rank', '-'),
-            ];
-        }
-
-        $selectedRfq = RfqTransporterBid::query()
-            ->where('transporter_name', $transporter)
-            ->where('request_quotation_id', $rfqNumber)
-            ->first();
-
-        if (!$selectedRfq) {
-            return [
-                Stat::make('Total Freight Charge', '-'),
-                Stat::make('Rank', '-'),
-            ];
-        }
-
-        $myAmount = (float) $selectedRfq->total_freight_charge;
-
-        // $rank = RfqTransporterBid::query()
-        //     ->whereRaw(
-        //         'CAST(total_freight_charge AS DECIMAL(10,2)) < ?',
-        //         [$myAmount]
-        //     )
-        //     ->selectRaw('CAST(total_freight_charge AS DECIMAL(10,2))')
-        //     ->distinct()
-        //     ->count() + 1;
-        $rank = RfqTransporterBid::query()
-            ->where('request_quotation_id', $rfqNumber) // 🔥 MISSING CONDITION
-            ->whereRaw(
-                'CAST(total_freight_charge AS DECIMAL(10,2)) < ?',
-                [$myAmount]
-            )
-            ->selectRaw('CAST(total_freight_charge AS DECIMAL(10,2))')
-            ->distinct()
-            ->count() + 1;
-
-
-            $medal = match (true) {
-                $rank == 1 => '🥇',
-                $rank == 2 => '🥈',
-                $rank == 3 => '🥉',
-                default     => '',
-            };
-
-        return [
-            Stat::make(
-                'Total Freight Charge',
-                number_format($selectedRfq->total_freight_charge, 2)
-            )
-                ->description('Transporter: ' . $selectedRfq->transporter_name)
-                ->color($rank == 1 ? 'success' : 'primary'),
-
-            Stat::make(
-                'Rank',
-                trim("{$medal} #{$rank}")
-            )
-            ->description('Among all transporters')
-            ->color(
-                $rank == 1 ? 'success' :
-                ($rank <= 3 ? 'warning' : 'gray')
-            ),
-        ];
-    }
-}

app/Filament/Widgets/RfqRankChart.php

@@ -1,205 +0,0 @@
-<?php
-
-namespace App\Filament\Widgets;
-
-use App\Models\RfqTransporterBid;
-use Filament\Widgets\ChartWidget;
-use Illuminate\Support\Js;
-
-class RfqRankChart extends ChartWidget
-{
-    protected static ?string $heading = 'Chart';
-
-    // protected function getData(): array
-    // {
-    //     $rfqId = session('rfq_id');
-
-    //     if (!$rfqId) {
-    //         return [
-    //             'datasets' => [],
-    //             'labels'   => [],
-    //         ];
-    //     }
-
-    //     // Get bids ordered by lowest freight charge
-    //     $bids = RfqTransporterBid::query()
-    //         ->where('request_quotation_id', $rfqId)
-    //         ->orderByRaw('CAST(total_freight_charge AS DECIMAL(10,2)) ASC')
-    //         ->get();
-
-    //     // $labels = [];
-    //     // $ranks  = [];
-
-    //     // $rank = 1;
-    //     // foreach ($bids as $bid) {
-    //     //     $labels[] = $bid->transporter_name;
-    //     //     $ranks[]  = $rank++;
-    //     // }
-
-    //     // return [
-    //     //     'datasets' => [
-    //     //         [
-    //     //             'label' => 'Rank (Lower is Better)',
-    //     //             'data'  => $ranks,
-    //     //             'fill'  => false,
-    //     //             'tension' => 0.3,
-    //     //         ],
-    //     //     ],
-    //     //     'labels' => $labels,
-    //     // ];
-    //     $labels = [];
-    //     $ranks  = [];
-    //     $colors = [];
-
-    //     $rank = 1;
-    //     foreach ($bids as $bid) {
-    //         $labels[] = $bid->transporter_name;
-    //         $ranks[]  = $rank;
-
-    //         // Rank-based colors
-    //         $colors[] = match ($rank) {
-    //             1 => '#FFD700', // Gold
-    //             2 => '#C0C0C0', // Silver
-    //             3 => '#CD7F32', // Bronze
-    //             default => '#3B82F6', // Blue
-    //         };
-
-    //         $rank++;
-    //     }
-
-    //     return [
-    //         'datasets' => [
-    //             [
-    //                 'label' => 'Rank (1 = Best)',
-    //                 'data' => $ranks,
-
-    //                 // 🎨 Styling
-    //                 'borderColor' => '#3B82F6',
-    //                 'backgroundColor' => $colors,
-    //                 'pointBackgroundColor' => $colors,
-    //                 'pointBorderColor' => '#000',
-    //                 'pointRadius' => 7,
-    //                 'pointHoverRadius' => 10,
-    //                 'borderWidth' => 3,
-    //                 'tension' => 0.4,
-    //                 'fill' => false,
-    //             ],
-    //         ],
-    //         'labels' => $labels,
-    //     ];
-    // }
-
-
-
-    protected function getData(): array
-    {
-        $rfqId = session('rfq_id');
-
-        if (!$rfqId) {
-            return [
-                'datasets' => [],
-                'labels' => [],
-            ];
-        }
-
-        /**
-         * STEP 1: Get bids sorted by freight charge (for ranking)
-         */
-        $rankedBids = RfqTransporterBid::query()
-            ->where('request_quotation_id', $rfqId)
-            ->orderByRaw('CAST(total_freight_charge AS DECIMAL(10,2)) ASC')
-            ->get();
-
-        $rankMap = [];
-        $rank = 1;
-
-        foreach ($rankedBids as $bid) {
-            $rankMap[$bid->id] = $rank++;
-        }
-
-        /**
-         * STEP 2: Get bids in natural order (for wave effect)
-         * You can change orderBy to:
-         * - created_at
-         * - transporter_name
-         */
-        $chartBids = RfqTransporterBid::query()
-            ->where('request_quotation_id', $rfqId)
-            ->orderBy('id')
-            ->get();
-
-        $labels  = [];
-        $amounts = [];
-        $colors  = [];
-
-        $ranks = [];
-
-        foreach ($chartBids as $bid) {
-            $labels[]  = $bid->transporter_name;
-            $amounts[] = (float) $bid->total_freight_charge;
-
-            $rank = $rankMap[$bid->id];
-            $ranks[] = $rank;
-
-            $colors[] = match ($rank) {
-                1 => '#FFD700',
-                2 => '#C0C0C0',
-                3 => '#CD7F32',
-                default => '#2563EB',
-            };
-        }
-
-
-        return [
-            'datasets' => [
-                [
-                    'label' => 'Freight Charge',
-                    'data' => $amounts,
-                    'rankData' => $ranks,
-
-                    'borderColor' => '#2563EB',
-                    'backgroundColor' => $colors,
-                    'pointBackgroundColor' => $colors,
-                    'pointBorderColor' => '#000',
-                    'pointRadius' => 7,
-                    'pointHoverRadius' => 11,
-                    'borderWidth' => 3,
-                    'tension' => 0.45,
-                    'fill' => false,
-                ],
-            ],
-            'labels' => $labels,
-        ];
-    }
-
-    protected function getOptions(): array
-    {
-        return [
-             'plugins' => [
-                    'datalabels' => [
-                           'anchor' => 'start',
-                            'align' => 'start',
-                            'offset' => -15,
-                        'color' => '#000',
-                        'font' => [
-                            'weight' => 'bold',
-                        ],
-                        'formatter' => Js::from("function(value) { return Number(value); }"),
-                    ],
-                ],
-            'scales' => [
-                'y' => [
-                    'beginAtZero' => true,
-                    'ticks' => [
-                        'stepSize' => 0.5,
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    protected function getType(): string
-    {
-        return 'bar';
-    }
-}

app/Http/Controllers/PdfController.php

@@ -913,8 +913,6 @@ class PdfController extends Controller
         $itemCharacteristicId = $request->query('item_characteristic_id');
         $stickerId = trim($stickerId);
 
-        //dd($plantId,$itemCharacteristicId,$stickerId);
-
         // Normalize "empty" or "" to null
         $plantId = ($plantId && $plantId != 'empty') ? $plantId : null;
         $itemCharacteristicId = ($itemCharacteristicId && $itemCharacteristicId != 'empty') ? $itemCharacteristicId : null;
@@ -958,91 +956,4 @@ class PdfController extends Controller
             return $pdfService->generate($stickerId, $elements->toArray());
         }
     }
-
-
-    // public function generatePdf(Request $request, $stickerId)
-    // {
-    //     $plantId = $request->query('plant_id');
-    //     $itemCharacteristicId = $request->query('item_characteristic_id');
-    //     $stickerId = trim($stickerId);
-
-    //     //dd($plantId,$itemCharacteristicId,$stickerId);
-
-    //     // Normalize "empty" or "" to null
-    //     $plantId = ($plantId && $plantId != 'empty') ? $plantId : null;
-    //     $itemCharacteristicId = ($itemCharacteristicId && $itemCharacteristicId != 'empty') ? $itemCharacteristicId : null;
-
-
-    //     if ($plantId && $itemCharacteristicId)
-    //     {
-    //         $plantId = $request->query('plant_id');
-    //         $itemCharacteristicId = $request->query('item_characteristic_id');
-
-
-    //         $sticId = StickerStructureDetail::where('id', $stickerId)->first();
-
-    //         $sId = $sticId->id;
-
-    //         $stickerId = $sticId->sticker_id;
-
-    //         $dynamicElements = StickerDetail::where('sticker_structure_detail_id', $sId)
-    //             ->where('element_type', 'Dynamic')
-    //             ->get();
-
-    //         $itemCharacteristic = null;
-
-    //         if ($plantId && $itemCharacteristicId) {
-    //             $itemCharacteristic = ItemCharacteristic::where('plant_id', $plantId)
-    //                 ->where('id', $itemCharacteristicId)
-    //                 ->first();
-    //         }
-
-    //         $pdfService = new StickerPdfService();
-
-    //         return $pdfService->generatePdf1(
-    //             $stickerId,
-    //             $dynamicElements,
-    //             $itemCharacteristic
-    //         );
-    //     }
-    //     else
-    //     {
-    //         $elements = StickerStructureDetail::where('sticker_id', $stickerId)
-    //             ->first();
-
-    //         $pdfService = new StickerPdfService();
-    //         return $pdfService->generate($stickerId, $elements->toArray());
-    //     }
-    // }
-
-
-    public function generatePdf(Request $request, $stickerId)
-    {
-        $plantId = $request->query('plant_id');
-        $itemCharacteristicId = $request->query('item_characteristic_id');
-        $serialNumber = $request->query('serial_number');
-
-        if ($plantId && $itemCharacteristicId) {
-            $structure = StickerStructureDetail::findOrFail($stickerId);
-
-            $dynamicElements = StickerDetail::where(
-                'sticker_structure_detail_id',
-                $structure->id
-            )->where('element_type', 'Dynamic')->get();
-
-            $itemCharacteristic = ItemCharacteristic::where('plant_id', $plantId)
-                ->where('id', $itemCharacteristicId)
-                ->first();
-
-            return (new StickerPdfService())->generatePdf1(
-                $structure->sticker_id,
-                $dynamicElements,
-                $itemCharacteristic,
-                $serialNumber
-            );
-        }
-
-        return abort(404);
-    }
-
 }

app/Livewire/ProductionTargetPlan.php

@@ -1,236 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Exports\ProductionPlanExport;
-use App\Models\ProductionPlan;
-use App\Models\ProductionQuantity;
-use Livewire\Component;
-use Carbon\Carbon;
-use DB;
-use Maatwebsite\Excel\Facades\Excel;
-
-class ProductionTargetPlan extends Component
-{
-
-    public $plantId, $lineId, $month, $year;
-
-    public $records = [];
-
-    public $dates = [];
-
-    public $leaveDates = [];
-
-    public $productionPlanDates = '';
-
-
-    protected $listeners = [
-        'loadData' => 'loadProductionData',
-        'loadData1' => 'exportProductionData',
-    ];
-
-    public function getMonthDates($month, $year)
-    {
-        $start = Carbon::createFromDate($year, $month, 1);
-        $days  = $start->daysInMonth;
-
-        $dates = [];
-
-        for ($i = 1; $i <= $days; $i++) {
-            $dates[] = Carbon::createFromDate($year, $month, $i)
-                ->format('Y-m-d');
-        }
-
-        return $dates;
-    }
-
-    public function loadProductionData($plantId, $lineId, $month, $year){
-
-        if (!$plantId || !$lineId || !$month || !$year) {
-            $this->records = [];
-            $this->dates = [];
-            $this->leaveDates = [];
-            return;
-        }
-
-        $this->dates = $this->getMonthDates($month, $year);
-
-        $data = ProductionPlan::query()
-        ->join('items', 'items.id', '=', 'production_plans.item_id')
-        ->join('lines', 'lines.id', '=', 'production_plans.line_id')
-        ->join('plants', 'plants.id', '=', 'production_plans.plant_id')
-        ->where('production_plans.plant_id', $plantId)
-        ->where('production_plans.line_id', $lineId)
-        ->whereMonth('production_plans.created_at', $month)
-        ->whereYear('production_plans.created_at', $year)
-        ->select(
-            'production_plans.created_at',
-            'production_plans.operator_id',
-            'plants.name as plant',
-            'items.code as item_code',
-            'items.description as item_description',
-            'lines.name as line_name',
-            'production_plans.leave_dates'
-        )
-        ->first();
-
-        if ($data && $data->leave_dates) {
-            $this->leaveDates = array_map('trim', explode(',', $data->leave_dates));
-        }
-
-        $producedData = ProductionQuantity::selectRaw("
-            plant_id,
-            line_id,
-            item_id,
-            DATE(created_at) as prod_date,
-            COUNT(*) as total_qty
-        ")
-        ->where('plant_id', $plantId)
-        ->where('line_id', $lineId)
-        ->whereMonth('created_at', $month)
-        ->whereYear('created_at', $year)
-        ->groupBy('plant_id', 'line_id', 'item_id', DB::raw('DATE(created_at)'))
-        ->get()
-        ->groupBy(function ($row) {
-            return $row->plant_id . '_' . $row->line_id . '_' . $row->item_id;
-        })
-        ->map(function ($group) {
-            return $group->keyBy('prod_date');
-        });
-
-        $this->records = ProductionPlan::query()
-            ->join('items', 'items.id', '=', 'production_plans.item_id')
-            ->join('lines', 'lines.id', '=', 'production_plans.line_id')
-            ->join('plants', 'plants.id', '=', 'production_plans.plant_id')
-            ->where('production_plans.plant_id', $plantId)
-            ->where('production_plans.line_id', $lineId)
-            ->whereMonth('production_plans.created_at', $month)
-            ->whereYear('production_plans.created_at', $year)
-            ->select(
-                'production_plans.item_id',
-                'production_plans.plant_id',
-                'production_plans.line_id',
-                'production_plans.plan_quantity',
-                'production_plans.working_days',
-                'items.code as item_code',
-                'items.description as item_description',
-                'lines.name as line_name',
-                'plants.name as plant_name'
-            )
-            ->get()
-            // ->map(function ($row) use ($producedData) {
-            //     $row = $row->toArray();
-
-            //     $row['daily_target'] = ($row['working_days'] > 0)
-            //         ? round($row['plan_quantity'] / $row['working_days'], 2)
-            //         : 0;
-
-            //     // $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-            //     // foreach ($this->dates as $date) {
-            //     //     $found = $producedData[$key][$date] ?? null;
-            //     //     $row['produced_quantity'][$date] = $found->total_qty ?? 0;
-            //     // }
-
-            //     $remainingDays = $row['working_days'];
-            //     $pendingQty = 0;
-
-            //     $row['daily_target_dynamic'] = [];
-            //     $row['produced_quantity'] = [];
-
-            //     $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-            //     foreach ($this->dates as $date) {
-
-            //         $found = $producedData[$key][$date] ?? null;
-            //         $producedQty = $found->total_qty ?? 0;
-
-            //         // today's adjusted target
-            //         $todayTarget = $baseDailyTarget;
-
-            //         if ($remainingDays > 1 && $pendingQty > 0) {
-            //             $todayTarget += $pendingQty / $remainingDays;
-            //         }
-
-            //         $row['daily_target_dynamic'][$date] = round($todayTarget, 2);
-            //         $row['produced_quantity'][$date] = $producedQty;
-
-            //         // calculate today's shortfall
-            //         $pendingQty += ($todayTarget - $producedQty);
-
-            //         if ($pendingQty < 0) {
-            //             $pendingQty = 0;
-            //         }
-
-            //         $remainingDays--;
-            //     }
-
-            //     return $row;
-            // })
-            ->map(function ($row) use ($producedData) {
-
-                $row = $row->toArray();
-
-                $remainingQty = $row['plan_quantity'];
-                $remainingDays = $row['working_days'];
-
-                $row['daily_target_dynamic'] = [];
-                $row['produced_quantity'] = [];
-
-                $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-                foreach ($this->dates as $date) {
-
-                    // Skip leave dates
-                    if (in_array($date, $this->leaveDates)) {
-                        $row['daily_target_dynamic'][$date] = '-';
-                        $row['produced_quantity'][$date] = '-';
-                        continue;
-                    }
-
-                    $todayTarget = $remainingDays > 0
-                        ? round($remainingQty / $remainingDays, 2)
-                        : 0;
-
-                    //$todayTarget = $remainingDays > 0
-                    // ? $remainingQty / $remainingDays
-                    // : 0;
-
-                    $producedQty = isset($producedData[$key][$date])
-                        ? $producedData[$key][$date]->total_qty
-                        : 0;
-
-                    $row['daily_target_dynamic'][$date] = $todayTarget;
-                    $row['produced_quantity'][$date] = $producedQty;
-
-                    // Carry forward pending
-                    $remainingQty -= $producedQty;
-                    if ($remainingQty < 0) {
-                        $remainingQty = 0;
-                    }
-
-                    $remainingDays--;
-                }
-
-                return $row;
-            })
-            ->toArray();
-    }
-
-    public function exportProductionData()
-    {
-        return Excel::download(
-            new ProductionPlanExport($this->records, $this->dates),
-            'production_plan_data.xlsx'
-        );
-    }
-
-    public function render()
-    {
-        // return view('livewire.production-target-plan');
-        return view('livewire.production-target-plan', [
-            'records' => $this->records,
-            'dates'   => $this->dates,
-        ]);
-    }
-}

app/Livewire/StickerValidation.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Models\ProductionQuantity;
-use Livewire\Component;
-
-class StickerValidation extends Component
-{
-
-    public $plantId;
-
-    public $refNumber;
-
-    public $serialNumber;
-
-    public bool $materialInvoice = false;
-
-    public $records = [];
-
-    protected $listeners = [
-        'refreshEmptySticker' => 'loadStickerData',
-        'addStickerToList' => 'loadSticker'
-    ];
-
-    public function loadStickerData($plantId, $refNumber)
-    {
-        $this->plantId = $plantId;
-        $this->refNumber = $refNumber;
-        // $this->records = ProductionQuantity::where('plant_id', $plantId)
-        // ->where('production_order', $refNumber)
-        // ->orderBy('created_at', 'asc')
-        // ->get(['serial_number', 'operator_id']);
-
-        $this->records = ProductionQuantity::query()
-        ->where('production_quantities.plant_id', $plantId)
-        ->where('production_quantities.production_order', $refNumber)
-        ->leftJoin(
-            'sticker_validations',
-            'sticker_validations.serial_number',
-            '=',
-            'production_quantities.serial_number'
-        )
-        ->orderBy('production_quantities.created_at', 'asc')
-        ->get([
-            'production_quantities.serial_number',
-            'production_quantities.operator_id',
-            'sticker_validations.status',
-            'sticker_validations.sticker_id',
-        ])
-        ->map(function ($row) {
-            $row->status = $row->status ?? '';
-            return $row;
-        });
-
-        //dd($this->records);
-
-    }
-
-
-    public function render()
-    {
-        return view('livewire.sticker-validation');
-    }
-}

app/Models/Item.php

@@ -3,22 +3,20 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Item extends Model
 {
     use SoftDeletes;
 
     protected $fillable = [
-        'plant_id',
-        'line_id',
+        "plant_id",
         'category',
         'code',
         'description',
         'hourly_quantity',
         'uom',
-        'line_capacity',
     ];
 
     public function plant(): BelongsTo
@@ -26,11 +24,6 @@ class Item extends Model
         return $this->belongsTo(Plant::class);
     }
 
-    public function line(): BelongsTo
-    {
-        return $this->belongsTo(Line::class);
-    }
-
     public function stickerMasters()
     {
         return $this->hasMany(StickerMaster::class, 'item_id', 'id');
@@ -50,9 +43,4 @@ class Item extends Model
     {
         return $this->hasMany(TestingPanelReading::class);
     }
-
-    public function itemCharacteristics()
-    {
-        return $this->hasMany(ItemCharacteristic::class, 'item_id', 'id');
-    }
 }

app/Models/Line.php

@@ -13,7 +13,6 @@ class Line extends Model
 
     protected $fillable = [
         "plant_id",
-        "block_id",
         "name",
         "type",
         "group_work_center",
@@ -35,11 +34,6 @@ class Line extends Model
         return $this->belongsTo(Plant::class);
     }
 
-    public function block(): BelongsTo
-    {
-        return $this->belongsTo(Block::class);
-    }
-
     public function testingPanelReadings()
     {
         return $this->hasMany(TestingPanelReading::class);

app/Models/Plant.php

@@ -102,9 +102,4 @@ class Plant extends Model
     {
         return $this->hasMany(User::class, 'plant_id', 'id');
     }
-
-    public function itemCharacteristics()
-    {
-        return $this->hasMany(ItemCharacteristic::class, 'plant_id', 'id');
-    }
 }

app/Models/ProductionPlan.php

@@ -12,15 +12,12 @@ class ProductionPlan extends Model
 
     protected $fillable = [
         "plant_id",
-        "item_id",
         "shift_id",
         "created_at",
         "line_id",
         "plan_quantity",
         "production_quantity",
         "operator_id",
-        "working_days",
-        "leave_dates",
     ];
 
     public function plant(): BelongsTo
@@ -37,9 +34,4 @@ class ProductionPlan extends Model
     {
         return $this->belongsTo(Line::class);
     }
-
-    public function item(): BelongsTo
-    {
-        return $this->belongsTo(Item::class);
-    }
 }

app/Models/ProductionQuantity.php

@@ -16,7 +16,6 @@ class ProductionQuantity extends Model
 
     protected $fillable = [
         "plant_id",
-        "machine_id",
         "shift_id",
         "line_id",
         "item_id",
@@ -51,11 +50,6 @@ class ProductionQuantity extends Model
         return $this->belongsTo(Item::class);
     }
 
-    public function machine(): BelongsTo
-    {
-        return $this->belongsTo(Machine::class);
-    }
-
     protected static function booted()
     {
         static::created(function ($productionQuantity) {

app/Models/RequestQuotation.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class RequestQuotation extends Model
-{
-     use SoftDeletes;
-
-    protected $fillable = [
-        'rfq_number',
-        'rfq_date_time',
-        'pickup_address',
-        'delivery_address',
-        'weight',
-        'volumetrice_size_inch',
-        'type_of_vehicle',
-        'special_type',
-        'no_of_vehicle',
-        'product_name',
-        'loading_by',
-        'unloading_by',
-        'pick_and_delivery',
-        'payment_term',
-        'paid_topay',
-        'require_date_time',
-        'transporter_name',
-        'total_freight_charge',
-        'transit_day',
-        'spot_rate_transport_master_id',
-
-        'created_at',
-        'updated_at',
-        'created_by',
-        'updated_by',
-    ];
-
-    public function spotRateTransportMaster(): BelongsTo
-    {
-        return $this->belongsTo(SpotRateTransportMaster::class);
-    }
-
-}

app/Models/RfqTransporterBid.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use phpseclib3\Crypt\Common\Formats\Signature\Raw;
-
-class RfqTransporterBid extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = [
-        'request_quotation_id',
-        'transporter_name',
-        'total_freight_charge',
-        'transit_day',
-		'created_at',
-        'updated_at',
-        'created_by',
-        'updated_by',
-    ];
-
-    public function requestQuotation(): BelongsTo
-    {
-        return $this->belongsTo(RequestQuotation::class);
-        // return $this->belongsTo(RequestQuotation::class, 'request_quotation_id');
-    }
-}

app/Models/SpotRateTransportMaster.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class SpotRateTransportMaster extends Model
-{
-    use SoftDeletes;
-
-    protected $casts = [
-        'user_name' => 'array',
-    ];
-
-    protected $fillable = [
-        'group_name',
-        'user_name',
-		'created_at',
-        'updated_at',
-        'created_by',
-        'updated_by',
-    ];
-}

app/Models/StickerDetail.php

@@ -30,8 +30,8 @@ class StickerDetail extends Model
         'shape_y1_value',
         'shape_x2_value',
         'shape_y2_value',
-        // 'image_path',
-        // 'image_type',
+        'image_path',
+        'image_type',
         'image_x',
         'image_y',
         'image_width',

app/Models/StickerMappingMaster.php

@@ -8,136 +8,28 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StickerMappingMaster extends Model
 {
-    use SoftDeletes;
+        use SoftDeletes;
 
     protected $fillable = [
         'plant_id',
-        'item_characteristic_id',
-
-        'sticker_structure1_id',
-        'sticker1_machine_id',
-        'sticker1_print_ip',
-        'sticker_structure2_id',
-        'sticker2_machine_id',
-        'sticker2_print_ip',
-        'sticker_structure3_id',
-        'sticker3_machine_id',
-        'sticker3_print_ip',
-        'sticker_structure4_id',
-        'sticker4_machine_id',
-        'sticker4_print_ip',
-        'sticker_structure5_id',
-        'sticker5_machine_id',
-        'sticker5_print_ip',
-        'sticker_structure7_id',
-        'sticker6_machine_id',
-        'sticker6_print_ip',
-        'sticker_structure7_id',
-        'sticker7_machine_id',
-        'sticker7_print_ip',
-        'sticker_structure8_id',
-        'sticker8_machine_id',
-        'sticker8_print_ip',
-
+        'item_id',
+        'sticker1',
+        'sticker2',
+        'sticker3',
+        'sticker4',
+        'sticker5',
         'created_at',
         'updated_at',
         'created_by',
-        'updated_by',
+        'updated_by'
     ];
 
-    public function plant()
+    public function plant(): BelongsTo
     {
         return $this->belongsTo(Plant::class);
     }
-
-    public function itemCharacteristic()
-    {
-        return $this->belongsTo(ItemCharacteristic::class);
-    }
-
     public function item(): BelongsTo
     {
-        return $this->belongsTo(Item::class, 'item_id');
-    }
-
-     public function sticker1Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure1_id');
-    }
-
-    public function sticker2Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure2_id');
-    }
-
-    public function sticker3Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure3_id');
-    }
-
-    public function sticker4Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure4_id');
-    }
-
-    public function sticker5Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure5_id');
-    }
-
-    public function sticker6Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure6_id');
-    }
-
-    public function sticker7Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure7_id');
-    }
-
-    public function sticker8Structure()
-    {
-        return $this->belongsTo(StickerStructureDetail::class, 'sticker_structure8_id');
-    }
-
-    // Machine relationships (per sticker)
-    public function sticker1Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker1_machine_id');
-    }
-
-    public function sticker2Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker2_machine_id');
-    }
-
-    public function sticker3Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker3_machine_id');
-    }
-
-    public function sticker4Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker4_machine_id');
-    }
-
-    public function sticker5Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker5_machine_id');
-    }
-
-    public function sticker6Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker6_machine_id');
-    }
-
-    public function sticker7Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker7_machine_id');
-    }
-
-    public function sticker8Machine()
-    {
-        return $this->belongsTo(Machine::class, 'sticker8_machine_id');
+        return $this->belongsTo(Item::class);
     }
 }

app/Models/StickerValidation.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class StickerValidation extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = [
-        'plant_id',
-        'machine_id',
-        'sticker_id',
-        'production_order',
-        'serial_number',
-        'status',
-        'created_by',
-        'updated_by',
-        'deleted_at',
-    ];
-
-    public function plant()
-    {
-        return $this->belongsTo(Plant::class);
-    }
-
-    public function machine()
-    {
-        return $this->belongsTo(Machine::class);
-    }
-}

app/Models/User.php

@@ -13,13 +13,11 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use NotificationChannels\WebPush\HasPushSubscriptions;
-use NotificationChannels\WebPush\PushSubscription;
 
 class User extends Authenticatable implements FilamentUser
 {
     /** @use HasFactory<\Database\Factories\UserFactory> */
-    use HasFactory, HasRoles, Notifiable, SoftDeletes, HasSuperAdmin, HasPushSubscriptions;
+    use HasFactory, HasRoles, Notifiable, SoftDeletes, HasSuperAdmin;
 
     /**
      * The attributes that are mass assignable.
@@ -65,9 +63,4 @@ class User extends Authenticatable implements FilamentUser
     {
         return $this->belongsTo(Plant::class);
     }
-
-    public function pushSubscriptions()
-    {
-        return $this->morphMany(PushSubscription::class, 'subscribable');
-    }
 }

app/Models/WebPushSubscription.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class WebPushSubscription extends Model
-{
-    protected $table = 'push_subscriptions';
-
-    protected $fillable = [
-        'subscribable_type',
-        'subscribable_id',
-        'endpoint',
-        'public_key',
-        'auth_token',
-        'content_encoding',
-    ];
-}

app/Notifications/PushAlertNotification.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\WebPush\WebPushMessage;
-use NotificationChannels\WebPush\WebPushChannel;
-
-
-class PushAlertNotification extends Notification
-{
-    use Queueable;
-
-    /**
-     * Create a new notification instance.
-     */
-    // public function __construct()
-    // {
-    //     //
-    // }
-
-    public $title;
-    public $body;
-
-    public function __construct($title, $body)
-    {
-        $this->title = $title;
-        $this->body = $body;
-    }
-
-    // public function via($notifiable)
-    // {
-    //     return [WebPushChannel::class];
-    // }
-
-    public function via($notifiable)
-    {
-        return [
-            'database',          // ✅ Filament toast
-            WebPushChannel::class // ✅ Browser / PWA push
-        ];
-    }
-
-    public function toDatabase($notifiable): array
-    {
-        return [
-            'title' => $this->title,
-            'body'  => $this->body,
-        ];
-    }
-
-    // public function toWebPush($notifiable, $notification)
-    // {
-    //     return (new WebPushMessage)
-    //         ->title('New Alert 🚨')
-    //         ->icon('/pwa-192x192.png')
-    //         ->body('You have a new notification')
-    //         ->action('Open App', 'open_app')
-    //         ->data(['url' => '/admin']);
-    // }
-
-    public function toWebPush($notifiable, $notification)
-    {
-
-        return (new WebPushMessage)
-            ->title($this->title)
-            ->icon('/pwa-192x192.png')
-            ->body($this->body)
-            ->action('Open App', 'open_app')
-            ->data(['url' => '/admin']);
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @return array<int, string>
-     */
-    // public function via(object $notifiable): array
-    // {
-    //     return ['mail'];
-    // }
-
-    /**
-     * Get the mail representation of the notification.
-     */
-    // public function toMail(object $notifiable): MailMessage
-    // {
-    //     return (new MailMessage)
-    //                 ->line('The introduction to the notification.')
-    //                 ->action('Notification Action', url('/'))
-    //                 ->line('Thank you for using our application!');
-    // }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(object $notifiable): array
-    {
-        return [
-            //
-        ];
-    }
-}

app/Policies/RequestQuotationPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\RequestQuotation;
-use App\Models\User;
-
-class RequestQuotationPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('view RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('update RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('delete RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('restore RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('replicate RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, RequestQuotation $requestquotation): bool
-    {
-        return $user->checkPermissionTo('force-delete RequestQuotation');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any RequestQuotation');
-    }
-}

app/Policies/RfqTransporterBidPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\RfqTransporterBid;
-use App\Models\User;
-
-class RfqTransporterBidPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('view RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('update RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('delete RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('restore RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('replicate RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, RfqTransporterBid $rfqtransporterbid): bool
-    {
-        return $user->checkPermissionTo('force-delete RfqTransporterBid');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any RfqTransporterBid');
-    }
-}

app/Policies/SpotRateTransportMasterPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\SpotRateTransportMaster;
-use App\Models\User;
-
-class SpotRateTransportMasterPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('view SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('update SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('delete SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('restore SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('replicate SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, SpotRateTransportMaster $spotratetransportmaster): bool
-    {
-        return $user->checkPermissionTo('force-delete SpotRateTransportMaster');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any SpotRateTransportMaster');
-    }
-}

app/Policies/StickerValidationPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\StickerValidation;
-use App\Models\User;
-
-class StickerValidationPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('view StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('update StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('delete StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('restore StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('replicate StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, StickerValidation $stickervalidation): bool
-    {
-        return $user->checkPermissionTo('force-delete StickerValidation');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any StickerValidation');
-    }
-}

app/Providers/Filament/AdminPanelProvider.php

@@ -4,7 +4,6 @@ namespace App\Providers\Filament;
 
 use Althinect\FilamentSpatieRolesPermissions\FilamentSpatieRolesPermissionsPlugin;
 use App\Filament\Pages\InvoiceDashboard;
-use App\Filament\Pages\NotificationSettings;
 use Filament\Facades\Filament;
 use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\AuthenticateSession;
@@ -60,7 +59,6 @@ class AdminPanelProvider extends PanelProvider
             ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
             ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
             ->pages([
-
             ])
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             // ->widgets([
@@ -125,15 +123,6 @@ class AdminPanelProvider extends PanelProvider
 
     public function boot(): void
     {
-
-        FilamentView::registerRenderHook('panels::body.end', function () {
-            if (url()->current() == config('app.url') . '/admin') {
-                return '<script src="' . asset('js/push.js') . '"></script>';
-            }
-
-            return '';
-        });
-
         FilamentView::registerRenderHook('panels::head.end', function () {
             // Only inject on the "home" page (or specific route)
             if (url()->current() == config('app.url') . '/admin') {

app/Services/StickerPdfService.php

@@ -5,236 +5,13 @@ namespace App\Services;
 use App\Models\ItemCharacteristic;
 use App\Models\StickerDetail;
 use App\Models\StickerStructureDetail;
-use Illuminate\Http\Response;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Schema;
 use TCPDF;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Schema;
 
 class StickerPdfService
 {
-    public function generateStickerItem(string $stickerId, Collection $dynamicElements, ?ItemCharacteristic $itemCharacteristic)
-    {
-
-        $dynamicValueMap = [];
-
-        foreach ($dynamicElements as $element) {
-
-            $column = $element->characteristics_type;
-
-            $value = '';
-
-            if (
-                $itemCharacteristic &&
-                $column &&
-                Schema::hasColumn('item_characteristics', $column)
-            ) {
-                $value = $itemCharacteristic->{$column};
-            }
-
-            $dynamicValueMap[$element->id] = [
-                'design_type' => $element->design_element_type, // Text / Image
-                'value' => $value,
-            ];
-        }
-
-        $structure = StickerStructureDetail::where('sticker_id', $stickerId)
-            ->first();
-
-        $structureId = $structure->id;
-        $elements = StickerDetail::where(
-            'sticker_structure_detail_id',
-            $structureId
-        )->get();
-
-        $width = (float) $structure->sticker_width;
-        $height = (float) $structure->sticker_height;
-
-        $pdf = new TCPDF('P', 'mm', [$width, $height], true, 'UTF-8', false);
-
-        // $pdf->SetMargins(
-        //     (float) $structure->sticker_lmargin,
-        //     (float) $structure->sticker_tmargin,
-        //     (float) $structure->sticker_rmargin,
-        // );
-
-        // //$pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
-        // $pdf->setCellPaddings(0, 0, 0, 0);
-        // $pdf->setCellMargins(5, 5, 5, 5);
-
-        // Set margins
-        // $pdf->SetMargins(5, 5, 5); // left, top, right
-
-        $pdf->SetMargins(
-            (float) $structure->sticker_lmargin,
-            (float) $structure->sticker_tmargin,
-            (float) $structure->sticker_rmargin,
-        );
-        $pdf->SetAutoPageBreak(false, 0);
-
-        $pdf->AddPage();
-
-        $pdf->SetFont('helvetica', 'B', 10);
-
-        foreach ($elements as $row) {
-
-            switch ($row->design_element_type) {
-
-                case 'Text':
-
-                    $pdf->SetFont(
-                        $row->string_font ?? 'helvetica',
-                        '',
-                        (int) ($row->string_size ?? 10)
-                    );
-
-                    $pdf->SetTextColor(
-                        ...$this->hexToRgb($row->element_colour ?? '#000000')
-                    );
-
-                    $textValue = $row->string_value ?? '';
-
-                    if (
-                        $row->element_type == 'Dynamic' &&
-                        isset($dynamicValueMap[$row->id])
-                    ) {
-                        $textValue = $dynamicValueMap[$row->id]['value'];
-                    }
-
-                    $pdf->Text(
-                        (float) ($row->string_x_value ?? 0),
-                        (float) ($row->string_y_value ?? 0),
-                        (string) $textValue
-                    );
-
-                    break;
-
-                case 'QR':
-                    $pdf->write2DBarcode(
-                        $row->qr_value ?? '',
-                        'QRCODE,H',
-                        (float) ($row->qr_x_value ?? 0),
-                        (float) ($row->qr_y_value ?? 0),
-                        (float) ($row->qr_size ?? 10),
-                        (float) ($row->qr_size ?? 10)
-                    );
-                    break;
-
-                case 'Image':
-
-                    $imagePath = null;
-
-                    if (
-                        $row->element_type == 'Dynamic' &&
-                        isset($dynamicValueMap[$row->id]) &&
-                        ! empty($dynamicValueMap[$row->id]['value'])
-                    ) {
-                        $imageName = strtolower($dynamicValueMap[$row->id]['value']).'.png';
-
-                        $imagePath = public_path('images/'.ltrim($imageName, '/'));
-                    }
-
-                    $pdf->Image(
-                        $imagePath,
-                        (float) ($row->image_x ?? 0),
-                        (float) ($row->image_y ?? 0),
-                        (float) ($row->image_width ?? 0),
-                        (float) ($row->image_height ?? 0)
-                    );
-                    break;
-                case 'Shape':
-                    if ($row->shape_name == 'Line') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $pdf->Line(
-                            (float) $row->shape_x1_value,
-                            (float) $row->shape_y1_value,
-                            (float) $row->shape_x2_value,
-                            (float) $row->shape_y2_value
-                        );
-                    } elseif ($row->shape_name == 'Rectangle') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $x1 = (float) $row->shape_x1_value;
-                        $y1 = (float) $row->shape_y1_value;
-                        $x2 = (float) $row->shape_x2_value;
-                        $y2 = (float) $row->shape_y2_value;
-
-                        $x = min($x1, $x2);
-                        $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
-                        $height = abs($y2 - $y1);
-
-                        $pdf->Rect($x, $y, $width, $height, 'D');
-                    } elseif ($row->shape_name == 'CurvedRectangle') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $x1 = (float) $row->shape_x1_value;
-                        $y1 = (float) $row->shape_y1_value;
-                        $x2 = (float) $row->shape_x2_value;
-                        $y2 = (float) $row->shape_y2_value;
-
-                        $x = min($x1, $x2);
-                        $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
-                        $height = abs($y2 - $y1);
-
-                        // radius in mm
-                        // $radius = 3;
-                        $radius = (float) $row->curve_radius;
-
-                        $pdf->RoundedRect(
-                            $x,
-                            $y,
-                            $width,
-                            $height,
-                            $radius,
-                            '1111', // ← round all 4 corners (default)
-                            'D'
-                        );
-                    }
-
-                    break;
-            }
-        }
-
-        $pdfContent = $pdf->Output('', 'S'); // 'S' returns string
-
-        // Encode as base64
-        return base64_encode($pdfContent);
-
-        // // return $pdf->Output('sticker.pdf', 'S');
-        // $pdfContent = $pdf->Output('sticker.pdf', 'S');
-
-        // return (new Response($pdfContent, 200))
-        //     ->header('Content-Type', 'application/pdf')
-        //     ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
-
-    }
 
     public function generate1(string $stickerId, Collection $dynamicElements, ?ItemCharacteristic $itemCharacteristic)
     {
@@ -261,6 +38,7 @@ class StickerPdfService
             ];
         }
 
+
         $structure = StickerStructureDetail::where('sticker_id', $stickerId)
             ->first();
 
@@ -270,7 +48,7 @@ class StickerPdfService
             $structureId
         )->get();
 
-        $width = (float) $structure->sticker_width;
+        $width  = (float) $structure->sticker_width;
         $height = (float) $structure->sticker_height;
 
         $pdf = new TCPDF('P', 'mm', [$width, $height], true, 'UTF-8', false);
@@ -287,10 +65,10 @@ class StickerPdfService
         $pdf->setPrintHeader(false);
         $pdf->setPrintFooter(false);
         // $pdf->setCellPaddings(0, 0, 0, 0);
-        // $pdf->setCellMargins(5, 5, 5, 5);
+       // $pdf->setCellMargins(5, 5, 5, 5);
 
         // Set margins
-        // $pdf->SetMargins(5, 5, 5); // left, top, right
+        //$pdf->SetMargins(5, 5, 5); // left, top, right
 
         $pdf->SetMargins(
             (float) $structure->sticker_lmargin,
@@ -303,6 +81,7 @@ class StickerPdfService
 
         $pdf->SetFont('helvetica', 'B', 10);
 
+
         foreach ($elements as $row) {
 
             switch ($row->design_element_type) {
@@ -334,7 +113,7 @@ class StickerPdfService
                         (string) $textValue
                     );
 
-                    break;
+                break;
 
                 case 'QR':
                     $pdf->write2DBarcode(
@@ -354,13 +133,15 @@ class StickerPdfService
                     if (
                         $row->element_type == 'Dynamic' &&
                         isset($dynamicValueMap[$row->id]) &&
-                        ! empty($dynamicValueMap[$row->id]['value'])
-                    ) {
-                        $imageName = strtolower($dynamicValueMap[$row->id]['value']).'.png';
+                        !empty($dynamicValueMap[$row->id]['value'])
+                    )
+                    {
+                        $imageName = strtolower($dynamicValueMap[$row->id]['value']) . '.png';
 
-                        $imagePath = public_path('images/'.ltrim($imageName, '/'));
+                        $imagePath = public_path('images/' . ltrim($imageName, '/'));
                     }
 
+
                     $pdf->Image(
                         $imagePath,
                         (float) ($row->image_x ?? 0),
@@ -403,11 +184,12 @@ class StickerPdfService
 
                         $x = min($x1, $x2);
                         $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
+                        $width  = abs($x2 - $x1);
                         $height = abs($y2 - $y1);
 
                         $pdf->Rect($x, $y, $width, $height, 'D');
-                    } elseif ($row->shape_name == 'CurvedRectangle') {
+                    }
+                    elseif ($row->shape_name == 'CurvedRectangle') {
                         $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
 
                         if (isset($row->element_colour)) {
@@ -424,7 +206,7 @@ class StickerPdfService
 
                         $x = min($x1, $x2);
                         $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
+                        $width  = abs($x2 - $x1);
                         $height = abs($y2 - $y1);
 
                         // radius in mm
@@ -446,12 +228,11 @@ class StickerPdfService
             }
         }
 
-        // return $pdf->Output('sticker.pdf', 'S');
-        $pdfContent = $pdf->Output('sticker.pdf', 'S');
-
-        return (new Response($pdfContent, 200))
-            ->header('Content-Type', 'application/pdf')
-            ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
+        //return $pdf->Output('sticker.pdf', 'S');
+         $pdfContent = $pdf->Output('sticker.pdf', 'S');
+         return (new Response($pdfContent, 200))
+        ->header('Content-Type', 'application/pdf')
+        ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
 
     }
 
@@ -471,7 +252,7 @@ class StickerPdfService
             $structureId
         )->get();
 
-        $width = (float) $structure->sticker_width;
+        $width  = (float) $structure->sticker_width;
         $height = (float) $structure->sticker_height;
 
         $pdf = new TCPDF('P', 'mm', [$width, $height], true, 'UTF-8', false);
@@ -501,10 +282,11 @@ class StickerPdfService
             (float) $structure->sticker_bmargin,
         );
 
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
+        //$pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
+        //$pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
 
-        // dd($pdf->getMargins());
+
+        //dd($pdf->getMargins());
 
         $pdf->AddPage();
 
@@ -518,6 +300,7 @@ class StickerPdfService
         // $pdf->Text(45, 45, 'Batch: X1');
         // $pdf->Text(3, 20, '✓ Valid');
 
+
         foreach ($elements as $row) {
 
             switch ($row->design_element_type) {
@@ -552,10 +335,10 @@ class StickerPdfService
                         break;
                     }
 
-                    $imagePath = storage_path('app/public/'.ltrim($row->image_path, '/'));
+                    $imagePath = storage_path('app/public/' . ltrim($row->image_path, '/'));
 
                     // Optional: check if file actually exists (avoid TCPDF crash)
-                    if (! file_exists($imagePath)) {
+                    if (!file_exists($imagePath)) {
                         // Log or skip — or use a placeholder
                         break;
                     }
@@ -602,7 +385,7 @@ class StickerPdfService
 
                         $x = min($x1, $x2);
                         $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
+                        $width  = abs($x2 - $x1);
                         $height = abs($y2 - $y1);
 
                         $pdf->Rect($x, $y, $width, $height, 'D');
@@ -611,418 +394,11 @@ class StickerPdfService
             }
         }
 
-        // return $pdf->Output('sticker.pdf', 'S');
-        $pdfContent = $pdf->Output('sticker.pdf', 'S');
-
-        return (new Response($pdfContent, 200))
-            ->header('Content-Type', 'application/pdf')
-            ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
-    }
-
-    public function generateSticker(string $stickerId, array $elements)
-    {
-        $structure = StickerStructureDetail::where('sticker_id', $stickerId)
-            ->first();
-
-        // $stickerId = $structure->sticker_id;
-
-        // $elements = StickerDetail::where('sticker_structure_detail_id', $stickerId)->get();
-
-        // dd($elements);
-        $structureId = $structure->id;
-        $elements = StickerDetail::where(
-            'sticker_structure_detail_id',
-            $structureId
-        )->get();
-
-        $width = (float) $structure->sticker_width;
-        $height = (float) $structure->sticker_height;
-
-        $pdf = new TCPDF('P', 'mm', [$width, $height], true, 'UTF-8', false);
-
-        // $pdf->SetMargins(
-        //     (float) $structure->sticker_lmargin,
-        //     (float) $structure->sticker_tmargin,
-        //     (float) $structure->sticker_rmargin,
-        // );
-
-        // //$pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
-        // $pdf->setCellPaddings(0, 0, 0, 0);
-        $pdf->setCellMargins(5, 5, 5, 5);
-
-        // Set margins
-        $pdf->SetMargins(5, 5, 5); // left, top, right
-        // $pdf->SetAutoPageBreak(false, 0); // bottom = 0
-
-        $pdf->SetMargins(
-            (float) $structure->sticker_lmargin,
-            (float) $structure->sticker_tmargin,
-            (float) $structure->sticker_rmargin,
-            (float) $structure->sticker_bmargin,
-        );
-
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-
-        // dd($pdf->getMargins());
-
-        $pdf->AddPage();
-
-        $pdf->SetFont('helvetica', 'B', 10); // font, style, size in points
-
-        // // 📍 ADD TEXT: 3mm from left, 10mm from top
-        // $pdf->Text(3, 10, 'Sticker ID: ' . $stickerId);
-
-        // // Optional: add more text
-        // $pdf->SetFont('helvetica', '', 8);
-        // $pdf->Text(45, 45, 'Batch: X1');
-        // $pdf->Text(3, 20, '✓ Valid');
-
-        foreach ($elements as $row) {
-
-            switch ($row->design_element_type) {
-
-                case 'Text':
-                    $pdf->SetFont(
-                        $row->string_font ?? 'helvetica',
-                        '',
-                        (int) ($row->string_size ?? 10)
-                    );
-                    $pdf->SetTextColor(...$this->hexToRgb($row->element_colour ?? '#000000'));
-                    $pdf->Text(
-                        (float) ($row->string_x_value ?? 0),
-                        (float) ($row->string_y_value ?? 0),
-                        $row->string_value ?? ''
-                    );
-                    break;
-
-                case 'QR':
-                    $pdf->write2DBarcode(
-                        $row->qr_value ?? '',
-                        'QRCODE,H',
-                        (float) ($row->qr_x_value ?? 0),
-                        (float) ($row->qr_y_value ?? 0),
-                        (float) ($row->qr_size ?? 10),
-                        (float) ($row->qr_size ?? 10)
-                    );
-                    break;
-
-                case 'Image':
-                    if (empty($row->image_path)) {
-                        break;
-                    }
-
-                    $imagePath = storage_path('app/public/'.ltrim($row->image_path, '/'));
-
-                    // Optional: check if file actually exists (avoid TCPDF crash)
-                    if (! file_exists($imagePath)) {
-                        // Log or skip — or use a placeholder
-                        break;
-                    }
-
-                    $pdf->Image(
-                        $imagePath,
-                        (float) ($row->image_x ?? 0),
-                        (float) ($row->image_y ?? 0),
-                        (float) ($row->image_width ?? 0),
-                        (float) ($row->image_height ?? 0)
-                    );
-                    break;
-                case 'Shape':
-                    if ($row->shape_name == 'Line') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $pdf->Line(
-                            (float) $row->shape_x1_value,
-                            (float) $row->shape_y1_value,
-                            (float) $row->shape_x2_value,
-                            (float) $row->shape_y2_value
-                        );
-                    } elseif ($row->shape_name == 'Rectangle') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $x1 = (float) $row->shape_x1_value;
-                        $y1 = (float) $row->shape_y1_value;
-                        $x2 = (float) $row->shape_x2_value;
-                        $y2 = (float) $row->shape_y2_value;
-
-                        $x = min($x1, $x2);
-                        $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
-                        $height = abs($y2 - $y1);
-
-                        $pdf->Rect($x, $y, $width, $height, 'D');
-                    }
-                    break;
-            }
-        }
-
-        $pdfContent = $pdf->Output('', 'S'); // 'S' returns string
-
-        // Encode as base64
-        return base64_encode($pdfContent);
-
-        // // return $pdf->Output('sticker.pdf', 'S');
-        // $pdfContent = $pdf->Output('sticker.pdf', 'S');
-
-        // return (new Response($pdfContent, 200))
-        //     ->header('Content-Type', 'application/pdf')
-        //     ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
-    }
-
-    public function generatePdf1(string $stickerId, Collection $dynamicElements, ?ItemCharacteristic $itemCharacteristic, ?string $serialNumber)
-    {
-
-        $dynamicValueMap = [];
-
-        foreach ($dynamicElements as $element) {
-
-            $column = $element->characteristics_type;
-
-            $value = '';
-
-            if (
-                $itemCharacteristic &&
-                $column &&
-                Schema::hasColumn('item_characteristics', $column)
-            ) {
-                $value = $itemCharacteristic->{$column};
-            }
-
-            $dynamicValueMap[$element->id] = [
-                'design_type' => $element->design_element_type, // Text / Image
-                'value' => $value,
-            ];
-        }
-
-        $structure = StickerStructureDetail::where('sticker_id', $stickerId)
-            ->first();
-
-        $structureId = $structure->id;
-        $elements = StickerDetail::where(
-            'sticker_structure_detail_id',
-            $structureId
-        )->get();
-
-        $width = (float) $structure->sticker_width;
-        $height = (float) $structure->sticker_height;
-
-        $pdf = new TCPDF('P', 'mm', [$width, $height], true, 'UTF-8', false);
-
-        // $pdf->SetMargins(
-        //     (float) $structure->sticker_lmargin,
-        //     (float) $structure->sticker_tmargin,
-        //     (float) $structure->sticker_rmargin,
-        // );
-
-        // //$pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-        // $pdf->SetAutoPageBreak(false, (float) $structure->sticker_bmargin);
-
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
-        // $pdf->setCellPaddings(0, 0, 0, 0);
-        // $pdf->setCellMargins(5, 5, 5, 5);
-
-        // Set margins
-        // $pdf->SetMargins(5, 5, 5); // left, top, right
-
-        $pdf->SetMargins(
-            (float) $structure->sticker_lmargin,
-            (float) $structure->sticker_tmargin,
-            (float) $structure->sticker_rmargin,
-        );
-        $pdf->SetAutoPageBreak(false, 0);
-
-        $pdf->AddPage();
-
-        if (!empty($serialNumber)) {
-            $pdf->SetFont('helvetica', 'B', 10);
-            $pdf->SetTextColor(0, 0, 0);
-
-            // HARD-CODED POSITION (mm)
-            $x = 40;  // change as needed
-            $y = 60;  // change as needed
-
-            $pdf->Text($x, $y, (string) $serialNumber);
-        }
-
-        $pdf->SetFont('helvetica', 'B', 10);
-
-        foreach ($elements as $row) {
-
-            switch ($row->design_element_type) {
-
-                case 'Text':
-
-                    $pdf->SetFont(
-                        $row->string_font ?? 'helvetica',
-                        '',
-                        (int) ($row->string_size ?? 10)
-                    );
-
-                    $pdf->SetTextColor(
-                        ...$this->hexToRgb($row->element_colour ?? '#000000')
-                    );
-
-                    $textValue = $row->string_value ?? '';
-
-                    if (
-                        $row->element_type == 'Dynamic' &&
-                        isset($dynamicValueMap[$row->id])
-                    ) {
-                        $textValue = $dynamicValueMap[$row->id]['value'];
-                    }
-
-                    $pdf->Text(
-                        (float) ($row->string_x_value ?? 0),
-                        (float) ($row->string_y_value ?? 0),
-                        (string) $textValue
-                    );
-
-                    break;
-
-                case 'QR':
-                    $pdf->write2DBarcode(
-                        $row->qr_value ?? '',
-                        'QRCODE,H',
-                        (float) ($row->qr_x_value ?? 0),
-                        (float) ($row->qr_y_value ?? 0),
-                        (float) ($row->qr_size ?? 10),
-                        (float) ($row->qr_size ?? 10)
-                    );
-                    break;
-
-                case 'Image':
-
-                    $imagePath = null;
-
-                    if (
-                        $row->element_type == 'Dynamic' &&
-                        isset($dynamicValueMap[$row->id]) &&
-                        ! empty($dynamicValueMap[$row->id]['value'])
-                    ) {
-                        $imageName = strtolower($dynamicValueMap[$row->id]['value']).'.png';
-
-                        $imagePath = public_path('images/'.ltrim($imageName, '/'));
-                    }
-
-                    $pdf->Image(
-                        $imagePath,
-                        (float) ($row->image_x ?? 0),
-                        (float) ($row->image_y ?? 0),
-                        (float) ($row->image_width ?? 0),
-                        (float) ($row->image_height ?? 0)
-                    );
-                    break;
-                case 'Shape':
-                    if ($row->shape_name == 'Line') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $pdf->Line(
-                            (float) $row->shape_x1_value,
-                            (float) $row->shape_y1_value,
-                            (float) $row->shape_x2_value,
-                            (float) $row->shape_y2_value
-                        );
-                    } elseif ($row->shape_name == 'Rectangle') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $x1 = (float) $row->shape_x1_value;
-                        $y1 = (float) $row->shape_y1_value;
-                        $x2 = (float) $row->shape_x2_value;
-                        $y2 = (float) $row->shape_y2_value;
-
-                        $x = min($x1, $x2);
-                        $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
-                        $height = abs($y2 - $y1);
-
-                        $pdf->Rect($x, $y, $width, $height, 'D');
-                    } elseif ($row->shape_name == 'CurvedRectangle') {
-                        $pdf->SetLineWidth((float) ($row->shape_pen_size ?? 0.3));
-
-                        if (isset($row->element_colour)) {
-                            $rgb = $this->hexToRgb($row->element_colour);
-                            $pdf->SetDrawColor($rgb[0], $rgb[1], $rgb[2]);
-                        } else {
-                            $pdf->SetDrawColor(0, 0, 0);
-                        }
-
-                        $x1 = (float) $row->shape_x1_value;
-                        $y1 = (float) $row->shape_y1_value;
-                        $x2 = (float) $row->shape_x2_value;
-                        $y2 = (float) $row->shape_y2_value;
-
-                        $x = min($x1, $x2);
-                        $y = min($y1, $y2);
-                        $width = abs($x2 - $x1);
-                        $height = abs($y2 - $y1);
-
-                        // radius in mm
-                        // $radius = 3;
-                        $radius = (float) $row->curve_radius;
-
-                        $pdf->RoundedRect(
-                            $x,
-                            $y,
-                            $width,
-                            $height,
-                            $radius,
-                            '1111', // ← round all 4 corners (default)
-                            'D'
-                        );
-                    }
-
-                    break;
-            }
-        }
-
-        // return $pdf->Output('sticker.pdf', 'S');
-        $pdfContent = $pdf->Output('sticker1.pdf', 'S');
-        $filename = "sticker_{$stickerId}_" . time() . ".pdf";
-
-        // return (new Response($pdfContent, 200))
-        //     ->header('Content-Type', 'application/pdf');
-        //     ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
-        return response($pdfContent, 200)
-            ->header('Content-Type', 'application/pdf')
-            ->header('Content-Disposition', 'inline; filename="'.$filename.'"')
-            ->header('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->header('Pragma', 'no-cache')
-            ->header('Expires', '0');
-
+        //return $pdf->Output('sticker.pdf', 'S');
+         $pdfContent = $pdf->Output('sticker.pdf', 'S');
+         return (new Response($pdfContent, 200))
+        ->header('Content-Type', 'application/pdf')
+        ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
     }
 
     // private function hexToRgb($hex)
@@ -1036,21 +412,21 @@ class StickerPdfService
     // }
     private function hexToRgb($hex)
     {
-        if (! is_string($hex) || ($hex = trim($hex)) === '') {
+        if (!is_string($hex) || ($hex = trim($hex)) === '') {
             return [0, 0, 0];
         }
         $hex = ltrim($hex, '#');
         if (strlen($hex) == 3) {
             $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
         }
-        if (strlen($hex) !== 6 || ! ctype_xdigit($hex)) {
+        if (strlen($hex) !== 6 || !ctype_xdigit($hex)) {
             return [0, 0, 0];
         }
-
         return [
             hexdec(substr($hex, 0, 2)), // integer
             hexdec(substr($hex, 2, 2)), // integer
-            hexdec(substr($hex, 4, 2)),  // integer
+            hexdec(substr($hex, 4, 2))  // integer
         ];
     }
+
 }

composer.json

@@ -11,11 +11,9 @@
         "althinect/filament-spatie-roles-permissions": "^2.3",
         "diogogpinto/filament-auth-ui-enhancer": "^1.0",
         "erag/laravel-pwa": "^1.9",
-        "ffhs/filament-package_ffhs_approvals": "^1.0",
         "filament/filament": "^3.3",
         "intervention/image": "^3.11",
         "irazasyed/telegram-bot-sdk": "^3.15",
-        "laravel-notification-channels/webpush": "^10.4",
         "laravel/framework": "^11.31",
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.9",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0e64d9b0a3c4d596ff8cd51b521c0565",
+    "content-hash": "69ede7e9877dd08efdeb795bfb6b7d29",
     "packages": [
         {
             "name": "alperenersoy/filament-export",
@@ -1810,85 +1810,6 @@
             },
             "time": "2025-10-17T16:34:55+00:00"
         },
-        {
-            "name": "ffhs/filament-package_ffhs_approvals",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ffhs/filament-package_ffhs_approvals.git",
-                "reference": "712475522b63bf45a9e63a649d391cfe22132818"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ffhs/filament-package_ffhs_approvals/zipball/712475522b63bf45a9e63a649d391cfe22132818",
-                "reference": "712475522b63bf45a9e63a649d391cfe22132818",
-                "shasum": ""
-            },
-            "require": {
-                "filament/filament": "^3.0",
-                "php": "^8.2",
-                "spatie/laravel-package-tools": "^1.15.0"
-            },
-            "require-dev": {
-                "larastan/larastan": "^3.0",
-                "laravel/pint": "^1.0",
-                "nunomaduro/collision": "^8.0",
-                "orchestra/testbench": "^9.9",
-                "pestphp/pest": "^3.7",
-                "pestphp/pest-plugin-arch": "^3.0",
-                "pestphp/pest-plugin-laravel": "^3.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan-deprecation-rules": "^2.0",
-                "phpstan/phpstan-phpunit": "^2.0",
-                "spatie/laravel-ray": "^1.26"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "aliases": {
-                        "Approvals": "Ffhs\\Approvals\\Facades\\Approvals"
-                    },
-                    "providers": [
-                        "Ffhs\\Approvals\\ApprovalsServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Ffhs\\Approvals\\": "src/",
-                    "Ffhs\\Approvals\\Database\\Factories\\": "database/factories/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kromer Luc",
-                    "email": "luc.kromer@ffhs.ch",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Matthew Ballou",
-                    "email": "mballou@kirschbaumdevelopment.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "This is my package filament-package_ffhs_approvals",
-            "homepage": "https://github.com/ffhs/filament-package_ffhs_approvals",
-            "keywords": [
-                "ffhs",
-                "filament-package_ffhs_approvals",
-                "kirschbaum-development",
-                "laravel"
-            ],
-            "support": {
-                "issues": "https://github.com/ffhs/filament-package_ffhs_approvals/issues",
-                "source": "https://github.com/ffhs/filament-package_ffhs_approvals"
-            },
-            "time": "2025-07-24T14:32:41+00:00"
-        },
         {
             "name": "filament/actions",
             "version": "v3.3.45",
@@ -3155,72 +3076,6 @@
             },
             "time": "2025-11-13T14:57:49+00:00"
         },
-        {
-            "name": "laravel-notification-channels/webpush",
-            "version": "10.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel-notification-channels/webpush.git",
-                "reference": "a504bcbdd6258091b1fafdef6ca95b0891a47c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-notification-channels/webpush/zipball/a504bcbdd6258091b1fafdef6ca95b0891a47c9e",
-                "reference": "a504bcbdd6258091b1fafdef6ca95b0891a47c9e",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/notifications": "^11.0|^12.0",
-                "illuminate/support": "^11.0|^12.0",
-                "minishlink/web-push": "^10.0",
-                "php": "^8.2"
-            },
-            "require-dev": {
-                "larastan/larastan": "^3.1",
-                "laravel/pint": "^1.25",
-                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^9.2|^10.0",
-                "phpunit/phpunit": "^10.5|^11.5.3",
-                "rector/rector": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "NotificationChannels\\WebPush\\WebPushServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "NotificationChannels\\WebPush\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Cretu Eusebiu",
-                    "email": "me@cretueusebiu.com",
-                    "homepage": "http://cretueusebiu.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Joost de Bruijn",
-                    "email": "joost@aqualabs.nl",
-                    "role": "Maintainer"
-                }
-            ],
-            "description": "Web Push Notifications driver for Laravel.",
-            "homepage": "https://github.com/laravel-notification-channels/webpush",
-            "support": {
-                "issues": "https://github.com/laravel-notification-channels/webpush/issues",
-                "source": "https://github.com/laravel-notification-channels/webpush/tree/10.4.0"
-            },
-            "time": "2025-12-19T15:47:27+00:00"
-        },
         {
             "name": "laravel/framework",
             "version": "v11.46.1",
@@ -5025,73 +4880,6 @@
             },
             "time": "2019-10-05T02:44:33+00:00"
         },
-        {
-            "name": "minishlink/web-push",
-            "version": "v10.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/web-push-libs/web-push-php.git",
-                "reference": "08463189d3501cbd78a8625c87ab6680a7397aad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/08463189d3501cbd78a8625c87ab6680a7397aad",
-                "reference": "08463189d3501cbd78a8625c87ab6680a7397aad",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-openssl": "*",
-                "guzzlehttp/guzzle": "^7.9.2",
-                "php": ">=8.2",
-                "spomky-labs/base64url": "^2.0.4",
-                "web-token/jwt-library": "^3.4.9|^4.0.6"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^v3.91.3",
-                "phpstan/phpstan": "^2.1.33",
-                "phpstan/phpstan-strict-rules": "^2.0",
-                "phpunit/phpunit": "^11.5.46|^12.5.2",
-                "symfony/polyfill-iconv": "^1.33"
-            },
-            "suggest": {
-                "ext-bcmath": "Optional for performance.",
-                "ext-gmp": "Optional for performance."
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Minishlink\\WebPush\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Louis Lagrange",
-                    "email": "lagrange.louis@gmail.com",
-                    "homepage": "https://github.com/Minishlink"
-                }
-            ],
-            "description": "Web Push library for PHP",
-            "homepage": "https://github.com/web-push-libs/web-push-php",
-            "keywords": [
-                "Push API",
-                "WebPush",
-                "notifications",
-                "push",
-                "web"
-            ],
-            "support": {
-                "issues": "https://github.com/web-push-libs/web-push-php/issues",
-                "source": "https://github.com/web-push-libs/web-push-php/tree/v10.0.1"
-            },
-            "time": "2025-12-15T10:04:28+00:00"
-        },
         {
             "name": "monolog/monolog",
             "version": "3.9.0",
@@ -7908,180 +7696,6 @@
             ],
             "time": "2025-09-24T06:40:28+00:00"
         },
-        {
-            "name": "spomky-labs/base64url",
-            "version": "v2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Spomky-Labs/base64url.git",
-                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d",
-                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.11|^0.12",
-                "phpstan/phpstan-beberlei-assert": "^0.11|^0.12",
-                "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
-                "phpstan/phpstan-phpunit": "^0.11|^0.12",
-                "phpstan/phpstan-strict-rules": "^0.11|^0.12"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Base64Url\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Florent Morselli",
-                    "homepage": "https://github.com/Spomky-Labs/base64url/contributors"
-                }
-            ],
-            "description": "Base 64 URL Safe Encoding/Decoding PHP Library",
-            "homepage": "https://github.com/Spomky-Labs/base64url",
-            "keywords": [
-                "base64",
-                "rfc4648",
-                "safe",
-                "url"
-            ],
-            "support": {
-                "issues": "https://github.com/Spomky-Labs/base64url/issues",
-                "source": "https://github.com/Spomky-Labs/base64url/tree/v2.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Spomky",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/FlorentMorselli",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2020-11-03T09:10:25+00:00"
-        },
-        {
-            "name": "spomky-labs/pki-framework",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Spomky-Labs/pki-framework.git",
-                "reference": "f0e9a548df4e3942886adc9b7830581a46334631"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/f0e9a548df4e3942886adc9b7830581a46334631",
-                "reference": "f0e9a548df4e3942886adc9b7830581a46334631",
-                "shasum": ""
-            },
-            "require": {
-                "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14",
-                "ext-mbstring": "*",
-                "php": ">=8.1"
-            },
-            "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
-                "ext-gmp": "*",
-                "ext-openssl": "*",
-                "infection/infection": "^0.28|^0.29|^0.31",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.3|^2.0",
-                "phpstan/phpstan": "^1.8|^2.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
-                "phpstan/phpstan-phpunit": "^1.1|^2.0",
-                "phpstan/phpstan-strict-rules": "^1.3|^2.0",
-                "phpunit/phpunit": "^10.1|^11.0|^12.0",
-                "rector/rector": "^1.0|^2.0",
-                "roave/security-advisories": "dev-latest",
-                "symfony/string": "^6.4|^7.0|^8.0",
-                "symfony/var-dumper": "^6.4|^7.0|^8.0",
-                "symplify/easy-coding-standard": "^12.0"
-            },
-            "suggest": {
-                "ext-bcmath": "For better performance (or GMP)",
-                "ext-gmp": "For better performance (or BCMath)",
-                "ext-openssl": "For OpenSSL based cyphering"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "SpomkyLabs\\Pki\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Joni Eskelinen",
-                    "email": "jonieske@gmail.com",
-                    "role": "Original developer"
-                },
-                {
-                    "name": "Florent Morselli",
-                    "email": "florent.morselli@spomky-labs.com",
-                    "role": "Spomky-Labs PKI Framework developer"
-                }
-            ],
-            "description": "A PHP framework for managing Public Key Infrastructures. It comprises X.509 public key certificates, attribute certificates, certification requests and certification path validation.",
-            "homepage": "https://github.com/spomky-labs/pki-framework",
-            "keywords": [
-                "DER",
-                "Private Key",
-                "ac",
-                "algorithm identifier",
-                "asn.1",
-                "asn1",
-                "attribute certificate",
-                "certificate",
-                "certification request",
-                "cryptography",
-                "csr",
-                "decrypt",
-                "ec",
-                "encrypt",
-                "pem",
-                "pkcs",
-                "public key",
-                "rsa",
-                "sign",
-                "signature",
-                "verify",
-                "x.509",
-                "x.690",
-                "x509",
-                "x690"
-            ],
-            "support": {
-                "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
-                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Spomky",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/FlorentMorselli",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2025-12-20T12:57:40+00:00"
-        },
         {
             "name": "symfony/clock",
             "version": "v7.3.0",
@@ -10890,95 +10504,6 @@
                 }
             ],
             "time": "2024-11-21T01:49:47+00:00"
-        },
-        {
-            "name": "web-token/jwt-library",
-            "version": "4.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/web-token/jwt-library.git",
-                "reference": "690d4dd47b78f423cb90457f858e4106e1deb728"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-library/zipball/690d4dd47b78f423cb90457f858e4106e1deb728",
-                "reference": "690d4dd47b78f423cb90457f858e4106e1deb728",
-                "shasum": ""
-            },
-            "require": {
-                "brick/math": "^0.12|^0.13|^0.14",
-                "php": ">=8.2",
-                "psr/clock": "^1.0",
-                "spomky-labs/pki-framework": "^1.2.1"
-            },
-            "conflict": {
-                "spomky-labs/jose": "*"
-            },
-            "suggest": {
-                "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
-                "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance",
-                "ext-openssl": "For key management (creation, optimization, etc.) and some algorithms (AES, RSA, ECDSA, etc.)",
-                "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
-                "paragonie/sodium_compat": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
-                "spomky-labs/aes-key-wrap": "For all Key Wrapping algorithms (AxxxKW, AxxxGCMKW, PBES2-HSxxx+AyyyKW...)",
-                "symfony/console": "Needed to use console commands",
-                "symfony/http-client": "To enable JKU/X5U support."
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Jose\\Component\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Florent Morselli",
-                    "homepage": "https://github.com/Spomky"
-                },
-                {
-                    "name": "All contributors",
-                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
-                }
-            ],
-            "description": "JWT library",
-            "homepage": "https://github.com/web-token",
-            "keywords": [
-                "JOSE",
-                "JWE",
-                "JWK",
-                "JWKSet",
-                "JWS",
-                "Jot",
-                "RFC7515",
-                "RFC7516",
-                "RFC7517",
-                "RFC7518",
-                "RFC7519",
-                "RFC7520",
-                "bundle",
-                "jwa",
-                "jwt",
-                "symfony"
-            ],
-            "support": {
-                "issues": "https://github.com/web-token/jwt-library/issues",
-                "source": "https://github.com/web-token/jwt-library/tree/4.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Spomky",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/FlorentMorselli",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2025-12-18T14:27:35+00:00"
         }
     ],
     "packages-dev": [

database/migrations/2025_12_23_165826_create_sticker_mapping_masters_table.php

@@ -1,91 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE sticker_mapping_masters (
-                id                          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-                plant_id                    BIGINT NOT NULL,
-                item_characteristic_id      BIGINT DEFAULT NULL,
-                sticker_structure1_id       BIGINT DEFAULT NULL,
-                sticker1_machine_id         BIGINT DEFAULT NULL,
-                sticker1_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure2_id       BIGINT DEFAULT NULL,
-                sticker2_machine_id         BIGINT DEFAULT NULL,
-                sticker2_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure3_id       BIGINT DEFAULT NULL,
-                sticker3_machine_id         BIGINT DEFAULT NULL,
-                sticker3_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure4_id       BIGINT DEFAULT NULL,
-                sticker4_machine_id         BIGINT DEFAULT NULL,
-                sticker4_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure5_id       BIGINT DEFAULT NULL,
-                sticker5_machine_id         BIGINT DEFAULT NULL,
-                sticker5_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure6_id       BIGINT DEFAULT NULL,
-                sticker6_machine_id         BIGINT DEFAULT NULL,
-                sticker6_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure7_id       BIGINT DEFAULT NULL,
-                sticker7_machine_id         BIGINT DEFAULT NULL,
-                sticker7_print_ip           TEXT DEFAULT NULL,
-
-                sticker_structure8_id       BIGINT DEFAULT NULL,
-                sticker8_machine_id         BIGINT DEFAULT NULL,
-                sticker8_print_ip           TEXT DEFAULT NULL,
-
-                created_at                  TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at                  TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by                  TEXT DEFAULT NULL,
-                updated_by                  TEXT DEFAULT NULL,
-                deleted_at                  TIMESTAMP,
-
-                FOREIGN KEY (plant_id) REFERENCES plants(id),
-                FOREIGN KEY (item_characteristic_id) REFERENCES item_characteristics(id),
-
-                FOREIGN KEY (sticker_structure1_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure2_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure3_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure4_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure5_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure6_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure7_id) REFERENCES sticker_structure_details(id),
-                FOREIGN KEY (sticker_structure8_id) REFERENCES sticker_structure_details(id),
-
-                FOREIGN KEY (sticker1_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker2_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker3_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker4_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker5_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker6_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker7_machine_id) REFERENCES machines(id),
-                FOREIGN KEY (sticker8_machine_id) REFERENCES machines(id)
-            );
-        SQL;
-
-        DB::statement($sql);
-    }
-
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('sticker_mapping_masters');
-    }
-};

database/migrations/2025_12_24_182850_create_sticker_validations_table.php

@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE sticker_validations (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-                plant_id                            BIGINT NOT NULL,
-                machine_id                          BIGINT NOT NULL,
-                production_order                    TEXT DEFAULT NULL,
-                serial_number                       TEXT DEFAULT NULL,
-                status                              TEXT DEFAULT NULL,
-                sticker_id                          TEXT DEFAULT NULL
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-                FOREIGN KEY (plant_id)              REFERENCES  plants (id),
-                FOREIGN KEY (machine_id)            REFERENCES  machines (id)
-
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('sticker_validations');
-    }
-};

database/migrations/2025_12_25_130435_removed_image_path_column_to_sticker_details.php

@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('sticker_details', function (Blueprint $table) {
-            $table->dropColumn('image_path');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('sticker_details', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2025_12_25_130851_removed_image_type_column_to_sticker_details.php

@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('sticker_details', function (Blueprint $table) {
-            $table->dropColumn('image_type');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('sticker_details', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_01_07_180823_create_spot_rate_transport_masters_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE spot_rate_transport_masters (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                group_name                          TEXT NOT NULL,
-                user_name					        TEXT DEFAULT NULL,
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP
-
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('spot_rate_transport_masters');
-    }
-};

database/migrations/2026_01_07_181452_create_request_quotations_table.php

@@ -1,60 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE request_quotations (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                spot_rate_transport_master_id       BIGINT NOT NULL,
-                rfq_number                          TEXT NOT NULL,
-                rfq_date_time					    TIMESTAMP NOT NULL DEFAULT NOW(),
-                pickup_address                      TEXT NOT NULL,
-                delivery_address                    TEXT NOT NULL,
-                weight                              TEXT NOT NULL,
-                volumetrice_size_inch               TEXT NOT NULL,
-                type_of_vehicle                     TEXT NOT NULL,
-                special_type                        TEXT NOT NULL,
-                no_of_vehicle                       TEXT NOT NULL,
-                product_name                        TEXT NOT NULL,
-                loading_by                          TEXT NOT NULL,
-                unloading_by                        TEXT NOT NULL,
-                pick_and_delivery                   TEXT NOT NULL,
-                payment_term                        TEXT NOT NULL,
-                paid_topay                          TEXT NOT NULL,
-                require_date_time                   TIMESTAMP NOT NULL DEFAULT NOW(),
-                rfq_rec_on_or_before                TIMESTAMP NOT NULL DEFAULT NOW(),
-                transporter_name                    TEXT NULL,
-                total_freight_charge                TEXT NULL,
-                transit_day                         TEXT NULL,
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-
-                FOREIGN KEY (spot_rate_transport_master_id)  REFERENCES  spot_rate_transport_masters (id)
-
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('request_quotations');
-    }
-};

database/migrations/2026_01_08_123007_create_rfq_transporter_bids_table.php

@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE rfq_transporter_bids (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                request_quotation_id                BIGINT NOT NULL,
-
-                transporter_name                    TEXT NULL,
-                total_freight_charge                TEXT NULL,
-                transit_day                         TEXT NULL,
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-
-                FOREIGN KEY (request_quotation_id) REFERENCES request_quotations(id)
-
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('rfq_transporter_bids');
-    }
-};

database/migrations/2026_02_16_095917_add_foreign_key_item_id_column_to_production_plans.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE production_plans
-            ADD COLUMN item_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT production_plans_item_id_fkey
-            FOREIGN KEY (item_id) REFERENCES items(id);
-        SQL;
-
-        DB::statement($sql);
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100344_add_foreign_key_block_id_column_to_lines.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE lines
-            ADD COLUMN block_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT lines_block_id_fkey
-            FOREIGN KEY (block_id) REFERENCES blocks(id);
-        SQL;
-
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('lines', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100625_add_foreign_key_line_id_and_line_capacity_column_to_items.php

@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-            ALTER TABLE items
-            ADD COLUMN line_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT items_line_id_fkey
-            FOREIGN KEY (line_id) REFERENCES lines(id);
-        SQL;
-
-        DB::statement($sql1);
-
-        $sql2 = <<<'SQL'
-        ALTER TABLE items
-        ADD COLUMN line_capacity TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql2);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('items', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100950_add_foreign_key_machine_id_to_production_quantities.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE production_quantities
-            ADD COLUMN machine_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT production_quantities_machine_id_fkey
-            FOREIGN KEY (machine_id) REFERENCES machines(id);
-        SQL;
-
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_quantities', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_101248_add_column_working_days_to_production_plans.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-        ALTER TABLE production_plans
-        ADD COLUMN working_days TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql1);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_101529_add_column_leave_dates_to_production_plans.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-        ALTER TABLE production_plans
-        ADD COLUMN leave_dates TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql1);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

public/js/push.js

@@ -1,113 +0,0 @@
-// async function registerPush() {
-//     try {
-//         console.log("Registering for push notifications");
-
-//         if (!('serviceWorker' in navigator)) {
-//             console.error("ServiceWorker not supported");
-//             return;
-//         }
-
-//         const permission = await Notification.requestPermission();
-//         console.log("Permission:", permission);
-
-//         if (permission !== 'granted') {
-//             console.warn("Notification permission denied");
-//             return;
-//         }
-
-//         const registration = await navigator.serviceWorker.register('/sw.js');
-//         console.log("SW registered:", registration);
-
-//         // const subscription = await registration.pushManager.subscribe({
-//         //     userVisibleOnly: true,
-//         //     applicationServerKey: vapidKey
-//         // });
-//         const subscription = await registration.pushManager.subscribe({
-//             userVisibleOnly: true,
-//             applicationServerKey: urlBase64ToUint8Array(vapidKey),
-//         });
-
-//         console.log('VAPID key:', vapidKey);
-
-//         console.log("Subscription created:", subscription);
-
-//         const res = await fetch('/push/subscribe', {
-//             method: 'POST',
-//             headers: {
-//                 'Content-Type': 'application/json',
-//                 'X-CSRF-TOKEN': csrfToken
-//             },
-//             body: JSON.stringify(subscription)
-//         });
-
-//         console.log("Server response:", await res.text());
-
-//         alert("Push enabled ✅");
-//     } catch (e) {
-//         console.error("Push registration failed ❌", e);
-//     }
-// }
-
-async function registerPush() {
-    try {
-        console.log("Registering for push notifications");
-
-        if (!('serviceWorker' in navigator)) {
-            console.error("ServiceWorker not supported");
-            return;
-        }
-
-        const permission = await Notification.requestPermission();
-        if (permission !== 'granted') {
-            console.warn("Notification permission denied");
-            return;
-        }
-
-        const registration = await navigator.serviceWorker.register('/sw.js');
-
-        // ✅ GET first
-        let subscription = await registration.pushManager.getSubscription();
-
-        // ✅ CREATE only if not exists
-        if (!subscription) {
-            subscription = await registration.pushManager.subscribe({
-                userVisibleOnly: true,
-                applicationServerKey: urlBase64ToUint8Array(vapidKey),
-            });
-            console.log("New subscription created");
-        } else {
-            console.log("Existing subscription reused");
-        }
-
-        // 🔥 ALWAYS send to backend
-        await fetch('/push/subscribe', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'X-CSRF-TOKEN': csrfToken
-            },
-            body: JSON.stringify(subscription)
-        });
-
-        alert("Push enabled ✅");
-    } catch (e) {
-        console.error("Push registration failed ❌", e);
-    }
-}
-
-
-function urlBase64ToUint8Array(base64String) {
-    const padding = '='.repeat((4 - base64String.length % 4) % 4);
-    const base64 = (base64String + padding)
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-
-    const rawData = window.atob(base64);
-    const outputArray = new Uint8Array(rawData.length);
-
-    for (let i = 0; i < rawData.length; ++i) {
-        outputArray[i] = rawData.charCodeAt(i);
-    }
-    return outputArray;
-}
-

public/js/pwa-install.js

@@ -1,8 +1,5 @@
 let deferredPrompt;
 
-/* -----------------------------
-   ANDROID / CHROME INSTALL FLOW
-------------------------------*/
 window.addEventListener("beforeinstallprompt", (e) => {
     e.preventDefault();
     deferredPrompt = e;
@@ -10,55 +7,6 @@ window.addEventListener("beforeinstallprompt", (e) => {
     // Prevent duplicate banner
     if (document.getElementById("install-banner")) return;
 
-    showInstallBanner({
-        message: '📱 Install <b>Quality</b> App?',
-        buttonText: 'Install',
-        onClick: async () => {
-            deferredPrompt.prompt();
-            const { outcome } = await deferredPrompt.userChoice;
-            console.log("User install choice:", outcome);
-            deferredPrompt = null;
-        }
-    });
-});
-
-// /* -----------------------------
-//    IOS SAFARI MANUAL INSTALL
-// ------------------------------*/
-// function isIosSafari() {
-//     return (
-//         /iP(ad|hone|od)/.test(navigator.userAgent) &&
-//         /Safari/.test(navigator.userAgent) &&
-//         !/CriOS|FxiOS|OPiOS/.test(navigator.userAgent)
-//     );
-// }
-
-// function isInStandaloneMode() {
-//     return window.navigator.standalone == true;
-// }
-
-// document.addEventListener("DOMContentLoaded", () => {
-//     if (
-//         isIosSafari() &&
-//         !isInStandaloneMode() &&
-//         !localStorage.getItem("iosInstallShown")
-//     ) {
-//         showInstallBanner({
-//             message: '📱 Install <b>Quality</b> App<br><small>Tap Share ⬆️ → Add to Home Screen</small>',
-//             buttonText: 'Got it',
-//             onClick: () => {
-//                 localStorage.setItem("iosInstallShown", "1");
-//             }
-//         });
-//     }
-// });
-
-/* -----------------------------
-   COMMON INSTALL BANNER UI
-------------------------------*/
-function showInstallBanner({ message, buttonText, onClick }) {
-    if (document.getElementById("install-banner")) return;
-
     const banner = document.createElement("div");
     banner.id = "install-banner";
     banner.innerHTML = `
@@ -76,7 +24,7 @@ function showInstallBanner({ message, buttonText, onClick }) {
             box-shadow: 0 4px 10px rgba(0,0,0,0.3);
             z-index: 99999;
         ">
-            <span style="font-size: 16px;">${message}</span><br>
+            <span style="font-size: 16px;">📱 Install <b>Quality</b> App?</span><br>
             <button id="installBtn" style="
                 margin-top: 10px;
                 background: white;
@@ -86,22 +34,22 @@ function showInstallBanner({ message, buttonText, onClick }) {
                 border-radius: 6px;
                 font-weight: 600;
                 cursor: pointer;
-            ">${buttonText}</button>
+            ">Install</button>
         </div>
     `;
     document.body.appendChild(banner);
 
-    document.getElementById("installBtn").addEventListener("click", () => {
+    document.getElementById("installBtn").addEventListener("click", async () => {
         banner.remove();
-        onClick();
+        deferredPrompt.prompt();
+        const { outcome } = await deferredPrompt.userChoice;
+        console.log("User install choice:", outcome);
+        deferredPrompt = null;
     });
-}
+});
 
-/* -----------------------------
-   APP INSTALLED EVENT
-------------------------------*/
 window.addEventListener("appinstalled", () => {
-    console.log("🎉 App installed successfully!");
+    console.log("🎉 PDS installed successfully!");
     const banner = document.getElementById("install-banner");
     if (banner) banner.remove();
 });

public/manifest.json

@@ -1,12 +1,11 @@
 {
-    "name": "QDS",
-    "short_name": "qds",
+    "name": "Laravel PWA",
+    "short_name": "LPT",
     "background_color": "#6777ef",
     "display": "standalone",
     "description": "A Progressive Web Application setup for Laravel projects.",
     "theme_color": "#6777ef",
-    "gcm_sender_id": "103953800507",
-    "start_url": "/admin",
+    "start_url": "/",
    "icons": [
         {
         "src": "/logo-192.png",

public/service-worker.js

@@ -1,20 +0,0 @@
-self.addEventListener('push', function (event) {
-    console.log('[SW] Push received');
-
-    let payload = {};
-
-    if (event.data) {
-        payload = event.data.json();
-    }
-
-    const title = payload.title || 'New Notification';
-    const options = {
-        body: payload.body || '',
-        icon: payload.icon || '/pwa-192x192.png',
-        data: payload.data || {},
-    };
-
-    event.waitUntil(
-        self.registration.showNotification(title, options)
-    );
-});

resources/views/filament/pages/notification-settings.blade.php

@@ -1,71 +0,0 @@
-<x-filament-panels::page>
-    {{-- <button
-        type="button"
-        class="filament-button filament-button-primary"
-        onclick="registerPush()"
-    >
-        Enable Push Notifications
-    </button> --}}
-
-    <div class="max-w-md mx-auto">
-        <x-filament::card>
-            <div class="text-center space-y-4">
-                <h2 class="text-xl font-semibold">
-                    🔔 Stay Updated
-                </h2>
-
-                <p class="text-sm text-gray-500">
-                    Enable push notifications to receive real-time alerts and updates.
-                </p>
-
-                <button
-    type="button"
-    onclick="registerPush()"
-    class="
-        filament-button
-        filament-button-primary
-        w-full
-        flex items-center justify-center gap-2
-        py-3
-        rounded-lg
-        shadow-sm
-        hover:shadow-md
-        transition
-    "
->
-    <x-heroicon-o-bell class="w-5 h-5"/>
-    <span class="font-medium">Enable Push Notifications</span>
-</button>
-            </div>
-        </x-filament::card>
-    </div>
-
-    <script>
-        const vapidKey = "{{ config('webpush.vapid.public_key') }}";
-        const csrfToken = "{{ csrf_token() }}";
-
-        async function registerPush() {
-            if (!('serviceWorker' in navigator)) return;
-
-            const permission = await Notification.requestPermission();
-            if (permission != 'granted') return;
-
-            const registration = await navigator.serviceWorker.register('/service-worker.js');
-
-            const subscription = await registration.pushManager.subscribe({
-                userVisibleOnly: true,
-                applicationServerKey: vapidKey
-            });
-
-            await fetch('/push/subscribe', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-CSRF-TOKEN': csrfToken
-                },
-                body: JSON.stringify(subscription)
-            });
-            alert("Push notifications enabled ✅");
-        }
-    </script>
-</x-filament-panels::page>

resources/views/filament/pages/production-calender.blade.php

@@ -1,13 +0,0 @@
-<x-filament-panels::page>
-
-<div class="space-y-4">
-
-    {{-- Render the Select form fields --}}
-    <div class="space-y-4">
-        {{ $this->form }}
-    </div>
-
-
-</div>
-
-</x-filament-panels::page>

resources/views/filament/pages/production-quantity.blade.php

@@ -45,7 +45,7 @@
 </div> --}}
   <div class="flex gap-6 -mt-6">
         <!-- Scan QR Code -->
-        <div class="w-full">
+        <div class="w-1/2">
             <label for="qr-scan-input" class="block text-sm font-medium text-gray-700 mb-2">
                 SCAN QR CODE
             </label>
@@ -60,7 +60,7 @@
         </div>
 
         <!-- Last Scanned QR -->
-        {{-- <div class="w-1/2">
+        <div class="w-1/2">
             <label for="recent-qr-input" class="block text-sm font-medium text-gray-700 mb-2">
                 LAST SCANNED QR
             </label>
@@ -71,7 +71,7 @@
                 readonly
                 wire:model="recent_qr"
             />
-        </div> --}}
+        </div>
     </div>
 
 

resources/views/filament/pages/production-target.blade.php

@@ -1,19 +0,0 @@
-<x-filament-panels::page>
-<div class="space-y-4">
-
-    {{-- Render the Select form fields --}}
-    <div class="space-y-4">
-        {{ $this->form }}
-    </div>
-    <x-filament::button
-                wire:click="export"
-                color="primary"
-                class="mt-4"
-            >
-            Export
-            </x-filament::button>
-    <div class="bg-white shadow rounded-xl p-4 mt-6">
-        <livewire:production-target-plan />
-    </div>
-</div>
-</x-filament-panels::page>

resources/views/filament/pages/rfq-dashboard.blade.php

@@ -1,14 +0,0 @@
-<x-filament-panels::page>
-<div class="space-y-4">
-        {{-- Render the Select form fields --}}
-        <div class="space-y-4">
-            {{ $this->filtersForm($this->form) }}
-            {{-- {{ $this->form }} --}}
-        </div>
-
-        {{-- Render the chart widget below the form --}}
-        <div class="mt-6">
-            @livewire(\App\Filament\Widgets\RfqChart::class)
-        </div>
-    </div>
-</x-filament-panels::page>

resources/views/filament/pages/rfq-overview.blade.php

@@ -1,14 +0,0 @@
-<x-filament-panels::page>
-<div class="space-y-4">
-        {{-- Render the Select form fields --}}
-        <div class="space-y-4">
-            {{ $this->filtersForm($this->form) }}
-            {{-- {{ $this->form }} --}}
-        </div>
-
-        {{-- Render the chart widget below the form --}}
-        <div class="mt-6">
-            @livewire(\App\Filament\Widgets\RfqRankChart::class)
-        </div>
-    </div>
-</x-filament-panels::page>

resources/views/filament/pages/sticker-structure-preview-page.blade.php

@@ -1,69 +0,0 @@
-<x-filament-panels::page>
-    <div class="space-y-4">
-        {{-- Form --}}
-        <div class="space-y-4">
-            {{ $this->filtersForm($this->form) }}
-        </div>
-
-        {{-- Preview Button --}}
-        <div class="flex flex-row gap-2 mt-4">
-            <button
-                type="button"
-                wire:click="showPreview"
-                class="px-3 py-1 border border-primary-500 text-primary-600 rounded hover:bg-primary-50 hover:border-primary-700 transition text-sm"
-            >
-                Show Preview
-            </button>
-        </div>
-
-        {{-- PDF Preview --}}
-        {{-- @if($this->pdfPreview)
-            <div class="mt-6">
-                <h3 class="text-lg font-medium text-gray-900">Preview</h3>
-                <div class="mt-2 border rounded overflow-hidden bg-white">
-                    <embed
-                        src="data:application/pdf;base64,{{ $this->pdfPreview }}"
-                        type="application/pdf"
-                        width="100%"
-                        height="600px"
-                        class="bg-gray-50"
-                    />
-                </div>
-            </div>
-        @endif --}}
-
-        {{-- PDF Preview with Fallback --}}
-        @if($this->pdfPreview)
-            <div class="mt-6">
-                {{-- <h3 class="text-lg font-medium text-gray-900">Sticker Preview</h3> --}}
-                <div class="mt-2 border rounded overflow-hidden bg-gray-50">
-                    <object
-                        data="data:application/pdf;base64,{{ $this->pdfPreview }}"
-                        type="application/pdf"
-                        width="100%"
-                        height="600"
-                        style="min-height: 600px;"
-                    >
-                        <p class="p-4 text-red-600 bg-white border border-red-200 rounded">
-                            <strong>⚠️ Your browser cannot display PDFs inline.</strong><br>
-                            Don’t worry — you can still:
-                        </p>
-                        <div class="p-4 bg-white">
-                            <!-- Fallback: Provide a download link -->
-                            <a
-                                href="data:application/pdf;base64,{{ $this->pdfPreview }}"
-                                download="sticker_preview.pdf"
-                                class="inline-flex items-center px-4 py-2 bg-primary-600 text-white text-sm font-medium rounded hover:bg-primary-700"
-                            >
-                                📥 Download PDF Preview
-                            </a>
-                            <p class="mt-2 text-sm text-gray-600">
-                                Or try opening this page in Chrome, Edge, or Firefox.
-                            </p>
-                        </div>
-                    </object>
-                </div>
-            </div>
-        @endif
-    </div>
-</x-filament-panels::page>

resources/views/filament/pages/welcome.blade.php

@@ -1,19 +0,0 @@
-<x-filament-panels::page>
-
-    <h1 class="text-3xl font-bold mb-6">Welcome to CRI Digital Manufacturing IIOT</h1>
-
-<div class="w-full overflow-hidden rounded-xl shadow">
-    <img
-        src="{{ asset('images/iiot-banner.jpg') }}"
-        alt="CRI Digital Manufacturing IIoT"
-        class="w-full h-64 object-cover"
-    >
-</div>
-
-<p class="text-lg text-gray-600 mb-6">
-    This dashboard provides real-time visibility into your manufacturing operations,
-    enabling you to monitor production, track performance, and make data-driven decisions
-    across plants and lines—all from one centralized platform.
-</p>
-
-</x-filament-panels::page>

resources/views/filament/resources/sticker-validation-resource/create-sticker-validation.blade.php

@@ -1,69 +0,0 @@
-<x-filament::page>
-    <form wire:submit.prevent="create" class="space-y-6">
-        {{-- Form Section --}}
-        <div class="filament-form space-y-6">
-            {{ $this->form }}
-        </div>
-
-        {{-- <livewire:notification-sound /> --}}
-
-        {{-- Livewire Component (Invoice Table) --}}
-        <div class="bg-white shadow rounded-xl p-4">
-            <livewire:sticker-validation :ref-data="$ref_number" />
-        </div>
-
-        {{-- Actions --}}
-        <div class="filament-actions mt-6">
-            <x-filament::actions>
-                @foreach ($this->getFormActions() as $action)
-                    {{ $action }}
-                @endforeach
-            </x-filament::actions>
-        </div>
-    </form>
-</x-filament::page>
-
-{{-- <script>
-document.addEventListener('livewire:init', () => {
-    Livewire.on('open-multiple-stickers', ({ urls }) => {
-        let delay = 0;
-        urls.forEach(url => {
-            setTimeout(() => {
-                window.open(url, '_blank');
-            }, delay);
-            delay += 600;
-        });
-    });
-});
-</script> --}}
-
-{{-- <script>
-document.addEventListener('DOMContentLoaded', () => {
-    window.addEventListener('open-stickers-sequence', (event) => {
-        console.log('EVENT RECEIVED');
-
-        event.detail.urls.forEach(url => {
-            window.open(url, '_blank');
-        });
-    });
-});
-</script> --}}
-
-<script>
-window.addEventListener('open-stickers-sequence', async (event) => {
-    const urls = event.detail.urls;
-
-    for (const url of urls) {
-        const win = window.open(url, '_blank');
-
-        win.onload = () => {
-            win.focus();
-            win.print();
-        };
-
-        // wait before next
-        await new Promise(r => setTimeout(r, 1500));
-    }
-});
-</script>
-

resources/views/forms/calendar.blade.php

@@ -1,151 +0,0 @@
-<!-- <select id="yearSelect">
-    <option value="">Select Year</option>
-</select> -->
-
-
-<div id="calendar" wire:ignore></div>
-
-
-<!-- <input type="text" name="working_days" placeholder="Working Days"> -->
-
-<link href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.8/index.global.min.css" rel="stylesheet">
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.8/index.global.min.js"></script>
-
-<script>
-document.addEventListener('DOMContentLoaded', function () {
-
-    let selectedDates = [];
-    let calendarEl = document.getElementById('calendar');
-
-    var calendar = new FullCalendar.Calendar(calendarEl, {
-    initialView: 'dayGridMonth',
-    height: 600,
-    showNonCurrentDates: true,
-
-    datesSet: function(info) {
-        // Clear previous month selections
-        selectedDates = [];
-
-        // Remove background events
-        calendar.removeAllEvents();
-
-        // Recalculate working days for new month
-        updateWorkingDays(info.view.currentStart);
-    },
-
-    dateClick: function(info) {
-
-        let viewMonth = calendar.view.currentStart.getMonth();
-        let clickedMonth = info.date.getMonth();
-
-        if (viewMonth != clickedMonth) return;
-
-        let dateStr = info.dateStr;
-
-        if (selectedDates.includes(dateStr)) {
-            selectedDates = selectedDates.filter(d => d !== dateStr);
-
-            calendar.getEvents().forEach(event => {
-                if (event.startStr == dateStr) event.remove();
-            });
-
-        } else {
-            selectedDates.push(dateStr);
-
-            calendar.addEvent({
-                start: dateStr,
-                display: 'background',
-                color: '#f03f17'
-            });
-        }
-
-        updateWorkingDays(info.date);
-    }
-});
-
-
-    // var calendar = new FullCalendar.Calendar(calendarEl, {
-    //     initialView: 'dayGridMonth',
-    //     height: 600,
-    //     showNonCurrentDates: true,
-
-    //     dateClick: function(info) {
-
-    //         let viewMonth = calendar.view.currentStart.getMonth();
-    //         let clickedMonth = info.date.getMonth();
-
-    //         // let month = info.date.getMonth() + 1; // JS month: 0-11 → 1-12
-    //         // let year = info.date.getFullYear();
-
-    //         if (viewMonth != clickedMonth) {
-    //             return; // Ignore next/prev month dates
-    //         }
-
-    //         let dateStr = info.dateStr;
-
-    //         if (selectedDates.includes(dateStr)) {
-    //             selectedDates = selectedDates.filter(d => d !== dateStr);
-
-    //             calendar.getEvents().forEach(event => {
-    //                 if (event.startStr == dateStr) {
-    //                     event.remove();
-    //                 }
-    //             });
-
-    //         } else {
-    //             selectedDates.push(dateStr);
-
-    //             calendar.addEvent({
-    //                 start: dateStr,
-    //                 display: 'background',
-    //                 color: '#f03f17'
-    //             });
-    //         }
-
-    //         updateWorkingDays(info.date);
-    //     }
-    // });
-
-    // yearSelect.addEventListener('change', function () {
-    //     let year = this.value;
-    //     if (!year) return;
-
-    //     let currentDate = calendar.getDate();
-    //     let newDate = new Date(year, currentDate.getMonth(), 1);
-
-    //     calendar.gotoDate(newDate);
-    // });
-
-    function updateWorkingDays(date) {
-        let totalDays = new Date(
-            date.getFullYear(),
-            date.getMonth()+1,
-            0
-        ).getDate();
-
-        let workingDays = totalDays - selectedDates.length;
-        // document.querySelector('input[name="working_days"]').value = workingDays;
-
-        const input = document.querySelector('#working_days');
-
-        input.value = workingDays;
-
-        input.dispatchEvent(new Event('input'));
-
-        const monthInput = document.querySelector('#month');
-        monthInput.value = date.getMonth() + 1; // 1–12 month number
-        monthInput.dispatchEvent(new Event('input'));
-
-        const yearInput = document.querySelector('#year');
-        yearInput.value = date.getFullYear();
-        yearInput.dispatchEvent(new Event('input'));
-
-        const selectedDatesInput = document.querySelector('#selected_dates');
-        selectedDatesInput.value = selectedDates.join(',');
-        selectedDatesInput.dispatchEvent(new Event('input'));
-
-    }
-
-    calendar.render();
-});
-</script>

resources/views/forms/save.php

@@ -1,9 +0,0 @@
-<div class="flex space-x-2 items-center">
-    <button
-        type="button"
-        class="inline-flex items-center px-3 py-1 bg-primary-600 text-white rounded hover:bg-primary-700"
-        wire:click="saveWorkingDays"
-    >
-        Save
-    </button>
-</div>

resources/views/livewire/production-target-plan.blade.php

@@ -1,85 +0,0 @@
-<div class="p-4">
-    <h2 class="text-lg font-bold mb-4 text-gray-700 uppercase tracking-wider">
-        PRODUCTION PLAN TABLE:
-    </h2>
-    <div class="overflow-x-auto rounded-lg shadow">
-        <table class="w-full divide-y divide-gray-200 text-sm text-center">
-            {{-- <thead class="bg-gray-100 text-s font-semibold uppercase text-gray-700">
-                <tr>
-                    <th class="border px-4 py-2">No</th>
-                    <th class="border px-4 py-2">Created Datetime</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Created By</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Plant</th>
-                    <th class="border px-4 py-2">Line</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Item Code</th>
-                    <th class="border px-4 py-2">Production Plan Dates</th>
-                </tr>
-            </thead> --}}
-            <thead class="bg-gray-100 text-s font-semibold uppercase text-gray-700">
-                <tr>
-                    <th class="border px-4 py-2" rowspan="3">No</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Plant</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Line</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Item Code</th>
-
-                    <th class="border px-4 py-2 whitespace-nowrap" colspan="{{ count($dates) * 2 }}" class="text-center">
-                        Production Plan Dates
-                    </th>
-                </tr>
-                <tr>
-                    @foreach($dates as $date)
-                        <th colspan="2" class="text-center">
-                            {{ $date }}
-                        </th>
-                    @endforeach
-                </tr>
-                <tr>
-                    @foreach($dates as $date)
-                        <th class="border px-4 py-2 whitespace-nowrap">Target Plan</th>
-                        <th class="border px-4 py-2 whitespace-nowrap">Produced Quantity</th>
-                    @endforeach
-                </tr>
-            </thead>
-
-            <tbody class="divide-y divide-gray-100">
-                @forelse ($records as $index => $record)
-                    <tr class="hover:bg-gray-50">
-                            <td class="border px-4 py-2">{{ $index + 1 }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['plant_name'] }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['line_name'] }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['item_code'] }}</td>
-
-                            {{-- @foreach($dates as $date)
-                                <td class="border px-4 py-2 whitespace-nowrap">{{ $record['target_plan'][$date] ?? '-' }}</td>
-                                <td class="border px-4 py-2 whitespace-nowrap">{{ $record['production_plan'][$date] ?? '-' }}</td>
-                            @endforeach --}}
-
-                            @foreach($dates as $date)
-                                @if(in_array($date, $leaveDates))
-                                    <td class="border px-4 py-2 whitespace-nowrap">-</td>
-                                    <td class="border px-4 py-2 whitespace-nowrap">-</td>
-                                @else
-                                    {{-- <td class="border px-4 py-2 whitespace-nowrap">{{ $record['daily_target'] ?? '-' }}</td> --}}
-                                    <td class="border px-4 py-2 whitespace-nowrap">
-                                        {{ $record['daily_target_dynamic'][$date] ?? '-' }}
-                                    </td>
-                                    <td class="border px-4 py-2 whitespace-nowrap">
-                                        {{ $record['produced_quantity'][$date] ?? '-' }}
-                                    </td>
-                                    {{-- <td class="border px-4 py-2 whitespace-nowrap">{{ $record['produced_quantity'] ?? '-' }}</td> --}}
-                                @endif
-                            @endforeach
-                    </tr>
-                @empty
-                    <tr>
-                        <td colspan="9" class="px-4 py-4 text-center text-gray-500">
-                            No production plan data found.
-                        </td>
-                    </tr>
-                @endforelse
-            </tbody>
-        </table>
-    </div>
-</div>
-
-