Merge pull request 'Added logic for gate out entry for out time' (#726) from ranjith-dev into master

Reviewed-on: #726

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,6 +54,17 @@ class GateOutEntry extends Page implements HasForms
         $entry = VisitorEntry::where('register_id', $gatePass)->first();
 
         if ($entry) {
+
+            if (!empty($entry->out_time)) {
+                Notification::make()
+                    ->title('Already Exited')
+                    ->body('Gate pass has already been processed. Out time was already punched.')
+                    ->warning()
+                    ->send();
+                $this->filters['scan_out_gate_pass'] = '';
+                return;
+            }
+            else{
                 $entry->out_time = now();
                 $entry->save();
 
@@ -63,6 +74,7 @@ class GateOutEntry extends Page implements HasForms
                     ->success()
                     ->send();
                 $this->filters['scan_out_gate_pass'] = '';
+            }
         } else {
             Notification::make()
                 ->title('Invalid Gate Pass')

app/Filament/Resources/VisitorEntryResource.php

@@ -244,17 +244,22 @@ class VisitorEntryResource extends Resource
                     ->alignCenter()
                     ->searchable()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('name')
-                    ->label('Visitor Name')
-                    ->sortable()
-                    ->alignCenter()
-                    ->searchable(),
                 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('company')
+                    ->label('Visitor Company')
+                    ->sortable()
+                    ->alignCenter()
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('employeeMaster.name')
                     ->label('Recipient Name')
                     ->alignCenter()
@@ -275,6 +280,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()

composer.json

@@ -20,7 +20,7 @@
         "laravel/tinker": "^2.9",
         "league/flysystem-ftp": "^3.31",
         "league/flysystem-sftp-v3": "^3.30",
-        "livewire/livewire": "^4.0",
+        "livewire/livewire": "^3.6",
         "maatwebsite/excel": "^3.1",
         "mike42/escpos-php": "^4.0",
         "mpdf/mpdf": "^8.2",

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;