Merge pull request 'remove dfe columns and adjusted alignment in import transit mail' (#731) from ranjith-dev into master

Reviewed-on: #731

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/Pages/GateOutEntry.php

@@ -54,15 +54,27 @@ class GateOutEntry extends Page implements HasForms
         $entry = VisitorEntry::where('register_id', $gatePass)->first();
 
         if ($entry) {
-            $entry->out_time = now();
-            $entry->save();
 
-            Notification::make()
+            if (!empty($entry->out_time)) {
-                ->title('Gate Pass Processed')
+                Notification::make()
-                ->body('Gate pass has been successfully processed. Visitor marked as exited.')
+                    ->title('Already Exited')
-                ->success()
+                    ->body('Gate pass has already been processed. Out time was already punched.')
-                ->send();
+                    ->warning()
-            $this->filters['scan_out_gate_pass'] = '';
+                    ->send();
+                $this->filters['scan_out_gate_pass'] = '';
+                return;
+            }
+            else{
+                $entry->out_time = now();
+                $entry->save();
+
+                Notification::make()
+                    ->title('Gate Pass Processed')
+                    ->body('Gate pass has been successfully processed. Visitor marked as exited.')
+                    ->success()
+                    ->send();
+                $this->filters['scan_out_gate_pass'] = '';
+            }
         } else {
             Notification::make()
                 ->title('Invalid Gate Pass')

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/VisitorEntryResource.php

@@ -244,15 +244,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')
@@ -275,6 +285,11 @@ 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('in_time')
                     ->label('In Time')
                     ->searchable()
@@ -621,4 +636,5 @@ class VisitorEntryResource extends Resource
                 SoftDeletingScope::class,
             ]);
     }
+
 }

resources/views/mail/import_transit_report.blade.php

@@ -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,7 +71,6 @@
                     <tr>
                         <th>No</th>
                         <th>CRI RFQ Number</th>
-                        <th>Ref Number</th>
                         <th>Requestor</th>
                         <th>Shipper</th>
                         <th>Shipper Location</th>
@@ -85,7 +91,7 @@
                     <td>{{ $row['cri_rfq_number'] }}</td>
                     {{-- <td>{{ $row['mail_received_date'] }}</td> --}}
                     {{-- <td>{{ \Carbon\Carbon::parse($row['mail_received_date'])->format('Y-m-d') }}</td> --}}
-                    <td>{{ $row['pricol_ref_number'] }}</td>
+                    {{-- <td>{{ $row['pricol_ref_number'] }}</td> --}}
                     <td>{{ $row['requester'] }}</td>
                     <td>{{ $row['shipper'] }}</td>
                     <td>{{ $row['shipper_location'] }}</td>
@@ -95,7 +101,10 @@
                     <td>{{ $row['customs_agent_name'] }}</td>
                     {{-- <td>{{ $row['eta_date'] }}</td> --}}
                     <td>{{ \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') }}</td>
-                    <td>{{ $row['status'] }}</td>
+                    {{-- <td>{{ $row['status'] }}</td> --}}
+                    <td class="status-column">
+                        {{ $row['status'] }}
+                    </td>
                     <td>{{ $row['delivery_location'] }}</td>
                     {{-- <td>{{ $row['etd_date'] }}</td> --}}
                     <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td>

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>