Merge pull request 'Refactor processSerialNumber method to improve package validation logic' (#34) from ranjith-dev into master

Reviewed-on: #34

app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php

@@ -3265,6 +3265,8 @@ class CreateInvoiceValidation extends CreateRecord
                         return;
                     }
 
+                    $invalidPackage = false;
+
                     $hasMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
                     $hasPumpQr = $record->stickerMasterRelation->tube_sticker_pump ?? null;
                     $hasPumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
@@ -3274,17 +3276,18 @@ class CreateInvoiceValidation extends CreateRecord
                         $hasMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
                         $hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
                         $hasPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
-                    } elseif (! $hasPumpSetQr && ! $hasPumpQr) {
-                        $hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
-                    }
+                    } else {
+                        if (! $hasPumpSetQr && ! $hasPumpQr) {
+                            $hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
+                        }
 
-                    $invalidPackage = false;
-                    $hasTubeMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
-                    $hasPackMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
-                    $hasTubePumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
-                    $hasPackPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
-                    if ($hasTubeMotorQr != $hasPackMotorQr || $hasTubePumpSetQr != $hasPackPumpSetQr) {
-                        $invalidPackage = true;
+                        $hasTubeMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
+                        $hasPackMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
+                        $hasTubePumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
+                        $hasPackPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
+                        if ($hasTubeMotorQr != $hasPackMotorQr || $hasTubePumpSetQr != $hasPackPumpSetQr) {
+                            $invalidPackage = true;
+                        }
                     }
 
                     $hadMotorQr = $record->motor_scanned_status ?? null;