From 7c501e7832c5e3c3fd80a26fc3e56d9b11213511 Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Fri, 26 Apr 2024 14:37:59 +0200
Subject: [PATCH 1/6] fix(export): allow signature or only_recipient for be

INT-455
---
 Block/Sales/NewShipment.php                 | 11 ------
 Helper/ShipmentOptions.php                  | 21 ++++++----
 Model/Sales/TrackTraceHolder.php            |  6 +--
 Model/Source/DefaultOptions.php             |  5 +++
 view/adminhtml/templates/new_shipment.phtml | 44 +++++++++++++--------
 5 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/Block/Sales/NewShipment.php b/Block/Sales/NewShipment.php
index 1dd48e72..9fcad763 100755
--- a/Block/Sales/NewShipment.php
+++ b/Block/Sales/NewShipment.php
@@ -106,17 +106,6 @@ public function hasDefaultOption(string $option, string $carrier): bool
         return $this->defaultOptions->hasDefault($option, $carrier);
     }
 
-    /**
-     * @param  string $option 'large_format'
-     * @param  string $carrier
-     *
-     * @return bool
-     */
-    public function hasDefaultLargeFormat(string $option, string $carrier): bool
-    {
-        return $this->defaultOptions->hasDefaultLargeFormat($carrier, $option);
-    }
-
     /**
      * Get default value of age check
      *
diff --git a/Helper/ShipmentOptions.php b/Helper/ShipmentOptions.php
index 54fdb1b6..27ebf134 100644
--- a/Helper/ShipmentOptions.php
+++ b/Helper/ShipmentOptions.php
@@ -55,6 +55,11 @@ class ShipmentOptions
      */
     private $order;
 
