Merge pull request 'Refactor processSerialNumber method to improve package validation logic' (#34) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Reviewed-on: #34
This commit was merged in pull request #34.
This commit is contained in:
@@ -3265,6 +3265,8 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$invalidPackage = false;
|
||||||
|
|
||||||
$hasMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
|
$hasMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
|
||||||
$hasPumpQr = $record->stickerMasterRelation->tube_sticker_pump ?? null;
|
$hasPumpQr = $record->stickerMasterRelation->tube_sticker_pump ?? null;
|
||||||
$hasPumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
|
$hasPumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
|
||||||
@@ -3274,17 +3276,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
$hasMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
|
$hasMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
|
||||||
$hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
|
$hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
|
||||||
$hasPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
|
$hasPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
|
||||||
} elseif (! $hasPumpSetQr && ! $hasPumpQr) {
|
} else {
|
||||||
$hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
|
if (! $hasPumpSetQr && ! $hasPumpQr) {
|
||||||
}
|
$hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
$invalidPackage = false;
|
$hasTubeMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
|
||||||
$hasTubeMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
|
$hasPackMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
|
||||||
$hasPackMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
|
$hasTubePumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
|
||||||
$hasTubePumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
|
$hasPackPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
|
||||||
$hasPackPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
|
if ($hasTubeMotorQr != $hasPackMotorQr || $hasTubePumpSetQr != $hasPackPumpSetQr) {
|
||||||
if ($hasTubeMotorQr != $hasPackMotorQr || $hasTubePumpSetQr != $hasPackPumpSetQr) {
|
$invalidPackage = true;
|
||||||
$invalidPackage = true;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$hadMotorQr = $record->motor_scanned_status ?? null;
|
$hadMotorQr = $record->motor_scanned_status ?? null;
|
||||||
|
|||||||
Reference in New Issue
Block a user