Update dependency erag/laravel-pwa to v2

Reviewed-on: #752

app/Console/Commands/Scheduler.php

@@ -337,7 +337,7 @@ class Scheduler extends Command
                     }
                     break;
                 case 'Daily':
-                    if (now()->format('H:i') == '11:10') {
+                    if (now()->format('H:i') == '11:30') {
                         try {
                             \Artisan::call('send-import-transit', [
                                 'schedule_type' => $rule->schedule_type,

app/Console/Commands/SendImportTransit.php

@@ -7,6 +7,8 @@ use App\Models\AlertMailRule;
 use App\Models\ImportTransit;
 use App\Models\Plant;
 use Illuminate\Console\Command;
+use Maatwebsite\Excel\Facades\Excel;
+use App\Exports\ImportTransitReportExport;
 
 class SendImportTransit extends Command
 {
@@ -58,37 +60,45 @@ class SendImportTransit extends Command
         //     return;
         // }
 
-        $tableData = ImportTransit::select([
+        // $tableData = ImportTransit::select([
-                'cri_rfq_number',
+        //         'cri_rfq_number',
-                'mail_received_date',
+        //         'mail_received_date',
-                'pricol_ref_number',
+        //         'pricol_ref_number',
-                'requester',
+        //         'requester',
-                'shipper',
+        //         'shipper',
-                'shipper_location',
+        //         'shipper_location',
-                'shipper_invoice',
+        //         'shipper_invoice',
-                'shipper_invoice_date',
+        //         'shipper_invoice_date',
-                'customs_agent_name',
+        //         'customs_agent_name',
-                'eta_date',
+        //         'eta_date',
-                'status',
+        //         'status',
-                'delivery_location',
+        //         'delivery_location',
-                'etd_date',
+        //         'etd_date',
-                'mode',
+        //         'mode',
-                'inco_terms',
+        //         'inco_terms',
-                'port_of_loading',
+        //         'port_of_loading',
-                'port_of_discharge',
+        //         'port_of_discharge',
-                'delivery_city',
+        //         'delivery_city',
-                'packages',
+        //         'packages',
-                'type_of_package',
+        //         'type_of_package',
-                'gross_weight',
+        //         'gross_weight',
-                'volume',
+        //         'volume',
-                'bill_number',
+        //         'bill_number',
-                'bill_received_date',
+        //         'bill_received_date',
-                'vessel_number',
+        //         'vessel_number',
-                'remark',
+        //         'remark',
-                'is_transit_identified',
+        //         'is_transit_identified',
-            ])
+        //     ])
-            ->where('status', '!=', 'Delivered')
+        //     ->where('status', '!=', 'Delivered')
-            ->get();
+        //     ->get();
+
+        $tableData = ImportTransit::where('status', '!=', 'Delivered')->orderByRaw("
+            CAST(
+                regexp_replace(cri_rfq_number, '.*-([0-9]+).*', '\\1')
+                AS INTEGER
+            )
+        ")->get();
+
 
         if ($tableData->isEmpty()) {
             $this->info('No pending Import Transit records found. Mail skipped.');
@@ -101,10 +111,19 @@ class SendImportTransit extends Command
 
             $mailSubject = 'Daily Import Transit Report';
 
+            $fileName = 'reports/pending_import_shipment_' . now()->format('Ymd_His') . '.xlsx';
+
+            Excel::store(
+                new ImportTransitReportExport($tableData),
+                $fileName,
+                'local'
+            );
+
             $mail = new ImportTransitMail(
                 $scheduleType,
                 $tableData,
-                $mailSubject
+                $mailSubject,
+                $fileName
             );
 
             $toEmails = collect(explode(',', $rule->email))

app/Exports/ImportTransitReportExport.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use Illuminate\Support\Facades\Log;
+use Maatwebsite\Excel\Events\AfterSheet;
+
+class ImportTransitReportExport implements FromCollection, WithHeadings, WithMapping, WithEvents
+{
+    protected $data;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'CRI RFQ Number',
+            'Requestor',
+            'Shipper',
+            'Shipper Location',
+            'Shipper Invoice',
+            'Shipper Invoice Date',
+            'Custom Agent Name',
+            'ETA',
+            'Status',
+            'Delivery Location',
+            'ETD Date',
+            'Remark',
+        ];
+    }
+
+    public function collection()
+    {
+        return collect($this->data);
+    }
+
+    public function map($row): array
+    {
+        static $srNo = 0;
+        $srNo++;
+
+        return [
+            $srNo,
+            $row->cri_rfq_number,
+            $row->requester,
+            $row->shipper,
+            $row->shipper_location,
+            $row->shipper_invoice,
+            $row->shipper_invoice_date,
+            $row->customs_agent_name,
+            $row->eta_date,
+            $row->status,
+            $row->delivery_location,
+            $row->etd_date,
+            $row->remark,
+        ];
+    }
+
+    public function registerEvents(): array
+    {
+        
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+
+                $rowNumber = 2; // Excel row starts after header
+
+                foreach ($this->data as $row) {
+
+                    if ((int) $row->is_transit_identified == 1) {
+
+                        $event->sheet
+                            ->getStyle("A{$rowNumber}:M{$rowNumber}")
+                            ->applyFromArray([
+                                'fill' => [
+                                    'fillType' => Fill::FILL_SOLID,
+                                    'startColor' => [
+                                        'rgb' => 'FFFF00',
+                                    ],
+                                ],
+                            ]);
+                    }
+
+                    $rowNumber++;
+                }
+            },
+        ];
+    }
+}

app/Filament/Exports/ImportTransitExporter.php

@@ -36,12 +36,18 @@ class ImportTransitExporter extends Exporter
                 ->label('SHIPPER INVOICE'),
             ExportColumn::make('shipper_invoice_date')
                 ->label('SHIPPER INVOICE DATE'),
+            ExportColumn::make('inv_value')
+                ->label('Inv Value'),
+            ExportColumn::make('freight_charge')
+                ->label('Freight Charge'),
             ExportColumn::make('customs_agent_name')
                 ->label('CUSTOMS AGENT NAME'),
             ExportColumn::make('eta_date')
                 ->label('ETA DATE'),
             ExportColumn::make('status')
                 ->label('STATUS'),
+            ExportColumn::make('insurance_status')
+                ->label('Insurance Status'),
             ExportColumn::make('delivery_location')
                 ->label('DELIVERY LOCATION'),
             ExportColumn::make('etd_date')

app/Filament/Imports/ImportTransitImporter.php

@@ -75,7 +75,7 @@ class ImportTransitImporter extends Importer
                 ->label('Status'),
             ImportColumn::make('insurance_status')
                 ->exampleHeader('Insurance Status')
-                ->example('Receipted')
+                ->example('Yes')
                 ->label('Insurance Status'),
             ImportColumn::make('delivery_location')
                 ->exampleHeader('Delivery Location')
@@ -176,6 +176,7 @@ class ImportTransitImporter extends Importer
 
         return ImportTransit::updateOrCreate([
             'cri_rfq_number' => $criRfqNumber,
+            'shipper_invoice' => $shipperInvoice,
         ],
             [
                 'mail_received_date' => $this->formatDate($mailRecDate),
@@ -187,7 +188,6 @@ class ImportTransitImporter extends Importer
                 'requester' => $requester,
                 'shipper' => $shipper,
                 'shipper_location' => $shipperLocation,
-                'shipper_invoice' => $shipperInvoice,
                 'inv_value' => $invValue,
                 'freight_charge' => $freightCharge,
                 'custom_agent_name' => $customsAgentname,

app/Filament/Imports/MotorTestingMasterImporter.php

@@ -30,9 +30,9 @@ class MotorTestingMasterImporter extends Importer
                 ->rules(['required']),
             ImportColumn::make('subassembly_code')
                 ->requiredMapping()
-                ->exampleHeader('SubAssembly Code')
+                ->exampleHeader('Subassembly Code')
                 ->example(['123456'])
-                ->label('SubAssembly Code')
+                ->label('Subassembly Code')
                 ->rules(['required']),
             ImportColumn::make('isi_model')
                 ->requiredMapping()
@@ -216,18 +216,18 @@ class MotorTestingMasterImporter extends Importer
                 ->label('Plant Code')
                 ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
-            ImportColumn::make('created_by')
+            // ImportColumn::make('created_by')
-                ->requiredMapping()
+            //     ->requiredMapping()
-                ->exampleHeader('Created By')
+            //     ->exampleHeader('Created By')
-                ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
+            //     ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
-                ->label('Created By')
+            //     ->label('Created By')
-                ->rules(['required']),
+            //     ->rules(['required']),
-            ImportColumn::make('updated_by')
+            // ImportColumn::make('updated_by')
-                ->requiredMapping()
+            //     ->requiredMapping()
-                ->exampleHeader('Updated By')
+            //     ->exampleHeader('Updated By')
-                ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
+            //     ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
-                ->label('Updated By')
+            //     ->label('Updated By')
-                ->rules(['required']),
+            //     ->rules(['required']),
         ];
     }
 
@@ -237,7 +237,7 @@ class MotorTestingMasterImporter extends Importer
         $plantCod = trim($this->data['plant']);
         $iCode = trim($this->data['item']);
         $sCode = trim($this->data['subassembly_code']);
-        $isiModel = (trim($this->data['isi_model']) == '1') ? true : false;
+        $isiModel = trim($this->data['isi_model']);
         $phase = trim($this->data['phase']);
         $kw = trim($this->data['kw']);
         $hp = trim($this->data['hp']);
@@ -266,15 +266,15 @@ class MotorTestingMasterImporter extends Importer
         $noloadPowUl = trim($this->data['noload_pow_ul']);
         $noloadSpdLl = trim($this->data['noload_spd_ll']);
         $noloadSpdUl = trim($this->data['noload_spd_ul']);
-        $createdBy = trim($this->data['created_by']);
+        $createdBy = Filament::auth()->user()->name;
-        $updatedBy = trim($this->data['updated_by']);
+        $updatedBy = Filament::auth()->user()->name;
 
         $plant = null;
         if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
             $warnMsg[] = 'Invalid plant code found';
         } elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
             $warnMsg[] = 'Invalid item code found';
-        } elseif (Str::length($sCode) < 6 || ! ctype_alnum($sCode)) {
+        } elseif (Str::length($sCode) > 0 && (Str::length($sCode) < 6 || ! ctype_alnum($sCode))) {
             $warnMsg[] = 'Invalid sub-assembly code found';
         } else {
             $plant = Plant::where('code', $plantCod)->first();
@@ -289,13 +289,8 @@ class MotorTestingMasterImporter extends Importer
             } elseif (! $iCode) {
                 $warnMsg[] = 'Item code not found for choosed plant';
             } else {
-                // if (Str::length($isiModel) <= 0 || $isiModel == "0" || $isiModel == "1") {
+                $isiModel = (Str::length($isiModel) == 1 && ctype_alnum($isiModel) && ($isiModel == '1' || $isiModel == 'Y' || $isiModel == 'y')) ? true : false;
-                //     $warnMsg[] = "Invalid ISI Model found";
+
-                // }
-                // else
-                // {
-                //     $isiModel = ($isiModel == "1");
-                // }
                 if (Str::length($phase) <= 0 || ($phase != 'Single' && $phase != 'Three')) {// !is_string($phase) ||
                     $warnMsg[] = 'Invalid phase found';
                 }
@@ -387,19 +382,8 @@ class MotorTestingMasterImporter extends Importer
                     $created = $oldCode->created_by ? User::where('name', $oldCode->created_by)->first() : null;
                     if (! $created) {
                         $warnMsg[] = 'Created by not found on update';
-                    }
+                    } else {
-                    $updated = User::where('name', $updatedBy)->first();
+                        $createdBy = $created->name;
-                    if (! $updated) {
-                        $warnMsg[] = 'Updated by not found on update';
-                    }
-                } else {
-                    $created = User::where('name', $createdBy)->first();
-                    if (! $created) {
-                        $warnMsg[] = 'Created by not found';
-                    }
-                    $updated = User::where('name', $updatedBy)->first();
-                    if (! $updated) {
-                        $warnMsg[] = 'Updated by not found';
                     }
                 }
             }
@@ -444,8 +428,8 @@ class MotorTestingMasterImporter extends Importer
                 'noload_pow_ul' => $noloadPowUl,
                 'noload_spd_ll' => $noloadSpdLl,
                 'noload_spd_ul' => $noloadSpdUl,
-                'created_by' => $created->name,
+                'created_by' => $createdBy,
-                'updated_by' => $updated->name,
+                'updated_by' => $updatedBy,
             ]
         );
 

