Add requested changes

Author: daniel-memo-ict

src/Resources/app/administration/src/module/postnl/component/config/postnl-config-return-options/postnl-config-return-options.html.twig

@@ -6,16 +6,16 @@
     />
 
     <template v-if="content.type === 'shipmentAndReturn'">
-        <sw-alert variant="info">
-            {{ $tc('postnl.config.returnOptions.description.shipmentAndReturn') }}
-        </sw-alert>
-
         <sw-switch-field
             v-model:value="content.allowImmediateShipmentAndReturn"
             :label="$tc('postnl.config.returnOptions.allowImmediateShipmentAndReturn')"
             size="small"
             noMarginTop
         />
+
+        <sw-alert variant="info" v-if="!content.allowImmediateShipmentAndReturn">
+            {{ $tc('postnl.config.returnOptions.description.shipmentAndReturn') }}
+        </sw-alert>
     </template>
 
     <template v-if="content.type === 'labelInTheBox'">

src/Resources/app/administration/src/module/postnl/component/shipment-modal/postnl-create-return-modal/index.js

@@ -99,6 +99,7 @@ Shopware.Component.extend('postnl-create-return-modal', 'postnl-shipment-modal-b
                     icon: 'regular-truck',
                     description: this.$t('postnl.order.modal.createReturn.type.smartReturn.description'),
                     requiredZones: ['NL', 'BE'],
+                    returnZones: ['NL', 'BE'],
                 },
                 {
                     label: this.$t('postnl.order.modal.createReturn.type.shipmentAndReturn.label'),
@@ -109,6 +110,7 @@ Shopware.Component.extend('postnl-create-return-modal', 'postnl-shipment-modal-b
                         ? this.$t('postnl.order.modal.createReturn.type.shipmentAndReturn.description')
                         : this.$t('postnl.order.modal.createReturn.type.notAvailable'),
                     requiredZones: ['NL'],
+                    returnZones: ['NL', 'BE'],
                 },
                 {
                     label: this.$t('postnl.order.modal.createReturn.type.labelInTheBox.label'),
@@ -119,10 +121,16 @@ Shopware.Component.extend('postnl-create-return-modal', 'postnl-shipment-modal-b
                         ? this.$t('postnl.order.modal.createReturn.type.labelInTheBox.description')
                         : this.$t('postnl.order.modal.createReturn.type.notAvailable'),
                     requiredZones: ['NL', 'BE'],
+                    returnZones: ['NL'],
                 }
             ]
                 .filter(returnType => returnType.requiredZones.some(zone => this.destinationZones.includes(zone)))
-        }
+                .filter(returnType => returnType.returnZones.some(zone => zone === this.returnZone))
+        },
+
+        returnZone() {
+            return this?.returnAddress?.countrycode
+        },
     },
 
     methods: {

src/Service/PostNL/Builder/ShipmentBuilder.php

@@ -171,7 +171,7 @@ public function buildShipment(OrderEntity $order, Context $context): Shipment
             !$context->hasState(OrderReturnAttributeStruct::S_SMART_RETURN) &&
             $returnOptions->getType() === ReturnOptionsStruct::T_SHIPMENT_AND_RETURN &&
             in_array($product->getDestinationZone(), [Zone::NL]) &&
-            $returnCountryCode === 'NL'
+            in_array($returnCountryCode, [Zone::NL, Zone::BE])
         ) {
             $this->orderService->updateOrderCustomFields(
                 $order->getId(),
@@ -438,24 +438,26 @@ public function buildProductOptions(OrderEntity $order, ProductEntity $product,
         }
 
         $returnOptions = $config->getReturnOptions();
-        if(
-            $returnOptions->getType() !== ReturnOptionsStruct::T_NONE &&
-            $product->getDestinationZone() === Zone::NL &&
-            !$context->hasState(OrderReturnAttributeStruct::S_SMART_RETURN)
-        ) {
+
+        if(!$context->hasState(OrderReturnAttributeStruct::S_SMART_RETURN)) {
             $productOptions[] = new ProductOption('191', '001');
 
-            switch($returnOptions->getType()) {
-                case ReturnOptionsStruct::T_LABEL_IN_THE_BOX:
-                    $productOptions[] = new ProductOption('152', '028');
-                    break;
-                case ReturnOptionsStruct::T_SHIPMENT_AND_RETURN:
-                    $productOptions[] = new ProductOption('152', '026');
+            if(
+                $returnOptions->getType() === ReturnOptionsStruct::T_LABEL_IN_THE_BOX &&
+                in_array($product->getDestinationZone(), [Zone::NL])
+            ) {
+                $productOptions[] = new ProductOption('152', '028');
+            }
 
-                    if(!$returnOptions->isAllowImmediateShipmentAndReturn()) {
-                        $productOptions[] = new ProductOption('191', '004');
-                    }
-                    break;
+            if(
+                $returnOptions->getType() === ReturnOptionsStruct::T_SHIPMENT_AND_RETURN &&
+                in_array($product->getDestinationZone(), [Zone::NL, Zone::BE])
+            ) {
+                $productOptions[] = new ProductOption('152', '026');
+
+                if(!$returnOptions->isAllowImmediateShipmentAndReturn()) {
+                    $productOptions[] = new ProductOption('191', '004');
+                }
             }
         }