Merge pull request 'Added serial qr code validation in create page of sticker printing' (#53) from ranjith-dev into master

Reviewed-on: #53

app/Filament/Resources/ProcessOrderResource.php

@@ -109,7 +109,6 @@ class ProcessOrderResource extends Resource
                     ->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
                         $itemId = $get('item_id');
                         if ($get('id')) {
-
                             $item = \App\Models\Item::where('id', $itemId)->first()?->description;
                             if ($item) {
                                 $set('item_description', $item);
@@ -123,7 +122,6 @@ class ProcessOrderResource extends Resource
                     ->hidden()
                     ->readOnly(),
                 // ->readOnly(true),
-
                 Forms\Components\TextInput::make('process_order')
                     ->label('Process Order')
                     ->reactive()

app/Filament/Resources/StickerPrintingResource/Pages/CreateStickerPrinting.php

@@ -9,7 +9,6 @@ use SimpleSoftwareIO\QrCode\Facades\QrCode;
 use Filament\Facades\Filament;
 use App\Models\StickerPrinting;
 use Filament\Notifications\Notification;
-use Str;
 
 
 class CreateStickerPrinting extends CreateRecord
@@ -95,11 +94,6 @@ class CreateStickerPrinting extends CreateRecord
                     ->body("Serial number should conatin minimum 9 digits '$serial'.")
                     ->warning()
                     ->send();
-                    $this->form->fill([
-                        'plant_id'      => $plant,
-                        'reference_number' => $ref,
-                        'serial_number' => '',
-                    ]);
                 return;
             }
             else if(!ctype_alnum($serial)) {
@@ -108,11 +102,6 @@ class CreateStickerPrinting extends CreateRecord
                     ->body("Serial number should be alphanumeric '$serial'.")
                     ->warning()
                     ->send();
-                    $this->form->fill([
-                        'plant_id'      => $plant,
-                        'reference_number' => $ref,
-                        'serial_number' => '',
-                ]);
                 return;
             }
             $extractedSerialNumber = $matches['serial_number'];
@@ -135,8 +124,8 @@ class CreateStickerPrinting extends CreateRecord
             return;
         }
 
-        if ($plant == null || trim($plant) == '' || $ref == null || trim($ref) == '' || $sNumber == null || trim($sNumber) == '')
+
-        {
+        if(empty($this->plantId) || empty($ref) || empty($this->serial_number)) {
             Notification::make()
                 ->title('Unknown: Incomplete Data!')
                 ->body("Please ensure Plant, Reference Number, and Serial Number are provided.")
@@ -169,16 +158,16 @@ class CreateStickerPrinting extends CreateRecord
         }
 
         StickerPrinting::create([
-            'plant_id'      => $plant,
+            'plant_id'      => $this->plantId,
             'reference_number' => $ref,
-            'serial_number' => $sNumber,
+            'serial_number' => $this->serial_number,
             'created_by'    => Filament::auth()->user()->name,
         ]);
 
-        $this->dispatch('addStickerToList', $plant, $ref, $sNumber);
+        $this->dispatch('addStickerToList', $this->plantId, $ref, $this->serial_number);
 
         $this->form->fill([
-            'plant_id'      => $plant,
+            'plant_id'      => $this->plantId,
             'reference_number' => $ref,
             'serial_number' => '',
         ]);
@@ -234,7 +223,6 @@ class CreateStickerPrinting extends CreateRecord
         // Send data to Pdf view
         $pdf = PDF::loadView('pdf.qrcode', [
             'qrCode'   => $qrCode,
-            'referenceNumber' => $refNumber,
         ]);
 
         return response()->streamDownload(function () use ($pdf) {

resources/views/livewire/sticker-print-data.blade.php

@@ -36,8 +36,7 @@
         style="height: 385px;"
     >
     <table class="table-auto w-full border-collapse border">
-        {{-- <thead class="bg-gray-100"> --}}
+        <thead class="bg-gray-100">
-            <thead class="bg-gray-100 text-xs">
             <tr>
                 <th class="border p-2">No</th>
                 <th class="border p-2">Reference No</th>
@@ -45,8 +44,7 @@
                 <th class="border p-2">Created By</th>
             </tr>
         </thead>
-        {{-- <tbody> --}}
+        <tbody>
-            <tbody class="text-xs">
             @forelse($records as $index => $record)
                 <tr>
                     <td class="border p-2 text-center">{{ $index + 1 }}</td>

resources/views/pdf/qrcode.blade.php

@@ -16,36 +16,6 @@
 </html> --}}
 
 
-{{-- <!DOCTYPE html>
-<html>
-<head>
-    <style>
-        @page {
-            margin: 0;
-            size: 100mm 100mm;
-        }
-        body {
-            margin: 0;
-            padding: 0;
-            width: 100mm;
-            height: 100mm;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-        img {
-            width: 100mm;
-            height: 100mm;
-        }
-    </style>
-</head>
-<body>
-    <img src="data:image/png;base64,{{ $qrCode }}" />
-
-</body>
-</html> --}}
-
-
 <!DOCTYPE html>
 <html>
 <head>
@@ -60,33 +30,19 @@
             width: 100mm;
             height: 100mm;
             display: flex;
-            flex-direction: column;
             justify-content: center;
             align-items: center;
-            text-align: center;
-            font-size: 12px;
-            font-family: Arial, sans-serif;
         }
         img {
-            width: 90mm; /* QR CODE REDUCED TO FIT TEXT */
+            width: 100mm;
-            height: 90mm;
+            height: 100mm;
-        }
-        .ref-text {
-            margin-top: 3mm;
-            font-size: 16px; /* Increased Font Size */
-            font-weight: bold;
         }
     </style>
 </head>
 <body>
-<div class="ref-text">
+
-        {{ $referenceNumber }}
-    </div>
     <img src="data:image/png;base64,{{ $qrCode }}" />
 
-
-
 </body>
 </html>
 
-