app/Filament/Pages/GateOutEntry.php

@@ -4,6 +4,7 @@ namespace App\Filament\Pages;
 
 use App\Models\Plant;
 use App\Models\VisitorEntry;
+use Carbon\Carbon;
 use Filament\Facades\Filament;
 use Filament\Pages\Page;
 use Filament\Forms\Contracts\HasForms;
@@ -37,38 +38,172 @@ class GateOutEntry extends Page implements HasForms
             ->schema([
                 Section::make('') // You can give your section a title or leave it blank
                     ->schema([
-                        TextInput::make('scan_out_gate_pass')
+                        Select::make('scan_out_gate_pass')
+                            ->label('Scan Gate Pass')
+                            ->required()
+                            ->reactive()
+                            ->options([
+                                'In'  => 'In',
+                                'Out' => 'Out',
+                            ]),
+                        TextInput::make('scan_out_gate_pass_in')
+                            ->label('Scan In Gate Pass')
+                            ->required()
+                            ->reactive()
+                            ->visible(fn ($get) => $get('scan_out_gate_pass') == 'In')
+                            ->extraAttributes([
+                                'wire:keydown.enter' => 'processGatePassIn($event.target.value)',
+                            ]),
+                        TextInput::make('scan_out_gate_pass_out')
                             ->label('Scan Out Gate Pass')
                             ->required()
                             ->reactive()
+                            ->visible(fn ($get) => $get('scan_out_gate_pass') == 'Out')
                             ->extraAttributes([
-                                'wire:keydown.enter' => 'processGatePass($event.target.value)',
+                                'wire:keydown.enter' => 'processGatePassOut($event.target.value)',
                             ]),
                     ])
                     ->columns(5)
             ]);
     }
 