+    /**
+     * @var string|null
+     */
+    private $cc;
+
     /**
      * @param  \MyParcelNL\Magento\Model\Source\DefaultOptions $defaultOptions
      * @param  \MyParcelNL\Magento\Helper\Data                 $helper
@@ -77,6 +82,7 @@ public function __construct(
         $this->objectManager  = $objectManager;
         $this->carrier        = $carrier;
         $this->options        = $options;
+        $this->cc             = $order->getShippingAddress() ? $order->getShippingAddress()->getCountryId() : null;
     }
 
     /**
@@ -92,6 +98,10 @@ public function getInsurance(): int
      */
     public function hasSignature(): bool
     {
+        if (AbstractConsignment::CC_BE === $this->cc && $this->hasOnlyRecipient()) {
+            return false;
+        }
+
         $signatureFromOptions = self::getValueOfOptionWhenSet(self::SIGNATURE, $this->options);
 
         return $signatureFromOptions ?? $this->optionIsEnabled(self::SIGNATURE);
@@ -132,10 +142,7 @@ public function hasReturn(): bool
      */
     public function hasAgeCheck(): bool
     {
-        $countryId = $this->order->getShippingAddress()
-            ->getCountryId();
-
-        if (AbstractConsignment::CC_NL !== $countryId) {
+        if (AbstractConsignment::CC_NL !== $this->cc) {
             return false;
         }
 
@@ -265,14 +272,12 @@ public static function getValueOfOptionWhenSet(string $key, array $options): ?bo
      */
     public function hasLargeFormat(): bool
     {
-        $countryId = $this->order->getShippingAddress()->getCountryId();
-
-        if (! in_array($countryId, AbstractConsignment::EURO_COUNTRIES)) {
+        if (! in_array($this->cc, AbstractConsignment::EURO_COUNTRIES)) {
             return false;
         }
 
         $largeFormatFromOptions  = self::getValueOfOptionWhenSet(self::LARGE_FORMAT, $this->options);
-        $largeFormatFromSettings = self::$defaultOptions->hasDefaultLargeFormat($this->carrier, self::LARGE_FORMAT);
+        $largeFormatFromSettings = self::$defaultOptions->hasDefault(self::LARGE_FORMAT, $this->carrier);
 
         return $largeFormatFromOptions ?? $largeFormatFromSettings;
     }
diff --git a/Model/Sales/TrackTraceHolder.php b/Model/Sales/TrackTraceHolder.php
index b2dd45ca..3e2d7498 100755
--- a/Model/Sales/TrackTraceHolder.php
+++ b/Model/Sales/TrackTraceHolder.php
@@ -175,7 +175,7 @@ public function convertDataFromMagentoToApi(Track $magentoTrack, array $options)
 
         $this->consignment = (ConsignmentFactory::createByCarrierName($deliveryOptionsAdapter->getCarrier()))
             ->setApiKey($apiKey)
-            ->setReferenceId($shipment->getEntityId())
+            ->setReferenceIdentifier($shipment->getEntityId())
             ->setConsignmentId($magentoTrack->getData('myparcel_consignment_id'))
             ->setCountry($address->getCountryId())
             ->setCompany(self::$defaultOptions->getMaxCompanyName($address->getCompany()))
@@ -227,13 +227,13 @@ public function convertDataFromMagentoToApi(Track $magentoTrack, array $options)
             ->setAgeCheck($this->shipmentOptionsHelper->hasAgeCheck())
             ->setInsurance($this->shipmentOptionsHelper->getInsurance())
             ->setInvoice(
-                $magentoTrack->getShipment()
+                $shipment
                     ->getOrder()
                     ->getIncrementId()
             )
             ->setSaveRecipientAddress(false);
 
-        if ($deliveryOptionsAdapter->isPickup()) {
+        if ($deliveryOptionsAdapter->isPickup() && $pickupLocationAdapter) {
             $this->consignment
                 ->setPickupPostalCode($pickupLocationAdapter->getPostalCode())
                 ->setPickupStreet($pickupLocationAdapter->getStreet())
diff --git a/Model/Source/DefaultOptions.php b/Model/Source/DefaultOptions.php
index a00af564..d74c9484 100755
--- a/Model/Source/DefaultOptions.php
+++ b/Model/Source/DefaultOptions.php
@@ -17,6 +17,7 @@
 use Magento\Sales\Model\Order;
 use MyParcelNL\Magento\Helper\Checkout;
 use MyParcelNL\Magento\Helper\Data;
+use MyParcelNL\Magento\Helper\ShipmentOptions;
 use MyParcelNL\Magento\Model\Sales\Repository\PackageRepository;
 use MyParcelNL\Sdk\src\Factory\DeliveryOptionsAdapterFactory;
 use MyParcelNL\Sdk\src\Model\Carrier\AbstractCarrier;
@@ -82,6 +83,10 @@ public function __construct(Order $order, Data $helper)
      */
     public function hasDefault(string $option, string $carrier): bool
     {
+        if (AbstractConsignment::SHIPMENT_OPTION_LARGE_FORMAT === $option) {
+            return $this->hasDefaultLargeFormat($carrier, $option);
+        }
+
         // Check that the customer has already chosen this option in the checkout
         if (is_array(self::$chosenOptions) &&
             array_key_exists('shipmentOptions', self::$chosenOptions) &&
diff --git a/view/adminhtml/templates/new_shipment.phtml b/view/adminhtml/templates/new_shipment.phtml
index 5d00ae4a..a2d5bc7b 100755
--- a/view/adminhtml/templates/new_shipment.phtml
+++ b/view/adminhtml/templates/new_shipment.phtml
@@ -1,6 +1,7 @@
 <?php
 /** @var MyParcelNL\Magento\Block\Sales\NewShipment $block */
 
+use MyParcelNL\Sdk\src\Model\Carrier\CarrierPostNL;
 use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
 
 ?>
@@ -18,7 +19,8 @@ use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
     </label>
 </div>
 <?php
-foreach ($block->getNewShipmentForm()->getCarrierSpecificAbstractConsignments() as $abstractConsignment) {
+$form = $block->getNewShipmentForm();
+foreach ($form->getCarrierSpecificAbstractConsignments() as $abstractConsignment) {
     $abstractConsignment->setCountry($block->getCountry());
     $carrier      = $abstractConsignment->getCarrier();
     $carrierName  = $carrier->getName();
@@ -57,9 +59,7 @@ foreach ($block->getNewShipmentForm()->getCarrierSpecificAbstractConsignments()
                         continue;
                     }
                 }
-                $packageTypeHuman = $block->getNewShipmentForm()::PACKAGE_TYPE_HUMAN_MAP[$packageTypeId]
-                    ??
-                    $packageTypeName;
+                $packageTypeHuman = $form::PACKAGE_TYPE_HUMAN_MAP[$packageTypeId] ?? $packageTypeName;
                 ?>
                 <div class="admin__field admin__field-option">
                     <input
@@ -140,31 +140,42 @@ foreach ($block->getNewShipmentForm()->getCarrierSpecificAbstractConsignments()
                         title="">
                         <?php
                         while ($label_amount <= 10) {
-                            echo '<option value="' . $label_amount . '" >' . __($label_amount) . '</option>';
+                            echo '<option value="', $label_amount, '" >', __($label_amount), '</option>';
                             $label_amount++;
                         }
                         ?>
                     </select>
                 </div>
                 <?php
-                $isInternational = AbstractConsignment::CC_NL !== $block->getCountry();
-
                 try {
                     $abstractConsignment->setPackageType($packageTypeId);
                 } catch (\Exception $e) {
                     continue;
                 }
                 foreach ($abstractConsignment->getAllowedShipmentOptions() as $shipmentOption) {
-                    if (
-                        $isInternational
-                        || AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption
+                    if (AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption
                         || ! $abstractConsignment->canHaveShipmentOption($shipmentOption)
                     ) {
                         continue;
                     }
-                    $isActive = ($abstractConsignment::SHIPMENT_OPTION_LARGE_FORMAT === $shipmentOption)
-                        ? $block->hasDefaultLargeFormat($shipmentOption, $carrier->getName())
-                        : $block->hasDefaultOption($shipmentOption, $carrier->getName());
+                    /**
+                     * business logic determining what shipment options to show, if any
+                     */
+                    if (AbstractConsignment::CC_BE === $block->getCountry()) {
+                        if (CarrierPostNL::NAME === $carrierName) {
+                            // allow only_recipient and signature, but only one active at a time
+                            if (!in_array($shipmentOption, [
+                                AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT,
+                                AbstractConsignment::SHIPMENT_OPTION_SIGNATURE], true)
+                            ) {
+                                continue;
+                            }
+                        } else {
+                            continue;
+                        }
+                    } elseif (AbstractConsignment::CC_NL !== $block->getCountry()) {
+                        continue;
+                    }
                     ?>
                     <div
                         class="field choice admin__field admin__field-option field-mypa_signature mypa_package-toggle mypa-option-toggle"
@@ -176,15 +187,14 @@ foreach ($block->getNewShipmentForm()->getCarrierSpecificAbstractConsignments()
                             name="mypa_<?= $shipmentOption ?>"
                             value="1"
                             type="checkbox"
-                            <?= $isActive
+                            <?= $block->hasDefaultOption($shipmentOption, $carrierName)
                                 ? 'checked="checked"'
                                 : '' ?>
                         />
                         <label
                             class="admin__field-label"
                             for="mypa_<?= $shipmentOption ?>_<?= $carrierName ?>_<?= $packageTypeId ?>">
-                            <span><?= $block->getNewShipmentForm()
-                                          ->getShipmentOptionsHumanMap()[$shipmentOption] ?? $shipmentOption ?>
+                            <span><?= $form->getShipmentOptionsHumanMap()[$shipmentOption] ?? $shipmentOption ?>
                             </span>
                         </label>
                     </div>
@@ -201,7 +211,7 @@ foreach ($block->getNewShipmentForm()->getCarrierSpecificAbstractConsignments()
                         <label class="admin__field-label" for="mypa_insurance" style="display: block">
                             <span><?= __('Insured up to:') ?></span>
                         </label>
-                        <?php $defaultInsurance = $block->getDefaultInsurance($carrier->getName()); ?>
+                        <?php $defaultInsurance = $block->getDefaultInsurance($carrierName); ?>
                         <select
                             name="mypa_insurance"
                             id="mypa_insurance"

From 30fb37145a774f293ee5173416a2e70e8d095422 Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Fri, 26 Apr 2024 15:17:01 +0200
Subject: [PATCH 2/6] refactor: move business logic to datahelper

---
 Block/Sales/NewShipment.php                 |  6 ++++
 Helper/Data.php                             | 32 ++++++++++++++++++---
 view/adminhtml/templates/new_shipment.phtml | 30 ++-----------------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Block/Sales/NewShipment.php b/Block/Sales/NewShipment.php
index 9fcad763..ba1f7cda 100755
--- a/Block/Sales/NewShipment.php
+++ b/Block/Sales/NewShipment.php
@@ -25,6 +25,7 @@
 use MyParcelNL\Magento\Model\Source\DefaultOptions;
 use MyParcelNL\Magento\Helper\Data;
 use MyParcelNL\Magento\Model\Sales\TrackTraceHolder;
+use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
 
 class NewShipment extends AbstractItems
 {
@@ -170,6 +171,11 @@ public function getCountry()
         return $this->order->getShippingAddress()->getCountryId();
     }
 
+    public function consignmentHasShipmentOption(AbstractConsignment $consignment, string $shipmentOption): bool
+    {
+        return $this->dataHelper->consignmentHasShipmentOption($consignment, $shipmentOption);
+    }
+
     /**
      * @return \MyParcelNL\Magento\Block\Sales\NewShipmentForm
      */
diff --git a/Helper/Data.php b/Helper/Data.php
index 14813656..098264a7c 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -238,19 +238,43 @@ public function checkDeliveryType(?int $deliveryType): int
     }
 
     /**
-     * @param  int    $order_id
+     * @param  int    $orderId
      * @param  string $status
      */
-    public function setOrderStatus(int $order_id, string $status): void
+    public function setOrderStatus(int $orderId, string $status): void
     {
         $order = ObjectManager::getInstance()
             ->create('\Magento\Sales\Model\Order')
-            ->load($order_id);
+            ->load($orderId);
         $order->setState($status)
             ->setStatus($status);
         $order->save();
+    }
+
+    public function consignmentHasShipmentOption(AbstractConsignment $consignment, string $shipmentOption): bool
+    {
+        /**
+         * business logic determining what shipment options to show, if any
+         */
+        if (! $consignment->canHaveShipmentOption($shipmentOption)) {
+            return false;
+        }
+        if (AbstractConsignment::CC_BE === $consignment->getCountry()) {
+            if (CarrierPostNL::NAME === $consignment->getCarrierName()) {
+                if (!in_array($shipmentOption, [
+                    AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT,
+                    AbstractConsignment::SHIPMENT_OPTION_SIGNATURE], true)
+                ) {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } elseif (AbstractConsignment::CC_NL !== $consignment->getCountry()) {
+            return false;
+        }
 
-        return;
+        return true;
     }
 
     /**
diff --git a/view/adminhtml/templates/new_shipment.phtml b/view/adminhtml/templates/new_shipment.phtml
index a2d5bc7b..9d2a0e7f 100755
--- a/view/adminhtml/templates/new_shipment.phtml
+++ b/view/adminhtml/templates/new_shipment.phtml
@@ -50,7 +50,7 @@ foreach ($form->getCarrierSpecificAbstractConsignments() as $abstractConsignment
             <?php
             $country = $block->getCountry();
             foreach ($abstractConsignment->getAllowedPackageTypes() as $packageTypeName) {
-                $packageTypeId    = AbstractConsignment::PACKAGE_TYPES_NAMES_IDS_MAP[$packageTypeName];
+                $packageTypeId = AbstractConsignment::PACKAGE_TYPES_NAMES_IDS_MAP[$packageTypeName];
                 if (AbstractConsignment::CC_NL !== $country) {
                     if ($packageTypeId === AbstractConsignment::PACKAGE_TYPE_DIGITAL_STAMP) {
                         continue;
@@ -116,13 +116,6 @@ foreach ($form->getCarrierSpecificAbstractConsignments() as $abstractConsignment
                     ?>
                 </div>
 
-                <?php
-                $carrier = $abstractConsignment->getCarrier();
-                if (! $carrier) {
-                    continue;
-                }
-                $carrierName = $carrier->getName();
-                ?>
                 <div
                     class="field choice admin__field admin__field-option field-mypa_label_amount mypa_package-toggle
     mypa-option-toggle" style="padding-left: 30px;" data-for_mypa_package_type="<?= $packageTypeName ?>">
@@ -153,27 +146,10 @@ foreach ($form->getCarrierSpecificAbstractConsignments() as $abstractConsignment
                     continue;
                 }
                 foreach ($abstractConsignment->getAllowedShipmentOptions() as $shipmentOption) {
-                    if (AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption
-                        || ! $abstractConsignment->canHaveShipmentOption($shipmentOption)
-                    ) {
+                    if (AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption) {
                         continue;
                     }
-                    /**
-                     * business logic determining what shipment options to show, if any
-                     */
-                    if (AbstractConsignment::CC_BE === $block->getCountry()) {
-                        if (CarrierPostNL::NAME === $carrierName) {
-                            // allow only_recipient and signature, but only one active at a time
-                            if (!in_array($shipmentOption, [
-                                AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT,
-                                AbstractConsignment::SHIPMENT_OPTION_SIGNATURE], true)
-                            ) {
-                                continue;
-                            }
-                        } else {
-                            continue;
-                        }
-                    } elseif (AbstractConsignment::CC_NL !== $block->getCountry()) {
+                    if (! $block->consignmentHasShipmentOption($abstractConsignment, $shipmentOption)) {
                         continue;
                     }
                     ?>

From 551650833f2de5a455637bff1ce8c1e3df02b007 Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Mon, 29 Apr 2024 10:15:54 +0200
Subject: [PATCH 3/6] fix(translations): add missing

---
 Block/Sales/NewShipmentForm.php | 1 +
 i18n/fr_FR.csv                  | 6 +++---
 i18n/nl_NL.csv                  | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Block/Sales/NewShipmentForm.php b/Block/Sales/NewShipmentForm.php
index a0df08a8..ec361cbd 100644
--- a/Block/Sales/NewShipmentForm.php
+++ b/Block/Sales/NewShipmentForm.php
@@ -43,6 +43,7 @@ public function __construct()
             AbstractConsignment::SHIPMENT_OPTION_SIGNATURE         => __('Signature on receipt'),
             AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT    => __('Home address only'),
             AbstractConsignment::SHIPMENT_OPTION_AGE_CHECK         => __('Age check 18+'),
+            AbstractConsignment::SHIPMENT_OPTION_HIDE_SENDER       => __('Hide sender'),
             AbstractConsignment::SHIPMENT_OPTION_LARGE_FORMAT      => __('Large package'),
             AbstractConsignment::SHIPMENT_OPTION_RETURN            => __('Return if no answer'),
             AbstractConsignment::SHIPMENT_OPTION_SAME_DAY_DELIVERY => __('Same day delivery'),
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index 1b945961..59a855d1 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -76,7 +76,6 @@ Track status,Statut du suivi
 Track action,Action de suivi
 MyParcel options,Options MyParcel
 Package,Colis
-Signature on receipt,Signature pour réception
 Insured up to:,Assuré jusqu'à :
 Download package label,Télécharger l'étiquette du colis
 Create new concept,Créer une nouveau concept
@@ -144,8 +143,9 @@ Deliver the package only at address of the intended recipient.,Livraison du coli
 This will be added to the regular shipping price,Ceci sera ajouté aux frais d'expédition standards
 Not possible if Pickup at PostNL location is not active,Ceci ne sera pas possible si la collecte à un point postnl n'est pas activée
 Signature on receipt,Signature pour réception
-Signature on receipt title, Signature pour réception - titre
-Signature on receipt fee, Signature pour réception - prix
+Signature on receipt title,Signature pour réception - titre
+Signature on receipt fee,Signature pour réception - prix
+Hide sender,Masquer l'expéditeur
 This will be added to the regular shipping price, Ceci sera ajouté aux frais d'expédition standards
 If both have been selected this price will be added to the regular shipping price. Leave empty for not using it.,Si les deux éléments sont sélectionnés, ce prix sera ajouté aux frais d'expédition standards. Laissez vide pour ignorer cette option.
 "To use this optimally, set a weight or 'Fit in mailbox' volume of each product. Regardless, shipments heavier than the weight specified here will not be mailbox.","Pour utiliser cette fonction de manière optimale, spécifiez d'abord le poids ou le volume de vos produits. Les envois plus lourds que le poids spécifié ici ne seront pas considérés comme des envois pour Boîte aux lettres."
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index 63644408..fd80e55a 100755
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -134,7 +134,6 @@ Track status,Track status
 Track action,Track actie
 MyParcel options,MyParcel opties
 Package,Pakket
-Signature on receipt,Handtekening voor ontvangst
 Insured up to:,Verzekeren tot:
 Download package label,Download pakket label
 Download digital stamp label,Download digitalepostzegel label
@@ -215,8 +214,9 @@ Deliver the package only at address of the intended recipient.,Lever het pakket
 This will be added to the regular shipping price,Dit zal bij de normale verzendkosten worden opgeteld
 Not possible if Pickup at PostNL location is not active,Dit zal niet mogelijk zijn zodra ophalen bij een PostNL locatie niet geactiveerd is
 Signature on receipt,Handtekening voor ontvangst
-Signature on receipt title, Handtekening voor ontvangst titel
-Signature on receipt fee, Handtekening voor ontvangst kosten
+Signature on receipt title,Handtekening voor ontvangst titel
+Signature on receipt fee,Handtekening voor ontvangst kosten
+Hide sender,Verberg afzender
 This will be added to the regular shipping price, Dit zal bij de normale verzendkosten worden opgeteld
 If both have been selected this price will be added to the regular shipping price. Leave empty for not using it.,Als beide geselecteerd zijn zal deze prijs bij de normale verzendkosten worden opgeteld. Laat leeg om dit niet te gebruiken.
 "To use this optimally, set a weight or 'Fit in mailbox' volume of each product. Regardless, shipments heavier than the weight specified here will not be mailbox.","Om deze functie optimaal te gebruiken, stel je eerst het gewicht of volume in van jouw producten. Ongeacht deze instelling, zendingen zwaarder dan het hier opgegeven gewicht zullen niet als brievenbuspakket worden verzonden."

From 81e121eb13fd80235f808e26bea6eb7df9396376 Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Mon, 29 Apr 2024 10:16:49 +0200
Subject: [PATCH 4/6] refactor: combine if statements

---
 view/adminhtml/templates/new_shipment.phtml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/view/adminhtml/templates/new_shipment.phtml b/view/adminhtml/templates/new_shipment.phtml
index 9d2a0e7f..9698d673 100755
--- a/view/adminhtml/templates/new_shipment.phtml
+++ b/view/adminhtml/templates/new_shipment.phtml
@@ -146,10 +146,9 @@ foreach ($form->getCarrierSpecificAbstractConsignments() as $abstractConsignment
                     continue;
                 }
                 foreach ($abstractConsignment->getAllowedShipmentOptions() as $shipmentOption) {
-                    if (AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption) {
-                        continue;
-                    }
-                    if (! $block->consignmentHasShipmentOption($abstractConsignment, $shipmentOption)) {
+                    if (AbstractConsignment::SHIPMENT_OPTION_INSURANCE === $shipmentOption
+                        || ! $block->consignmentHasShipmentOption($abstractConsignment, $shipmentOption)
+                    ) {
                         continue;
                     }
                     ?>

From 71f7bfd479e623e6769801c53895e925177a0c5a Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Mon, 29 Apr 2024 10:28:10 +0200
Subject: [PATCH 5/6] style

---
 Helper/Data.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Helper/Data.php b/Helper/Data.php
index 098264a7c..77e8d7b3 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -254,11 +254,12 @@ public function setOrderStatus(int $orderId, string $status): void
     public function consignmentHasShipmentOption(AbstractConsignment $consignment, string $shipmentOption): bool
     {
         /**
-         * business logic determining what shipment options to show, if any
+         * Business logic determining what shipment options to show, if any.
          */
         if (! $consignment->canHaveShipmentOption($shipmentOption)) {
             return false;
         }
+
         if (AbstractConsignment::CC_BE === $consignment->getCountry()) {
             if (CarrierPostNL::NAME === $consignment->getCarrierName()) {
                 if (!in_array($shipmentOption, [

From 829afbd5e606e3bc1b8d3deb93d3197bcedd7ab8 Mon Sep 17 00:00:00 2001
From: Joeri van Veen <joeri@myparcel.nl>
Date: Tue, 30 Apr 2024 09:55:06 +0200
Subject: [PATCH 6/6] fix: implement feedback

---
 Helper/Data.php                 | 25 +++++++++----------------
 Model/Source/DefaultOptions.php |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Helper/Data.php b/Helper/Data.php
index 77e8d7b3..3e50b30a 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -256,26 +256,19 @@ public function consignmentHasShipmentOption(AbstractConsignment $consignment, s
         /**
          * Business logic determining what shipment options to show, if any.
          */
-        if (! $consignment->canHaveShipmentOption($shipmentOption)) {
-            return false;
+        if (AbstractConsignment::CC_NL === $consignment->getCountry()) {
+            return $consignment->canHaveShipmentOption($shipmentOption);
         }
 
-        if (AbstractConsignment::CC_BE === $consignment->getCountry()) {
-            if (CarrierPostNL::NAME === $consignment->getCarrierName()) {
-                if (!in_array($shipmentOption, [
-                    AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT,
-                    AbstractConsignment::SHIPMENT_OPTION_SIGNATURE], true)
-                ) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } elseif (AbstractConsignment::CC_NL !== $consignment->getCountry()) {
-            return false;
+        // For PostNL in Belgium - only recipient-only/signature is available
+        if (AbstractConsignment::CC_BE === $consignment->getCountry() && CarrierPostNL::NAME === $consignment->getCarrierName()) {
+            return in_array($shipmentOption, [
+                AbstractConsignment::SHIPMENT_OPTION_ONLY_RECIPIENT,
+                AbstractConsignment::SHIPMENT_OPTION_SIGNATURE], true);
         }
 
-        return true;
+        // No shipment options available in any other cases
+        return false;
     }
 
     /**
diff --git a/Model/Source/DefaultOptions.php b/Model/Source/DefaultOptions.php
index d74c9484..78707868 100755
--- a/Model/Source/DefaultOptions.php
+++ b/Model/Source/DefaultOptions.php
@@ -17,7 +17,6 @@
 use Magento\Sales\Model\Order;
 use MyParcelNL\Magento\Helper\Checkout;
 use MyParcelNL\Magento\Helper\Data;
-use MyParcelNL\Magento\Helper\ShipmentOptions;
 use MyParcelNL\Magento\Model\Sales\Repository\PackageRepository;
 use MyParcelNL\Sdk\src\Factory\DeliveryOptionsAdapterFactory;
 use MyParcelNL\Sdk\src\Model\Carrier\AbstractCarrier;