Merge pull request 'Updated item selection logic in StickerMasterResource to return an empty array when no plant is selected' (#45) from ranjith-dev into master

Reviewed-on: #45

app/Filament/Resources/ItemResource.php

@@ -267,7 +267,9 @@ class ItemResource extends Resource
                             ->options(function (callable $get) {
                                 $plantId = $get('Plant');
 
-                                return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
+                                return $plantId
+                                    ? Item::where('plant_id', $plantId)->pluck('code', 'id')
+                                    : [];
                             })
                             ->searchable()
                             ->reactive(),

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
@@ -78,65 +77,7 @@ class CreateStickerPrinting extends CreateRecord
 
         $sNumber = $this->form->getState()['serial_number'] ?? null;
 
-        $pattern1 = '/^(?<item_code>[^|]+)\|(?<serial_number>[^|]+)\|?$/i';
-
-        $pattern2 = '/^(?<item_code>[^|]+)\|(?<serial_number>[^|]+)\|(?<batch_number>.+)$/i';
-
-        $pattern3 = '/^(?<serial_number>[^|]+)$/i';
-
-
-        if (preg_match($pattern1, $sNumber, $matches) || preg_match($pattern2, $sNumber, $matches) || preg_match($pattern3, $sNumber, $matches)) {
-
-            $serial = $matches['serial_number'];
-
-            if (Str::length($serial) < 9) {
-                Notification::make()
-                    ->title('Invalid Serial Number')
-                    ->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)) {
-                Notification::make()
-                    ->title('Invalid Serial Number')
-                    ->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'];
-            $sNumber = $extractedSerialNumber;
-        }
-        else
-        {
-            Notification::make()
-            ->title('Invalid Format')
-            ->body("Serial number must be in the format 'itemcode|serialnumber' or 'itemcode|serialnumber|batchnumber'. or just 'serialnumber'.")
-            ->warning()
-            ->send();
-
-            // Reset only serial number field
-            $this->form->fill([
-                'plant_id'      => $plant,
-                'reference_number' => $ref,
-                'serial_number' => '',
-            ]);
-            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 +110,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 +175,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) {

app/Policies/StickerPrintingPolicy.php

@@ -6,13 +6,12 @@ use Illuminate\Auth\Access\Response;
 use App\Models\StickerPrinting;
 use App\Models\User;
 
-
 class StickerPrintingPolicy
 {
     /**
      * Determine whether the user can view any models.
      */
-    public function viewAny(User $user): bool
+    public function viewAny(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('view-any StickerPrinting');
     }
@@ -20,7 +19,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can view the model.
      */
-    public function view(User $user, StickerPrinting $stickerprinting): bool
+    public function view(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('view StickerPrinting');
     }
@@ -28,7 +27,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can create models.
      */
-    public function create(User $user): bool
+    public function create(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('create StickerPrinting');
     }
@@ -36,7 +35,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can update the model.
      */
-    public function update(User $user, StickerPrinting $stickerprinting): bool
+    public function update(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('update StickerPrinting');
     }
@@ -44,7 +43,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can delete the model.
      */
-    public function delete(User $user, StickerPrinting $stickerprinting): bool
+    public function delete(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('delete StickerPrinting');
     }
@@ -52,7 +51,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can delete any models.
      */
-    public function deleteAny(User $user): bool
+    public function deleteAny(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('delete-any StickerPrinting');
     }
@@ -60,7 +59,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can restore the model.
      */
-    public function restore(User $user, StickerPrinting $stickerprinting): bool
+    public function restore(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('restore StickerPrinting');
     }
@@ -68,7 +67,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can restore any models.
      */
-    public function restoreAny(User $user): bool
+    public function restoreAny(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('restore-any StickerPrinting');
     }
@@ -76,7 +75,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can replicate the model.
      */
-    public function replicate(User $user, StickerPrinting $stickerprinting): bool
+    public function replicate(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('replicate StickerPrinting');
     }
@@ -84,7 +83,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can reorder the models.
      */
-    public function reorder(User $user): bool
+    public function reorder(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('reorder StickerPrinting');
     }
@@ -92,7 +91,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can permanently delete the model.
      */
-    public function forceDelete(User $user, StickerPrinting $stickerprinting): bool
+    public function forceDelete(App\Models\User $user, StickerPrinting $stickerprinting): bool
     {
         return $user->checkPermissionTo('force-delete StickerPrinting');
     }
@@ -100,7 +99,7 @@ class StickerPrintingPolicy
     /**
      * Determine whether the user can permanently delete any models.
      */
-    public function forceDeleteAny(User $user): bool
+    public function forceDeleteAny(App\Models\User $user): bool
     {
         return $user->checkPermissionTo('force-delete-any StickerPrinting');
     }

config/filament-spatie-roles-permissions.php

@@ -213,7 +213,7 @@ return [
 
         'user_model' => \App\Models\User::class,
 
-        // 'user_model_class' => \App\Models\User::class,
+        'user_model_class' => \App\Models\User::class,
 
         'policies_namespace' => 'App\Policies',
     ],

database/seeders/PermissionSeeder.php

@@ -169,7 +169,6 @@ class PermissionSeeder extends Seeder
         Permission::updateOrCreate(['name' => 'view import process order']);
         Permission::updateOrCreate(['name' => 'view export process order']);
 
-        Permission::updateOrCreate(['name' => 'view import sticker printing']);
-        Permission::updateOrCreate(['name' => 'view export sticker printing']);
+
     }
 }

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 text-xs">
+        <thead class="bg-gray-100">
             <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 class="text-xs">
+        <tbody>
             @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 */
-            height: 90mm;
-        }
-        .ref-text {
-            margin-top: 3mm;
-            font-size: 16px; /* Increased Font Size */
-            font-weight: bold;
+            width: 100mm;
+            height: 100mm;
         }
     </style>
 </head>
 <body>
-<div class="ref-text">
-        {{ $referenceNumber }}
-    </div>
+
     <img src="data:image/png;base64,{{ $qrCode }}" />
 
-
-
 </body>
 </html>
 
-