-    public function processGatePass($gatePass)
+    public function processGatePassIn($gatePass)
     {
-        $entry = VisitorEntry::where('register_id', $gatePass)->first();
+        $entry = VisitorEntry::where('register_id', $gatePass)->latest()->first();
 
-        if ($entry) {
+        if ($entry)
-            $entry->out_time = now();
+        {
-            $entry->save();
+            if($entry->in_time && !$entry->out_time && (empty($entry->valid_upto) || $entry->valid_upto == '' || $entry->valid_upto == null)){
+                Notification::make()
+                    ->title('Already Entered')
+                    ->body('Gate pass In has already been processed for entry.')
+                    ->warning()
+                    ->send();
+                $this->filters['scan_out_gate_pass_in'] = '';
+                return;
+            }
+            elseif (
+                !empty($entry->valid_upto) &&
+                Carbon::parse($entry->valid_upto)->endOfDay()->gte(now())
+            ){
+                if (empty($entry->out_time)) {
+                    Notification::make()
+                        ->title('Gate In Not Allowed')
+                        ->body("Previous gate-out has not been punched. Please complete gate-out first for ID ' . $gatePass . '.")
+                        ->warning()
+                        ->send();
 
-            Notification::make()
+                    $this->filters['scan_out_gate_pass_in'] = '';
-                ->title('Gate Pass Processed')
+                    return;
-                ->body('Gate pass has been successfully processed. Visitor marked as exited.')
+                }
-                ->success()
+                else{
-                ->send();
+                    $newEntry = $entry->replicate();
-            $this->filters['scan_out_gate_pass'] = '';
+                    $newEntry->in_time = now();
-        } else {
+                    $newEntry->out_time = null;
+
+                    $newEntry->save();
+
+                    Notification::make()
+                        ->title('Gate In')
+                        ->body('Gate in has been successfully processed. Visitor marked as entered.')
+                        ->success()
+                        ->send();
+                    $this->filters['scan_out_gate_pass_in'] = '';
+                }
+            }
+            else{
+                Notification::make()
+                    ->title('Visitor Pass Expired')
+                    ->body('Your visitor pass validity has expired.')
+                    ->danger()
+                    ->send();
+                $this->filters['scan_out_gate_pass_in'] = '';
+                return;
+            }
+        }
+        else
+        {
             Notification::make()
                 ->title('Invalid Gate Pass')
-                ->body('The scanned gate pass is not valid. Please try again.')
+                ->body('Scanned gate in pass is not valid.')
                 ->danger()
                 ->send();
+                return;
+        }
+    }
+
+    public function processGatePassOut($gatePass)
+    {
+        $entry = VisitorEntry::where('register_id', $gatePass)->latest()->first();
+
+        if (!$entry) {
+            Notification::make()
+                ->title('Invalid Gate Pass')
+                ->body('Scanned gate out pass is not valid.')
+                ->danger()
+                ->send();
+            $this->filters['scan_out_gate_pass_out'] = '';
+            return;
+        }
+
+        if (empty($entry->valid_upto) || $entry->valid_upto == '' || $entry->valid_upto == null) {
+
+            if (!empty($entry->out_time)) {
+                Notification::make()
+                    ->title('Already Exited')
+                    ->body('Gate pass has already been processed.')
+                    ->warning()
+                    ->send();
+                    $this->filters['scan_out_gate_pass_out'] = '';
+                    return;
+            }
+            else
+            {
+                $entry->out_time = now();
+                $entry->save();
+
+                Notification::make()
+                    ->title('Gate Pass Processed')
+                    ->body('Visitor marked as exited.')
+                    ->success()
+                    ->send();
+
+                $this->filters['scan_out_gate_pass_out'] = '';
+                return;
+            }
+        }
+        elseif ((empty($entry->valid_upto) || $entry->valid_upto != '' || $entry->valid_upto != null))
+        {
+            if (Carbon::parse($entry->valid_upto)->endOfDay()->lt(now()))
+            {
+                Notification::make()
+                    ->title('Visitor Pass Expired')
+                    ->body('Your visitor pass validity has expired.')
+                    ->danger()
+                    ->send();
+                $this->filters['scan_out_gate_pass_out'] = '';
+                return;
+            }
+            if (!empty($entry->out_time)) {
+                Notification::make()
+                    ->title('Already Exited')
+                    ->body('Gate pass has already been processed.')
+                    ->warning()
+                    ->send();
+                    $this->filters['scan_out_gate_pass_out'] = '';
+                    return;
+            }
+            else{
+                $entry->out_time = now();
+                $entry->save();
+
+                Notification::make()
+                    ->title('Gate Out')
+                    ->body('Visitor marked as exited.')
+                    ->success()
+                    ->send();
+                $this->filters['scan_out_gate_pass_out'] = '';
+            }
         }
     }
 

app/Filament/Resources/AsrsItemValidationResource.php

@@ -285,27 +285,27 @@ class AsrsItemValidationResource extends Resource
 
                         $status = $data['status'] ?? 'NotUpdated';
                         // Hide all records initially if no filters are applied
-                        // if (empty($data['Plant']) && empty($data['item_code']) && empty($data['status']) && empty($data['created_from']) && empty($data['created_to'])) {
+                        if (empty($data['Plant']) && empty($data['item_code']) && empty($data['uom']) && empty($data['status']) && empty($data['created_from']) && empty($data['created_to'])) {
-                        //     // return $query->whereRaw('1 = 0');
+                            return $query->whereRaw('1 = 0');
-                        //     $query->where('status', 'NotUpdated');
-                        // }
-
-                        if (
-                            empty($data['Plant']) &&
-                            empty($data['item_code']) &&
-                            empty($data['uom']) &&
-                            empty($data['status']) &&
-                            empty($data['created_from']) &&
-                            empty($data['created_to'])
-                        ) {
                             // $query->where('status', 'NotUpdated');
-                            $query->where(function ($q) {
-                                $q->where('status', 'NotUpdated')
-                                ->orWhereNull('status')
-                                ->orWhere('status', '');
-                            });
                         }
 
+                        // if (
+                        //     empty($data['Plant']) &&
+                        //     empty($data['item_code']) &&
+                        //     empty($data['uom']) &&
+                        //     empty($data['status']) &&
+                        //     empty($data['created_from']) &&
+                        //     empty($data['created_to'])
+                        // ) {
+                        //     // $query->where('status', 'NotUpdated');
+                        //     $query->where(function ($q) {
+                        //         $q->where('status', 'NotUpdated')
+                        //         ->orWhereNull('status')
+                        //         ->orWhere('status', '');
+                        //     });
+                        // }
+
                         if (! empty($data['Plant'])) {
                             $query->where('plant_id', $data['Plant']);
                         }
@@ -387,11 +387,12 @@ class AsrsItemValidationResource extends Resource
                 Tables\Actions\ViewAction::make(),
                 Tables\Actions\EditAction::make(),
                 // ->hidden(function ($record): bool {
-                //     if (auth()->user()?->hasRole('SuperAdmin')) {
+                //     if (auth()->user()?->hasRole('Super Admin')) {
                 //         return false;
                 //     }
-
+                //     else{
-                //     return trim(strtolower($record->status)) == 'updated';
+                //         return trim(($record->status)) == 'Updated';
+                //     }
                 // }),
                 // ->visible(function ($record): bool {
                 //     return auth()->user()?->hasRole('SuperAdmin')

app/Filament/Resources/ImportTransitResource.php

@@ -40,16 +40,16 @@ class ImportTransitResource extends Resource
             ->schema([
                 Forms\Components\TextInput::make('cri_rfq_number')
                     ->label('CRI/RFQ Number')
-                    ->disabled(fn ($operation) => $operation == 'edit')
+                    ->required()
-                    ->unique(ignoreRecord: true),
+                    ->disabled(fn ($operation) => $operation == 'edit'),
                 Forms\Components\DatePicker::make('mail_received_date')
                     ->label('Mail Received Date')
                     ->required(),
-                Forms\Components\TextInput::make('pricol_ref_number')
+                // Forms\Components\TextInput::make('pricol_ref_number')
-                    ->label('Pricol Ref Number')
+                //     ->label('Ref Number')
-                    ->afterStateUpdated(function (callable $set) {
+                //     ->afterStateUpdated(function (callable $set) {
-                        $set('updated_by', Filament::auth()->user()?->name);
+                //         $set('updated_by', Filament::auth()->user()?->name);
-                    }),
+                //     }),
                 Forms\Components\TextInput::make('requester')
                     ->label('Requester')
                     ->afterStateUpdated(function (callable $set) {
@@ -75,7 +75,7 @@ class ImportTransitResource extends Resource
                     ->afterStateUpdated(function (callable $set) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
-                Forms\Components\DatePicker::make('inv_value')
+                Forms\Components\TextInput::make('inv_value')
                     ->label('Inv Value')
                     ->afterStateUpdated(function (callable $set) {
                         $set('updated_by', Filament::auth()->user()?->name);
@@ -220,128 +220,158 @@ class ImportTransitResource extends Resource
                     }),
                 Tables\Columns\TextColumn::make('cri_rfq_number')
                     ->label('CRI/RFQ Number')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('mail_received_date')
                     ->label('Mail Received Date')
+                    ->searchable()
                     ->date()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('pricol_ref_number')
-                    ->label('Pricol Ref Number')
+                    ->label('Ref Number')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('requester')
                     ->label('Requester')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('shipper')
                     ->label('Shipper')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('shipper_location')
                     ->label('Shipper Location')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('shipper_invoice')
                     ->label('Shipper Invoice')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('shipper_invoice_date')
                     ->label('Shipper Invoice Date')
+                    ->searchable()
                     ->date()
                     ->formatStateUsing(fn ($state) => $state?->format('Y-m-d'))
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('inv_value')
                     ->label('Inv Value')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('freight_charge')
                     ->label('Freight Charge')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('customs_agent_name')
                     ->label('Customs Agent Name')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('eta_date')
                     ->label('ETA Date')
+                    ->searchable()
                     ->date()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('status')
                     ->label('Status')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('insurance_status')
                     ->label('Insurance Status')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('delivery_location')
                     ->label('Delivery Location')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('etd_date')
                     ->label('ETD Date')
+                    ->searchable()
                     ->date()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('mode')
                     ->label('Mode')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('inco_terms')
                     ->label('Inco Terms')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('port_of_loading')
                     ->label('Port of Loading')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('port_of_discharge')
                     ->label('Port of Discharge')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('delivery_city')
                     ->label('Delivery City')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('packages')
                     ->label('Packages')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('type_of_package')
                     ->label('Type of Package')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('gross_weight')
                     ->label('Gross Weight')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('volume')
                     ->label('Volume')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('bill_number')
                     ->label('Bill Number')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('bill_received_date')
                     ->label('Bill Received Date')
+                    ->searchable()
                     ->alignCenter()
                     ->date()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('vessel_number')
                     ->label('Vessel Number')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('remark')
                     ->label('Remark')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('is_transit_identified')
                     ->label('Is Transit Identified')
+                    ->searchable()
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('created_at')

app/Filament/Resources/MachineResource.php

@@ -75,7 +75,7 @@ class MachineResource extends Resource
                             ->hintColor('danger'),
                         Forms\Components\Select::make('line_id')
                             ->label('Line Name')
-                            ->relationship('line', 'name')
+                            // ->relationship('line', 'name')
                             ->searchable()
                             ->required()
                             ->columnSpan(1)
@@ -116,7 +116,7 @@ class MachineResource extends Resource
                             ->hintColor('danger'),
                         Forms\Components\Select::make('work_group_master_id')
                             ->label('Group Work Center')
-                            ->relationship('workGroupMaster', 'name')
+                            // ->relationship('workGroupMaster', 'name')
                             ->searchable()
                             ->required()
                             ->columnSpan(1)

app/Filament/Resources/MotorTestingMasterResource.php

@@ -119,7 +119,7 @@ class MotorTestingMasterResource extends Resource
                 Forms\Components\TextInput::make('subassembly_code')
                     ->label('Subassembly Code')
                     // ->required()
-                    ->placeholder('Scan the valid code')
+                    ->placeholder('Scan the subassembly code')
                     ->reactive()
                     ->alphaNum()
                     ->minLength(6)
@@ -195,42 +195,49 @@ class MotorTestingMasterResource extends Resource
                     ->reactive(),
                 Forms\Components\TextInput::make('hp')
                     ->label('HP')
+                    ->placeholder('Scan the HP')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('kw')
                     ->label('KW')
+                    ->placeholder('Scan the KW')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('volt')
                     ->label('Volt')
+                    ->placeholder('Scan the volt')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('current')
                     ->label('Current')
+                    ->placeholder('Scan the current')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('rpm')
                     ->label('RPM')
+                    ->placeholder('Scan the RPM')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('torque')
                     ->label('Torque')
+                    ->placeholder('Scan the torque')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('frequency')
                     ->label('Frequency')
+                    ->placeholder('Scan the frequency')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
@@ -265,12 +272,14 @@ class MotorTestingMasterResource extends Resource
                     ->reactive(),
                 Forms\Components\TextInput::make('ins_res_limit')
                     ->label('Insulation Resistance Limit')
+                    ->placeholder('Scan the insulation resistance limit')
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     })
                     ->required(),
                 Forms\Components\Select::make('ins_res_type')
                     ->label('Insulation Resistance Type')
+                    ->placeholder('Scan the insulation resistance type')
                     ->default('O')
                     ->selectablePlaceholder(false)
                     ->options(function (callable $get) {
@@ -294,96 +303,112 @@ class MotorTestingMasterResource extends Resource
                     }),
                 Forms\Components\TextInput::make('res_ry_ll')
                     ->label('Resistance RY LL')
+                    ->placeholder('Scan the resistance RY LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('res_ry_ul')
                     ->label('Resistance RY UL')
+                    ->placeholder('Scan the resistance RY UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('res_yb_ll')
                     ->label('Resistance YB LL')
+                    ->placeholder('Scan the resistance YB LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('res_yb_ul')
                     ->label('Resistance YB UL')
+                    ->placeholder('Scan the resistance YB UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('res_br_ll')
                     ->label('Resistance BR LL')
+                    ->placeholder('Scan the resistance BR LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('res_br_ul')
                     ->label('Resistance BR UL')
+                    ->placeholder('Scan the resistance BR UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('lock_volt_limit')
                     ->label('Lock Volt Limit')
+                    ->placeholder('Scan the lock volt limit')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('leak_cur_limit')
                     ->label('Leakage Current Limit')
+                    ->placeholder('Scan the leakage current limit')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('lock_cur_ll')
                     ->label('Lock Current LL')
+                    ->placeholder('Scan the lock current LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('lock_cur_ul')
                     ->label('Lock Current UL')
+                    ->placeholder('Scan the lock current UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_cur_ll')
                     ->label('No Load Current LL')
+                    ->placeholder('Scan the no load current LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_cur_ul')
                     ->label('No Load Current UL')
+                    ->placeholder('Scan the no load current UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_pow_ll')
                     ->label('No Load Power LL')
+                    ->placeholder('Scan the no load power LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_pow_ul')
                     ->label('No Load Power UL')
+                    ->placeholder('Scan the no load power UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_spd_ll')
                     ->label('No Load Speed LL')
+                    ->placeholder('Scan the no load speed LL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('noload_spd_ul')
                     ->label('No Load Speed UL')
+                    ->placeholder('Scan the no load speed UL')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
@@ -420,6 +445,7 @@ class MotorTestingMasterResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('item.category')
                     ->label('Category')
+                    ->default('-')
                     ->searchable()
                     ->alignCenter()
                     ->sortable(),
@@ -430,6 +456,7 @@ class MotorTestingMasterResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('subassembly_code')
                     ->label('Subassembly Code')
+                    ->default('-')
                     ->searchable()
                     ->alignCenter()
                     ->sortable(),
@@ -593,17 +620,34 @@ class MotorTestingMasterResource extends Resource
                             ->options(function (callable $get) {
                                 $pId = $get('Plant');
 
-                                return Item::whereHas('motorTestingMasters', function ($query) use ($pId) {
+                                if (! $pId) {
-                                    if ($pId) {
+                                    return [];
-                                        $query->where('plant_id', $pId);
+                                } else {
-                                    }
+                                    return Item::whereHas('motorTestingMasters', function ($query) use ($pId) {
-                                })->pluck('code', 'id');
+                                        if ($pId) {
+                                            $query->where('plant_id', $pId);
+                                        }
+                                    })->pluck('code', 'id');
+                                }
+                            })
+                            ->searchable()
+                            ->reactive(),
+                        Select::make('subassembly_code')
+                            ->label('Search by Subassembly Code')
+                            ->nullable()
+                            ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                if (! $plantId) {
+                                    return [];
+                                } else {
+                                    return MotorTestingMaster::where('plant_id', $plantId)->whereNotNull('subassembly_code')->select('subassembly_code')->distinct()->pluck('subassembly_code', 'subassembly_code');
+                                }
                             })
                             ->searchable()
                             ->reactive(),
                         TextInput::make('description')
-                            ->label('Description')
+                            ->label('Model')
-                            ->placeholder('Enter Description'),
+                            ->placeholder('Enter Model'),
                         Radio::make('isi_type')
                             ->label('ISI Model ?')
                             ->boolean()
@@ -714,7 +758,7 @@ class MotorTestingMasterResource extends Resource
                     ])
                     ->query(function ($query, array $data) {
                         // Hide all records initially if no filters are applied
-                        if (empty($data['Plant']) && empty($data['Item']) && empty($data['description']) && empty($data['isi_type']) && empty($data['phase_type']) && empty($data['connection_type']) && empty($data['created_by']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['updated_by']) && empty($data['updated_from']) && empty($data['updated_to'])) {// || $data['isi_type'] == 'All')
+                        if (empty($data['Plant']) && empty($data['Item']) && empty($data['subassembly_code']) && empty($data['description']) && empty($data['isi_type']) && empty($data['phase_type']) && empty($data['connection_type']) && empty($data['created_by']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['updated_by']) && empty($data['updated_from']) && empty($data['updated_to'])) {// || $data['isi_type'] == 'All')
                             return $query->whereRaw('1 = 0');
                         }
 
@@ -738,6 +782,10 @@ class MotorTestingMasterResource extends Resource
                             }
                         }
 
+                        if (! empty($data['subassembly_code'])) {
+                            $query->where('subassembly_code', $data['subassembly_code']);
+                        }
+
                         if (! empty($data['description'])) {
                             $pId = $data['Plant'] ?? null;
                             $descIds = Item::where('description', 'like', '%'.$data['description'].'%')->whereHas('motorTestingMasters', function ($query) use ($pId) {
@@ -807,8 +855,12 @@ class MotorTestingMasterResource extends Resource
                             $indicators[] = 'Item Codes: '.$itemCode;
                         }
 
+                        if (! empty($data['subassembly_code'])) {
+                            $indicators[] = 'Subassembly Code: '.$data['subassembly_code'];
+                        }
+
                         if (! empty($data['description'])) {
-                            $indicators[] = 'Description: '.$data['description'];
+                            $indicators[] = 'Model: '.$data['description'];
                         }
 
                         if ($data['isi_type'] == 'Y') {

app/Filament/Resources/QualityValidationResource.php

@@ -3507,6 +3507,17 @@ class QualityValidationResource extends Resource
                             return;
                         }
 
+
+                        if (strpos($state, '|') !== false) {
+                            $state = explode('|', $state)[0];
+                            if ($state != $expectedValue){
+                                $set('part_validation1_error', 'Invalid input for part validation 1.');
+                            }
+                            else{
+                                $set('part_validation1', $state);
+                                $set('part_validation1_error', null);
+                            }
+                        }
                         if ($state == $expectedValue) {
                             $set('part_validation1_error', null);
                         } else {

app/Filament/Resources/TestingPanelReadingResource.php

@@ -14,6 +14,7 @@ use App\Models\MotorTestingMaster;
 use App\Models\Plant;
 use App\Models\TestingPanelReading;
 use Barryvdh\DomPDF\Facade\Pdf;
+use Closure;
 // use Barryvdh\Reflection\DocBlock\Type\Collection;
 use Filament\Facades\Filament;
 use Filament\Forms;
@@ -36,6 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Response;
 // use Barryvdh\Snappy\Facades\SnappyPdf as PDF;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 // use App\Exports\TestingPanelReadingExport;
 use PhpOffice\PhpSpreadsheet\IOFactory; // For loading Excel file
@@ -95,7 +97,7 @@ class TestingPanelReadingResource extends Resource
                     ->hintColor('danger'),
                 Forms\Components\Select::make('line_id')
                     ->label('Line Name')
-                    ->relationship('line', 'name')
+                    // ->relationship('line', 'name')
                     ->searchable()
                     ->options(function (callable $get) {
                         $plantId = $get('plant_id');
@@ -115,11 +117,12 @@ class TestingPanelReadingResource extends Resource
                     ->reactive()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('motor_testing_master_id', null);
+                        $set('machine_id', null);
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\Select::make('machine_id')
                     ->label('Work Center')
-                    ->relationship('machine', 'work_center')
+                    // ->relationship('machine', 'work_center')
                     ->searchable()
                     ->options(function (callable $get) {
                         $lineId = $get('line_id');
@@ -183,17 +186,92 @@ class TestingPanelReadingResource extends Resource
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
+                    })
+                    ->rule(function (callable $get) {
+                        return function (string $attribute, $value, Closure $fail) use ($get) {
+
+                            $plantId = $get('plant_id');
+                            $lineId = $get('line_id');
+                            $machineId = $get('machine_id');
+                            $itemId = $get('motor_testing_master_id');
+                            $output = trim($value);
+                            // $currentId = $get('id'); // current editing record id
+
+                            if (! $plantId || ! $lineId || ! $machineId || ! $itemId) {
+                                return;
+                            }
+
+                            if ($output == null || $output == '' || ! $output) {
+                                $fail("Output can't be empty!"); // Output1 - Output99
+                            } elseif (Str::length($output) < 7) {
+                                $fail('Output must be at least 7 characters long!');
+                            } elseif (Str::length($output) > 8) {
+                                $fail('Output must be at most 8 characters long!');
+                            } elseif (! ctype_alnum($output)) {
+                                $fail('Output should contain only alpha-numeric values!');
+                            } elseif (! preg_match('/^Output([1-9]|[1-9][0-9])$/', $output)) {
+                                $fail("Output should be between 'Output1' and 'Output99'!");
+                            }
+                        };
                     }),
                 Forms\Components\TextInput::make('serial_number')
                     ->label('Serial Number')
                     ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
+                    })
+                    ->rule(function (callable $get) {
+                        return function (string $attribute, $value, Closure $fail) use ($get) {
+
+                            $plantId = $get('plant_id');
+                            $lineId = $get('line_id');
+                            $machineId = $get('machine_id');
+                            $itemId = $get('motor_testing_master_id');
+                            $serialNumber = trim($value);
+                            // $currentId = $get('id'); // current editing record id
+
+                            if (! $plantId || ! $lineId || ! $machineId || ! $itemId) {
+                                return;
+                            }
+
+                            if ($serialNumber == null || $serialNumber == '' || ! $serialNumber) {
+                                $fail("Serial number can't be empty!");
+                            } elseif (Str::length($serialNumber) < 9) {
+                                $fail('Serial number should contain minimum 9 digits!');
+                            } elseif (! ctype_alnum($serialNumber)) {
+                                $fail('Serial number should contain only alpha-numeric values!');
+                            } elseif (! preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $serialNumber)) {
+                                $fail("Serial number should not begin with '0' or letter!");
+                            }
+                        };
                     }),
                 Forms\Components\TextInput::make('winded_serial_number')
                     ->label('Winded Serial Number')
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
+                    })
+                    ->rule(function (callable $get) {
+                        return function (string $attribute, $value, Closure $fail) use ($get) {
+
+                            $plantId = $get('plant_id');
+                            $lineId = $get('line_id');
+                            $machineId = $get('machine_id');
+                            $itemId = $get('motor_testing_master_id');
+                            $serialNumber = trim($value);
+                            // $currentId = $get('id'); // current editing record id
+
+                            if (! $plantId || ! $lineId || ! $machineId || ! $itemId || ! $serialNumber) {
+                                return;
+                            }
+
+                            if (Str::length($serialNumber) > 0 && Str::length($serialNumber) < 9) {
+                                $fail('Winded serial number should contain minimum 9 digits!');
+                            } elseif (! ctype_alnum($serialNumber)) {
+                                $fail('Winded serial number should contain only alpha-numeric values!');
+                            } elseif (! preg_match('/^[1-9][a-zA-Z0-9]{8,}$/', $serialNumber)) {
+                                $fail("Winded serial number should not begin with '0' or letter!");
+                            }
+                        };
                     }),
                 Forms\Components\TextInput::make('before_fr_volt')
                     ->label('Before FR Volt')
@@ -350,24 +428,40 @@ class TestingPanelReadingResource extends Resource
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
-                Forms\Components\TextInput::make('hv_test')
+                Forms\Components\Select::make('hv_test')
                     ->label('High Voltage Test')
+                    ->options([
+                        'With Stood' => 'With Stood',
+                        'Not With Stood' => 'Not With Stood',
+                    ])
+                    ->selectablePlaceholder(false)
+                    ->default('Not With Stood')
+                    ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('batch_number')
                     ->label('Batch Number')
+                    ->readOnly(fn (callable $get) => ! $get('id'))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('batch_count')
                     ->label('Batch Count')
                     ->default('0')
+                    ->readOnly(fn (callable $get) => ! $get('id'))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
-                Forms\Components\TextInput::make('result')
+                Forms\Components\Select::make('result')
                     ->label('Result')
+                    ->options([
+                        'PASS' => 'PASS', // Not With Stood
+                        'FAIL' => 'FAIL',
+                    ])
+                    ->selectablePlaceholder(false)
+                    ->default('FAIL')
+                    ->required()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
@@ -379,27 +473,28 @@ class TestingPanelReadingResource extends Resource
                 Forms\Components\TextInput::make('rework_count')
                     ->label('Rework Count')
                     ->default('0')
+                    ->readOnly(fn (callable $get) => ! $get('id'))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('update_count')
                     ->label('Update Count')
                     ->default('0')
+                    ->readOnly(fn (callable $get) => ! $get('id'))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
                 Forms\Components\TextInput::make('output_flag')
                     ->label('Output Flag')
                     ->default('0')
+                    ->readOnly(fn (callable $get) => ! $get('id'))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
-                Forms\Components\TextInput::make('tested_by')
+                Forms\Components\Hidden::make('tested_by')
-                    ->label('Tested By')
                     ->default(fn () => Filament::auth()->user()?->name)
                     ->required(),
-                Forms\Components\TextInput::make('updated_by')
+                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
                     ->default(fn () => Filament::auth()->user()?->name)
                     ->required(),
                 Forms\Components\TextInput::make('id')
@@ -665,6 +760,24 @@ class TestingPanelReadingResource extends Resource
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                 $set('item_code', null);
                             }),
+                        Select::make('machine_name')
+                            ->label('Search by Work Center')
+                            ->searchable()
+                            ->nullable()
+                            ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                $lineId = $get('Line');
+
+                                if (! $plantId || ! $lineId) {
+                                    return [];
+                                }
+
+                                return Machine::where('plant_id', $plantId)
+                                    ->where('line_id', $lineId)
+                                    ->pluck('work_center', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive(),
                         Select::make('item_code')
                             ->label('Search by Item Code')
                             ->searchable()
@@ -687,30 +800,37 @@ class TestingPanelReadingResource extends Resource
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                 $set('item_description', null);
                             }),
-                        Select::make('machine_name')
-                            ->label('Search by Work Center')
-                            ->searchable()
-                            ->nullable()
-                            ->options(function (callable $get) {
-                                $plantId = $get('Plant');
-                                $lineId = $get('Line');
-
-                                if (! $plantId || ! $lineId) {
-                                    return [];
-                                }
-
-                                return Machine::where('plant_id', $plantId)
-                                    ->where('line_id', $lineId)
-                                    ->pluck('work_center', 'id')
-                                    ->toArray();
-                            })
-                            ->reactive(),
                         TextInput::make('serial_number')
                             ->label('Serial Number')
                             ->reactive()
                             ->placeholder('Enter Serial Number'),
+                        Select::make('subassembly_code')
+                            ->label('Search by Subassembly Code')
+                            ->searchable()
+                            ->nullable()
+                            ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                if ($plantId) {
+                                    return MotorTestingMaster::whereHas('testingPanelReadings', function ($query) {
+                                        $query->whereNotNull('id');
+                                    })->orderBy('subassembly_code')->pluck('subassembly_code', 'id');
+                                } else {
+                                    return [];
+                                    // return Item::whereHas('motorTestingMasters')
+                                    //     ->pluck('code', 'id')
+                                    //     ->toArray();
+                                }
+                            })
+                            ->reactive()
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                $set('item_description', null);
+                            }),
+                        TextInput::make('winded_serial_number')
+                            ->label('Winded Serial Number')
+                            ->reactive()
+                            ->placeholder('Enter Winded Serial Number'),
                         Select::make('item_description')
-                            ->label('Model')
+                            ->label('Search by Model')
                             ->searchable()
                             ->options(function (callable $get) {
                                 $plantId = $get('Plant');
@@ -739,13 +859,12 @@ class TestingPanelReadingResource extends Resource
                                 $set('item_code', null);
                             }),
                         Select::make('output')
-                            ->label('Output')
+                            ->label('Search by Output')
                             ->searchable()
                             ->options(function () {
-                                return TestingPanelReading::query()
+                                return TestingPanelReading::whereNotNull('output')
                                     ->select('output')
                                     ->distinct()
-                                    ->whereNotNull('output')
                                     ->orderBy('output')
                                     ->pluck('output', 'output') // key and label are both the output value
                                     ->toArray();
@@ -781,6 +900,7 @@ class TestingPanelReadingResource extends Resource
                         //     })
                         //     ->reactive(),
                         // ...
+
                         Select::make('connection')
                             ->label('Connection')
                             ->required()
@@ -805,13 +925,14 @@ class TestingPanelReadingResource extends Resource
                         // ..
                         TextInput::make('remark')
                             ->label('Remark')
-                            ->reactive(),
+                            ->reactive()
+                            ->placeholder(placeholder: 'Enter Remark'),
                         TextInput::make('batch_number')
                             ->label('Batch Number')
                             ->reactive()
                             ->placeholder(placeholder: 'Enter Batch Number'),
                         Select::make('result')
-                            ->label('Result')
+                            ->label('Search by Result')
                             ->searchable()
                             ->options(function () {
                                 return TestingPanelReading::query()
@@ -823,7 +944,19 @@ class TestingPanelReadingResource extends Resource
                                     ->toArray();
                             })
                             ->reactive(),
-
+                        Select::make('tested_by')
+                            ->label('Tested By')
+                            ->nullable()
+                            ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                if (! $plantId) {
+                                    return TestingPanelReading::whereNotNull('tested_by')->select('tested_by')->distinct()->pluck('tested_by', 'tested_by');
+                                } else {
+                                    return TestingPanelReading::where('plant_id', $plantId)->whereNotNull('tested_by')->select('tested_by')->distinct()->pluck('tested_by', 'tested_by');
+                                }
+                            })
+                            ->searchable()
+                            ->reactive(),
                         DateTimePicker::make(name: 'created_from')
                             ->label('Created From')
                             ->placeholder(placeholder: 'Select From DateTime')
@@ -834,12 +967,35 @@ class TestingPanelReadingResource extends Resource
                             ->placeholder(placeholder: 'Select To DateTime')
                             ->reactive()
                             ->native(false),
+                        Select::make('updated_by')
+                            ->label('Updated By')
+                            ->nullable()
+                            ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+                                if (! $plantId) {
+                                    return TestingPanelReading::whereNotNull('updated_by')->select('updated_by')->distinct()->pluck('updated_by', 'updated_by');
+                                } else {
+                                    return TestingPanelReading::where('plant_id', $plantId)->whereNotNull('updated_by')->select('updated_by')->distinct()->pluck('updated_by', 'updated_by');
+                                }
+                            })
+                            ->searchable()
+                            ->reactive(),
+                        DateTimePicker::make(name: 'updated_from')
+                            ->label('Updated From')
+                            ->placeholder(placeholder: 'Select From DateTime')
+                            ->reactive()
+                            ->native(false),
+                        DateTimePicker::make('updated_to')
+                            ->label('Updated To')
+                            ->placeholder(placeholder: 'Select To DateTime')
+                            ->reactive()
+                            ->native(false),
                     ])
                     ->query(function ($query, array $data) {
 
                         // dd($data);
                         // Hide all records initially if no filters are applied
-                        if (empty($data['Plant']) && empty($data['Line']) && empty($data['item_code']) && empty($data['machine_name']) && empty($data['item_description']) && empty($data['serial_number']) && empty($data['output']) && empty($data['phase']) && empty($data['connection']) && empty($data['remark']) && empty($data['batch_no']) && empty($data['result']) && empty($data['created_from']) && empty($data['created_to'])) {
+                        if (empty($data['Plant']) && empty($data['Line']) && empty($data['item_code']) && empty($data['subassembly_code']) && empty($data['machine_name']) && empty($data['item_description']) && empty($data['serial_number']) && empty($data['winded_serial_number']) && empty($data['output']) && empty($data['phase']) && empty($data['connection']) && empty($data['remark']) && empty($data['batch_no']) && empty($data['result']) && empty($data['tested_by']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['updated_by']) && empty($data['updated_from']) && empty($data['updated_to'])) {
                             return $query->whereRaw('1 = 0');
                         }
 
@@ -868,12 +1024,20 @@ class TestingPanelReadingResource extends Resource
                             });
                         }
 
+                        if (! empty($data['subassembly_code'])) {
+                            $query->where('motor_testing_master_id', $data['subassembly_code']);
+                        }
+
                         if (! empty($data['machine_name'])) {
                             $query->where('machine_id', $data['machine_name']);
                         }
 
                         if (! empty($data['serial_number'])) {
-                            $query->where('serial_number', $data['serial_number']);
+                            $query->where('serial_number', 'like', '%'.$data['serial_number'].'%');
+                        }
+
+                        if (! empty($data['winded_serial_number'])) {
+                            $query->where('winded_serial_number', 'like', '%'.$data['winded_serial_number'].'%');
                         }
 
                         if (! empty($data['item_description'])) {
@@ -919,11 +1083,11 @@ class TestingPanelReadingResource extends Resource
                         }
 
                         if (! empty($data['remark'])) {
-                            $query->where('remark', $data['remark']);
+                            $query->where('remark', 'like', '%'.$data['remark'].'%');
                         }
 
                         if (! empty($data['batch_number'])) {
-                            $query->where('batch_number', $data['batch_number']);
+                            $query->where('batch_number', 'like', '%'.$data['batch_number'].'%');
                         }
 
                         if (! empty($data['result'])) {
@@ -937,6 +1101,22 @@ class TestingPanelReadingResource extends Resource
                         if (! empty($data['created_to'])) {
                             $query->where('created_at', '<=', $data['created_to']);
                         }
+
+                        if (! empty($data['tested_by'])) {
+                            $query->where('tested_by', $data['tested_by']);
+                        }
+
+                        if (! empty($data['updated_from'])) {
+                            $query->where('updated_at', '>=', $data['updated_from']);
+                        }
+
+                        if (! empty($data['updated_to'])) {
+                            $query->where('updated_at', '<=', $data['updated_to']);
+                        }
+
+                        if (! empty($data['updated_by'])) {
+                            $query->where('updated_by', $data['updated_by']);
+                        }
                     })
                     ->indicateUsing(function (array $data) {
                         $indicators = [];
@@ -953,11 +1133,14 @@ class TestingPanelReadingResource extends Resource
                         if (! empty($data['Line'])) {
                             $indicators[] = 'Line Name: '.Line::where('id', $data['Line'])->value('name');
                         }
+                        if (! empty($data['machine_name'])) {
+                            $indicators[] = 'Work Center: '.Machine::where('id', $data['machine_name'])->value('work_center');
+                        }
                         if (! empty($data['item_code'])) {
                             $indicators[] = 'Item Code: '.Item::where('id', $data['item_code'])->value('code');
                         }
-                        if (! empty($data['machine_name'])) {
+                        if (! empty($data['subassembly_code'])) {
-                            $indicators[] = 'Work Center: '.Machine::where('id', $data['machine_name'])->value('work_center');
+                            $indicators[] = 'Subassembly Code: '.MotorTestingMaster::where('id', $data['subassembly_code'])->value('subassembly_code');
                         }
                         if (! empty($data['output'])) {
                             $indicators[] = 'Output: '.$data['output'];
@@ -986,6 +1169,10 @@ class TestingPanelReadingResource extends Resource
                             $indicators[] = 'Serial Number: '.$data['serial_number'];
                         }
 
+                        if (! empty($data['tested_by'])) {
+                            $indicators[] = 'Tested By: '.$data['tested_by'];
+                        }
+
                         if (! empty($data['created_from'])) {
                             $indicators[] = 'From: '.$data['created_from'];
                         }
@@ -994,6 +1181,18 @@ class TestingPanelReadingResource extends Resource
                             $indicators[] = 'To: '.$data['created_to'];
                         }
 
+                        if (! empty($data['updated_by'])) {
+                            $indicators[] = 'Updated By: '.$data['updated_by'];
+                        }
+
+                        if (! empty($data['updated_from'])) {
+                            $indicators[] = 'Updated From: '.$data['updated_from'];
+                        }
+
+                        if (! empty($data['updated_to'])) {
+                            $indicators[] = 'Updated To: '.$data['updated_to'];
+                        }
+
                         return $indicators;
                     }),
             ])

app/Filament/Resources/VisitorEntryResource.php

@@ -118,8 +118,10 @@ class VisitorEntryResource extends Resource
                     ->label('Employee Department')
                     ->options(
                         EmployeeMaster::distinct()
+                            ->orderBy('department')
                             ->pluck('department', 'department')
                     )
+                    ->searchable()
                     ->required()
                     ->reactive()
                     ->afterStateUpdated(function (callable $set) {
@@ -156,6 +158,11 @@ class VisitorEntryResource extends Resource
                     ->searchable()
                     ->options(function (callable $get) {
                         $department = $get('department');
+
+                        if (!$department) {
+                            return [];
+                        }
+
                         // Always load ALL employees, filter by department if set
                         if ($department) {
                             return EmployeeMaster::where('department', $department)
@@ -180,6 +187,15 @@ class VisitorEntryResource extends Resource
                     ->numeric()
                     ->default(1)
                     ->required(),
+                Forms\Components\Select::make('mode_of_travel')
+                    ->label('Mode of Travel')
+                    ->options([
+                        'Rental' => 'Rental',
+                        'Car' => 'Car',
+                        'Bike' => 'Bike',
+                    ])
+                    ->reactive()
+                    ->placeholder('Select Mode of Travel'),
                 Forms\Components\DateTimePicker::make('in_time')
                     ->label('In Time')
                     ->required()
@@ -207,6 +223,7 @@ class VisitorEntryResource extends Resource
     public static function table(Table $table): Table
     {
         return $table
+            // ->modifyQueryUsing(fn (Builder $query) => $query->whereDate('created_at', today()))
             ->columns([
                 Tables\Columns\TextColumn::make('No.')
                     ->label('NO')
@@ -237,15 +254,25 @@ class VisitorEntryResource extends Resource
                     ->alignCenter()
                     ->searchable()
                     ->sortable(),
+                Tables\Columns\TextColumn::make('mobile_number')
+                    ->label('Visitor Mobile Number')
+                    ->alignCenter()
+                    ->searchable()
+                    ->searchable()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('name')
                     ->label('Visitor Name')
                     ->sortable()
                     ->alignCenter()
                     ->searchable(),
-                Tables\Columns\TextColumn::make('mobile_number')
+                Tables\Columns\TextColumn::make('company')
-                    ->label('Visitor Mobile Number')
+                    ->label('Visitor Company')
+                    ->sortable()
+                    ->alignCenter()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('employeeMaster.plant.name')
+                    ->label('Visited Plant')
                     ->alignCenter()
-                    ->searchable()
                     ->searchable()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('employeeMaster.name')
@@ -268,6 +295,16 @@ class VisitorEntryResource extends Resource
                     ->searchable()
                     ->alignCenter()
                     ->sortable(),
+                Tables\Columns\TextColumn::make('purpose_of_visit')
+                    ->label('Purpose of Visit')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('mode_of_travel')
+                    ->label('Mode of Travel')
+                    ->searchable()
+                    ->alignCenter()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('in_time')
                     ->label('In Time')
                     ->searchable()
@@ -319,7 +356,7 @@ class VisitorEntryResource extends Resource
                             ->reactive()
                             ->placeholder('Enter Register ID')
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('Rework', null);
+                                $set('type', null);
                             }),
                         Select::make('type')
                             ->label('Type')
@@ -356,7 +393,24 @@ class VisitorEntryResource extends Resource
                             ->reactive()
                             ->placeholder('Enter Visitor Company')
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('Rework', null);
+                                $set('employee_master_id', null);
+                            }),
+                        Select::make('employee_department')
+                            ->label('Employee Department')
+                            ->options(function () {
+                                return EmployeeMaster::query()
+                                    ->whereNotNull('department')
+                                    ->distinct()
+                                    ->orderBy('department')
+                                    ->pluck('department', 'department')
+                                    ->toArray();
+                            })
+                            ->searchable()
+                            ->preload()
+                            ->reactive()
+                            ->placeholder('Select Department')
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                $set('employee_master_id', null);
                             }),
                         Select::make('employee_master_id')
                             ->label('Employee Name')
@@ -381,9 +435,23 @@ class VisitorEntryResource extends Resource
                     ])
                     ->query(function ($query, array $data) {
                         // Hide all records initially if no filters are applied
-                        if (empty($data['register_id']) && empty($data['type']) && empty($data['name']) && empty($data['company']) && empty($data['employee_master_id']) && empty($data['created_from']) && empty($data['created_to'])) {
+                        // if (empty($data['register_id']) && empty($data['type']) && empty($data['name']) && empty($data['company']) && empty($data['employee_master_id']) && empty($data['created_from']) && empty($data['created_to'])) {
-                            $query->where(function ($q) {
+                        //     $query->where(function ($q) {
-                            });
+                        //     });
+                        // }
+
+                        $hasAnyFilter = !empty($data['register_id'])
+                            || !empty($data['type'])
+                            || !empty($data['name'])
+                            || !empty($data['company'])
+                            || !empty($data['employee_master_id'])
+                            || !empty($data['employee_department'])
+                            || !empty($data['created_from'])
+                            || !empty($data['created_to']);
+
+                        if (!$hasAnyFilter) {
+                            $query->whereDate('created_at', today());
+                            return;
                         }
 
                         if (! empty($data['register_id'])) {
@@ -399,14 +467,25 @@ class VisitorEntryResource extends Resource
                             }
                         }
 
+                        // if (! empty($data['name'])) {
+                        //     $query->where('name', 'like', '%'.$data['name'].'%');
+                        // }
+
                         if (! empty($data['name'])) {
-                            $query->where('name', 'like', '%'.$data['name'].'%');
+                            $query->whereRaw(
+                                'LOWER(name) LIKE ?',
+                                ['%' . strtolower($data['name']) . '%']
+                            );
                         }
 
                         if (! empty($data['company'])) {
                             $query->where('company', 'like', '%'.$data['company'].'%');
                         }
 
+                        if (! empty($data['employee_department'])) {
+                            $query->where('department', $data['employee_department']);
+                        }
+
                         if (! empty($data['employee_master_id'])) {
                             $query->where('employee_master_id', $data['employee_master_id']);
                         }
@@ -443,6 +522,10 @@ class VisitorEntryResource extends Resource
                             $indicators[] = 'Company: '.$data['company'];
                         }
 
+                        if (! empty($data['employee_department'])) {
+                            $indicators[] = 'Employee Department: '.$data['employee_department'];
+                        }
+
                         if (! empty($data['employee_master_id'])) {
                             $indicators[] = 'Employee Name: '.EmployeeMaster::where('id', $data['employee_master_id'])->value('name');
                         }
@@ -589,4 +672,5 @@ class VisitorEntryResource extends Resource
                 SoftDeletingScope::class,
             ]);
     }
+
 }

app/Filament/Resources/VisitorEntryResource/Pages/CreateVisitorEntry.php

@@ -10,6 +10,8 @@ use Filament\Actions\Action;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Facades\Storage;
 use Livewire\Attributes\On;
+use App\Mail\VisitorMail;
+use Illuminate\Support\Facades\Mail;
 
 class CreateVisitorEntry extends CreateRecord
 {
@@ -19,36 +21,42 @@ class CreateVisitorEntry extends CreateRecord
 
     public function processMobile($mobile)
     {
-        $visitor = VisitorEntry::where('mobile_number', $mobile)->latest()->first();
+        $registerId = $this->data['register_id'] ?? null;
 
+        $visitor = VisitorEntry::where('mobile_number', $mobile)->latest()->first();
         if ($visitor) {
 
             $employee = EmployeeMaster::where('id', $visitor->employee_master_id)->first();
 
             $this->form->fill([
-                'register_id' => $visitor->register_id ?? '',
+                'register_id'        => $registerId ?? '',
-                'mobile_number' => $mobile ?? '',
+                'mobile_number'      => $visitor->mobile_number,
-                'name'       => $visitor->name ?? '',
+                'name'               => $visitor->name ?? '',
-                'company' => $visitor->company ?? '',
+                'company'            => $visitor->company ?? '',
-                'type'       => $visitor->type ?? '',
+                'type'               => $visitor->type ?? '',
-                'department'    => $employee->department ?? '',
+                'department'         => $employee?->department ?? '',
-                'employee_master_id' => $visitor->employee_master_id->name ?? '',
+                'employee_master_id' => $visitor->employee_master_id,
-                'code' => $employee->code ?? '',
+                'code'               => $employee?->code ?? '',
+                'purpose_of_visit'   => '',
+                'in_time'            => now(),
+                'out_time'           => null,
+                'valid_upto'         => null,
             ]);
         }
         else {
-
-            $registerId = $this->form->getState()['register_id'] ?? '';
-
             $this->form->fill([
-                'register_id' => $registerId ?? '',
+                'register_id'        => $registerId ?? '',
-                'mobile_number' => $mobile ?? '',
+                'mobile_number'      => $mobile,
-                'name'       => $visitor->name ?? '',
+                'name'               => '',
-                'company' => $visitor->company ?? '',
+                'company'            => '',
-                'type'       => $visitor->type ?? '',
+                'type'               => '',
-                'department'    => $employee->department ?? '',
+                'department'         => '',
-                'employee_master_id' => $visitor->employee_master_id->name ?? '',
+                'employee_master_id' => null,
-                'code' => $employee->code ?? '',
+                'code'               => '',
+                'purpose_of_visit'   => '',
+                'in_time'            => now(),
+                'out_time'           => null,
+                'valid_upto'         => null,
             ]);
         }
     }
@@ -118,6 +126,21 @@ class CreateVisitorEntry extends CreateRecord
         ];
     }
 
+    protected function afterCreate(): void
+    {
+        $visitor = $this->record;
+
+        $employee = EmployeeMaster::find($visitor->employee_master_id);
+
+        if ($employee && !empty($employee->email)) {
+            Mail::to($employee->email)
+                ->send(new VisitorMail($visitor)); // or ->send()
+        }
+        else{
+            \Log::warning('No email found for employee ID: ' . $visitor->employee_master_id);
+        }
+    }
+
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('view', ['record' => $this->record]);

app/Http/Controllers/CharacteristicsController.php

@@ -520,7 +520,7 @@ class CharacteristicsController extends Controller
 
             if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-            } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP'];
             } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['PUMP'];
@@ -673,7 +673,7 @@ class CharacteristicsController extends Controller
                     //         'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
                     //     ], 404);
                 }
-            } elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+            } elseif (! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
                 return response()->json([
                     'status_code' => 'ERROR',
                     'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
@@ -1562,7 +1562,7 @@ class CharacteristicsController extends Controller
 
                 if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                     $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-                } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+                } elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                     $typesToCreate = ['MOTOR', 'PUMP'];
                 } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                     $typesToCreate = ['PUMP'];
@@ -1941,7 +1941,7 @@ class CharacteristicsController extends Controller
 
             if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-            } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP'];
             } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['PUMP'];
@@ -2399,7 +2399,7 @@ class CharacteristicsController extends Controller
                         //         'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
                         //     ], 404);
                     }
-                } elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+                } elseif (! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
                     return response()->json([
                         'status_code' => 'ERROR',
                         'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
@@ -3666,7 +3666,7 @@ class CharacteristicsController extends Controller
 
         if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-        } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP'];
         } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['PUMP'];
@@ -4701,7 +4701,7 @@ class CharacteristicsController extends Controller
 
         if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-        } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP'];
         } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['PUMP'];

app/Livewire/ProductionCheckList.php

@@ -25,15 +25,15 @@ class ProductionCheckList extends Component
 
     public $existingRecords = [];
 
-    public bool $shouldSkipChecklist = false;
+    // public bool $shouldSkipChecklist = false;
 
     public array $checklist = [];
 
     public $showChecklist = false;
 
-    public $skipChecklistValidation = false;
+    // public $skipChecklistValidation = false;
 
-    protected $listeners = ['focus-item-id' => 'handleFocus', 'trigger-create' => 'doCreate',];
+    // protected $listeners = ['focus-item-id' => 'handleFocus', 'trigger-create' => 'doCreate',];
 
     public $data =
     [
@@ -45,23 +45,21 @@ class ProductionCheckList extends Component
         'checklist' => [],
     ];
 
-    #[On('focus-item-id')]
+    // public function doCreate()
-    public function handleFocus()
+    // {
-    {
+    //     $this->create();
-        $this->dispatch('focus-input');
-    }
-
-    public function doCreate()
-    {
-        $this->create();
-
-        $this->shouldSkipChecklist = false;
-    }
 
+    //     $this->shouldSkipChecklist = false;
+    // }
 
     public function mount($records = [])
     {
-        $this->records = collect($records);
+        // $this->records = collect($records);
+        $this->records = $records;
+
+        foreach ($records as $record) {
+            $this->checklist[$record['id']] = 'ok';
+        }
     }
 
     public function cancel()
@@ -255,11 +253,10 @@ class ProductionCheckList extends Component
         ];
     }
 
-    public function updatedDataChecklist()
+    // public function updatedDataChecklist()
-    {
+    // {
-        $this->dispatch('checklistUpdated', $this->data['checklist']);
+    //     $this->dispatch('checklistUpdated', $this->data['checklist']);
-    }
+    // }
-
 
     public function render()
     {

app/Mail/ImportTransitMail.php

@@ -9,6 +9,7 @@ use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Mail\Mailables\Attachment;
 
 class ImportTransitMail extends Mailable
 {
@@ -20,14 +21,17 @@ class ImportTransitMail extends Mailable
 
     public $mailSubject;
 
+    public $excelPath;
+
     /**
      * Create a new message instance.
      */
-    public function __construct($scheduleType, $tableData, $mailSubject)
+    public function __construct($scheduleType, $tableData, $mailSubject, $excelPath)
     {
         $this->scheduleType = $scheduleType;
         $this->tableData = $tableData ?? [];
         $this->mailSubject = $mailSubject ?? 'Import Transit';
+        $this->excelPath = $excelPath;
     }
 
     /**
@@ -36,7 +40,7 @@ class ImportTransitMail extends Mailable
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Import Transit Mail',
+            subject: 'Import Shipment InTransit Mail',
         );
     }
 
@@ -45,7 +49,9 @@ class ImportTransitMail extends Mailable
      */
     public function content(): Content
     {
-        $greeting = '<b>Dear Sir</b>';
+        $now = now();
+        $reportDate = $now->format('d/m/Y');
+        $greeting = '<b>Dear Sir/Madam</b>,<br>Kindly find attached the Pending Import Shipment Status Report as on ' . $reportDate . ' for your reference.<br>We request you to review the shipments highlighted in <span style="background-color: yellow; font-weight: bold;">yellow</span> and arrange for their clearance at the earliest to avoid further delays and additional charges.<br>Please note that for shipments pending under <b>Telex Release</b> and <b>Duty Payment</b>, CFS charges will be commenced post ETA. We therefore urge you to expedite the necessary actions at your end.';
 
         //$greeting1 = 'Dear C.R.I Branch Team, <br><br> Please follow and ensure the same';
 
@@ -88,6 +94,14 @@ class ImportTransitMail extends Mailable
      */
     public function attachments(): array
     {
-        return [];
+        return [
+            Attachment::fromStorageDisk(
+                'local',
+                $this->excelPath
+            )->as('Import_Transit_Report.xlsx')
+            ->withMime(
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            ),
+        ];
     }
 }

app/Models/VisitorEntry.php

@@ -23,6 +23,7 @@ class VisitorEntry extends Model
         'employee_master_id',
         'number_of_person',
         'valid_upto',
+        'mode_of_travel',
     ];
 
     public function employeeMaster(): BelongsTo

composer.json

@@ -10,7 +10,7 @@
         "alperenersoy/filament-export": "^3.0",
         "althinect/filament-spatie-roles-permissions": "^2.3",
         "diogogpinto/filament-auth-ui-enhancer": "^1.0",
-        "erag/laravel-pwa": "^1.9",
+        "erag/laravel-pwa": "^2.0",
         "filament/filament": "^3.3",
         "intervention/image": "^3.11",
         "irazasyed/telegram-bot-sdk": "^3.15",

database/migrations/2026_06_08_165020_add_mode_of_travel_to_visitor_entries.php

@@ -0,0 +1,31 @@
+<?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 visitor_entries
+        ADD COLUMN mode_of_travel TEXT DEFAULT NULL
+        SQL;
+
+        DB::statement($sql1);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Schema::table('visitor_entries', function (Blueprint $table) {
+        //     //
+        // });
+    }
+};

resources/views/livewire/production-check-list.blade.php

@@ -1,7 +1,11 @@
 <div class="fixed inset-0 flex items-center justify-center z-50">
 
-    <div class="bg-white max-h-[80vh] overflow-hidden p-6 rounded-lg shadow-lg pointer-events-auto"
+    {{-- <div class="bg-white max-h-[80vh] overflow-hidden p-6 rounded-lg shadow-lg pointer-events-auto"
-    style="width:30vw !important; max-width:none !important;">
+    style="width:30vw !important; max-width:none !important;"> --}}
+
+    <div
+        class="bg-white rounded-lg shadow-lg pointer-events-auto
+               w-full max-w-2xl max-h-[90vh] flex flex-col">
 
         {{-- @if($records && $records->count()) --}}
         @if(!empty($records) && count($records))

resources/views/mail/import_transit_report.blade.php

@@ -19,13 +19,13 @@
         table {
             border-collapse: collapse;
             width: 100%;
-            font-size: 14px;
+            font-size: 10px;
             white-space: nowrap !important;
         }
         th, td {
             border: 1px solid #020813da;
             padding: 8px 10px;
-            text-align: center;
+            text-align: left;
             white-space: nowrap !important;
             text-overflow: ellipsis;
         }
@@ -41,6 +41,13 @@
             background-color: #f3f4f6;
         }
 
+        .status-column {
+            text-align: left !important;
+            white-space: normal !important;
+            min-width: 250px;
+            width: 250px;
+            vertical-align: top;
+        }
         .footer {
             text-align: center;
             font-size: 13px;
@@ -64,30 +71,16 @@
                     <tr>
                         <th>No</th>
                         <th>CRI RFQ Number</th>
-                        <th>Mail Received Date</th>
-                        <th>Pricol Ref Number</th>
                         <th>Requestor</th>
                         <th>Shipper</th>
                         <th>Shipper Location</th>
                         <th>Shipper Invoice</th>
                         <th>Shipper Invoice Date</th>
                         <th>Custom Agent Name</th>
-                        <th>ETA Date</th>
+                        <th>ETA</th>
                         <th>Status</th>
                         <th>Delivery Location</th>
                         <th>ETD Date</th>
-                        <th>Mode</th>
-                        <th>Inco Terms</th>
-                        <th>Port Of Loading</th>
-                        <th>Port Of Discharge</th>
-                        <th>Delivery City</th>
-                        <th>Packages</th>
-                        <th>Type of package</th>
-                        <th>Gross Weight</th>
-                        <th>Volume</th>
-                        <th>Bill Number</th>
-                        <th>Bill Received Date</th>
-                        <th>Vessel Number</th>
                         <th>Remark</th>
                     </tr>
                 </thead>
@@ -96,19 +89,26 @@
                 <tr style="{{ $row['is_transit_identified'] == 1 ? 'background-color:#FFFF00;' . 'font-weight: bold;' : '' }}">
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $row['cri_rfq_number'] }}</td>
-                    <td>{{ $row['mail_received_date'] }}</td>
+                    {{-- <td>{{ $row['mail_received_date'] }}</td> --}}
-                    <td>{{ $row['pricol_ref_number'] }}</td>
+                    {{-- <td>{{ \Carbon\Carbon::parse($row['mail_received_date'])->format('Y-m-d') }}</td> --}}
+                    {{-- <td>{{ $row['pricol_ref_number'] }}</td> --}}
                     <td>{{ $row['requester'] }}</td>
                     <td>{{ $row['shipper'] }}</td>
                     <td>{{ $row['shipper_location'] }}</td>
                     <td>{{ $row['shipper_invoice'] }}</td>
-                    <td>{{ $row['shipper_invoice_date'] }}</td>
+                    {{-- <td>{{ $row['shipper_invoice_date'] }}</td> --}}
+                    <td>{{ \Carbon\Carbon::parse($row['shipper_invoice_date'])->format('Y-m-d') }}</td>
                     <td>{{ $row['customs_agent_name'] }}</td>
-                    <td>{{ $row['eta_date'] }}</td>
+                    {{-- <td>{{ $row['eta_date'] }}</td> --}}
-                    <td>{{ $row['status'] }}</td>
+                    <td>{{ \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') }}</td>
+                    {{-- <td>{{ $row['status'] }}</td> --}}
+                    <td class="status-column">
+                        {{ $row['status'] }}
+                    </td>
                     <td>{{ $row['delivery_location'] }}</td>
-                    <td>{{ $row['etd_date'] }}</td>
+                    {{-- <td>{{ $row['etd_date'] }}</td> --}}
-                    <td>{{ $row['mode'] }}</td>
+                    <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td>
+                    {{-- <td>{{ $row['mode'] }}</td>
                     <td>{{ $row['inco_terms'] }}</td>
                     <td>{{ $row['port_of_loading'] }}</td>
                     <td>{{ $row['port_of_discharge'] }}</td>
@@ -117,9 +117,10 @@
                     <td>{{ $row['type_of_package'] }}</td>
                     <td>{{ $row['gross_weight'] }}</td>
                     <td>{{ $row['volume'] }}</td>
-                    <td>{{ $row['bill_number'] }}</td>
+                    <td>{{ $row['bill_number'] }}</td> --}}
-                    <td>{{ $row['bill_received_date'] }}</td>
+                    {{-- <td>{{ $row['bill_received_date'] }}</td> --}}
-                    <td>{{ $row['vessel_number'] }}</td>
+                    {{-- <td>{{ \Carbon\Carbon::parse($row['bill_received_date'])->format('Y-m-d') }}</td>
+                    <td>{{ $row['vessel_number'] }}</td> --}}
                     <td>{{ $row['remark'] }}</td>
                 </tr>
                 @endforeach

resources/views/production-orders/print.blade.php

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="UTF-8">
     <style>
         @page {
             margin: 0;

resources/views/production-orders/printItemSerial.blade.php

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="UTF-8">
     <style>
         @page {
             margin: 0;

resources/views/production-orders/printpanel.blade.php

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<meta charset="UTF-8">
 <style>
     @page {
         margin: 0;

resources/views/visitor/badge.blade.php

@@ -41,32 +41,26 @@
         .badge-header {
             background: #1a1a2e;
             color: #fff;
-            text-align: center;
+            padding: 1.5mm 2mm;
-            padding: 2mm 2mm 1.5mm;
             font-size: 8pt;
             font-weight: bold;
             letter-spacing: 1px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            flex-shrink: 0;
         }
 
-        .badge-header .type {
+        .badge-header .type     { font-size: 9pt; letter-spacing: 2px; }
-            font-size: 9pt;
+        .badge-header .badge-id { font-size: 7pt; opacity: 0.85; }
-            letter-spacing: 2px;
-        }
-
-        .badge-header .badge-id {
-            font-size: 7pt;
-            opacity: 0.85;
-        }
 
         /* ── Body ── */
         .badge-body {
             display: flex;
             flex: 1;
-            padding: 2mm;
+            padding: 1.5mm 2mm;
             gap: 2mm;
+            overflow: hidden;
         }
 
         /* ── Fields (left) ── */
@@ -74,82 +68,104 @@
             flex: 1;
             display: flex;
             flex-direction: column;
-            gap: 1.2mm;
+            overflow: hidden;
         }
 
         .field-row {
             display: grid;
             grid-template-columns: 16mm 3mm 1fr;
-            line-height: 1.3;
+            line-height: 1.25;
-            margin-bottom: 0.7mm;
+            margin-bottom: 0.6mm;
+            align-items: start;
         }
 
         .field-label {
-            color: #000;              /* was #555 — now pure black */
+            color: #000;
             font-size: 6.5pt;
-            font-weight: 700;         /* was normal — now bold */
+            font-weight: 700;
+            white-space: nowrap;
         }
 
         .field-colon {
-            color: #000;              /* was #555 — now pure black */
+            color: #000;
             font-size: 6.5pt;
-            font-weight: 700;         /* added bold */
+            font-weight: 700;
             text-align: center;
         }
 
         .field-value {
-            font-weight: 700;         /* was 600 — now fully bold */
+            font-weight: 700;
             font-size: 6.5pt;
-            color: #000;              /* was #111 — now pure black */
+            color: #000;
+            /* Prevent wrapping — truncate with ellipsis if too long */
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
 
-        /* ── Photo (right) ── */
+        /* ── Photo column (right) ── */
         .badge-photo {
             display: flex;
             flex-direction: column;
             align-items: center;
-            gap: 1mm;
             width: 18mm;
+            flex-shrink: 0;
+            gap: 0.5mm;
         }
 
         .badge-photo img {
             width: 16mm;
-            height: 18mm;
+            height: 16mm;
             object-fit: cover;
-            border: 1px solid #ccc;
+            border: 1px solid #000;
         }
 
         .badge-photo .no-photo {
             width: 16mm;
-            height: 18mm;
+            height: 16mm;
-            border: 1.5px dashed #000;    /* was #aaa — darker border */
+            border: 1.5px dashed #000;
             display: flex;
             align-items: center;
             justify-content: center;
-            font-size: 6pt;               /* slightly larger */
+            font-size: 6pt;
-            color: #000;                  /* was #aaa */
+            color: #000;
             font-weight: 700;
             text-align: center;
         }
 
         .host-sign {
-            font-size: 6pt;           /* was 5.5pt — slightly larger */
+            font-size: 6pt;
-            color: #000;              /* was #555 — now pure black */
+            color: #000;
-            font-weight: 700;         /* added bold */
+            font-weight: 700;
             text-align: center;
-            border-top: 1px solid #000; /* was 0.5px #aaa — darker line */
+            border-top: 1px solid #000;
             padding-top: 0.5mm;
             width: 100%;
         }
 
+        /* ── QR code ── */
+        .visitor-qr {
+            margin-top: 1mm;
+            width: 18mm;
+            display: flex;
+            justify-content: center;
+        }
+
+        .visitor-qr svg {
+            width: 16mm !important;
+            height: 16mm !important;
+            display: block;
+        }
+
         /* ── Footer ── */
         .badge-footer {
-            border-top: 1px solid #000;  /* was 0.5px #ddd — darker line */
+            border-top: 1px solid #000;
-            padding: 1mm 2mm;
+            padding: 0.8mm 2mm;
             text-align: right;
-            font-size: 6pt;              /* was 5.5pt — slightly larger */
+            font-size: 6pt;
-            color: #000;                 /* was #888 — now pure black */
+            color: #000;
-            font-weight: 700;            /* added bold */
+            font-weight: 700;
+            flex-shrink: 0;
         }
 
         @media print {
@@ -158,9 +174,9 @@
         }
     </style>
 </head>
-<body onload="window.print()">
+<body>
 
-    {{-- ── Print button (visible on screen only, hidden when printing) ── --}}
+    {{-- ── Print / Close buttons (screen only) ── --}}
     <div class="no-print" style="padding: 8px; text-align:center; background:#f3f4f6;">
         <button onclick="window.print()" style="padding:6px 18px; background:#1a1a2e; color:#fff; border:none; border-radius:6px; cursor:pointer; font-size:13px;">
             🖨️ Print Badge
@@ -175,7 +191,7 @@
         {{-- Header --}}
         <div class="badge-header">
             <span class="type">{{ strtoupper($visitor->type ?? 'VISITOR') }}</span>
-            <span class="badge-id">#{{ str_pad($visitor->register_id, 5, '0', STR_PAD_LEFT) }}</span>
+            <span class="badge-id">#{{ $visitor->register_id ?? str_pad($visitor->id, 5, '0', STR_PAD_LEFT) }}</span>
         </div>
 
         {{-- Body --}}
@@ -183,61 +199,62 @@
 
             {{-- Left: fields --}}
             <div class="badge-fields">
-                    <div class="field-row">
+                <div class="field-row">
-                        <span class="field-label">Name</span>
+                    <span class="field-label">Name</span>
-                        <span class="field-colon">:</span>
+                    <span class="field-colon">:</span>
-                        <span class="field-value">{{ strtoupper($visitor->name) }}</span>
+                    <span class="field-value">{{ strtoupper($visitor->name) }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">Company</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ $visitor->company }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">To Meet</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ strtoupper($visitor->employeeMaster?->name ?? '—') }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">Dept</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ strtoupper($visitor->employeeMaster?->department ?? $visitor->department ?? '—') }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">Valid Upto</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ $visitor->valid_upto ? \Carbon\Carbon::parse($visitor->valid_upto)->format('d/m/Y H:i:s') : '—' }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">Date & Time</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ $visitor->in_time ? \Carbon\Carbon::parse($visitor->in_time)->format('d/m/Y H:i:s') : '—' }}</span>
-                    </div>
-                    <div class="field-row">
-                        <span class="field-label">No of Visitors</span>
-                        <span class="field-colon">:</span>
-                        <span class="field-value">{{ $visitor->number_of_person ?? 1 }}</span>
-                    </div>
                 </div>
+                <div class="field-row">
+                    <span class="field-label">Company</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ $visitor->company }}</span>
+                </div>
+                <div class="field-row">
+                    <span class="field-label">To Meet</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ strtoupper($visitor->employeeMaster?->name ?? '—') }}</span>
+                </div>
+                <div class="field-row">
+                    <span class="field-label">Dept</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ strtoupper($visitor->employeeMaster?->department ?? $visitor->department ?? '—') }}</span>
+                </div>
+                <div class="field-row">
+                    <span class="field-label">Valid Upto</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ $visitor->valid_upto ? \Carbon\Carbon::parse($visitor->valid_upto)->format('d/m/Y H:i:s') : '—' }}</span>
+                </div>
+                <div class="field-row">
+                    <span class="field-label">Date & Time</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ $visitor->in_time ? \Carbon\Carbon::parse($visitor->in_time)->format('d/m/Y H:i:s') : '—' }}</span>
+                </div>
+                <div class="field-row">
+                    <span class="field-label">No of Visitors</span>
+                    <span class="field-colon">:</span>
+                    <span class="field-value">{{ $visitor->number_of_person ?? 1 }}</span>
+                </div>
+            </div>
 
-            {{-- Right: photo + host sign --}}
+            {{-- Right: photo + host sign + QR --}}
             <div class="badge-photo">
                 @if($photoUrl)
                     <img src="{{ $photoUrl }}" alt="Visitor Photo" />
                 @else
                     <div class="no-photo">No Photo</div>
                 @endif
+
                 <div class="host-sign">Host Sign</div>
-                <div class="visitor-qr" style="margin-top:2mm;">
+
-                    {{-- {!! QrCode::size(25)
+                {{-- QR Code — high res, with quiet zone and high error correction --}}
-                        ->margin(0)
+                @if(!empty($visitor->register_id))
-                        ->generate($visitor->register_id) !!} --}}
+                    <div class="visitor-qr">
-                    @if(!empty($visitor->register_id))
+                        {!! QrCode::size(300)
-                        {!! QrCode::size(35)
+                            ->margin(2)
-                            ->margin(0)
+                            ->errorCorrection('H')
                             ->generate((string) $visitor->register_id) !!}
-                    @endif
+                    </div>
-                </div>
+                @endif
             </div>
 
         </div>
@@ -247,5 +264,11 @@
 
     </div>
 
+    <script>
+        window.addEventListener('load', function () {
+            setTimeout(function () { window.print(); }, 300);
+        });
+    </script>
+
 </body>
 </html>