feat: allow dhlforyou pickup locations (#316)

INT-694
myparcelnl · Nov 7, 2024 · 58ae608 · 58ae608
1 parent e0a108a
commit 58ae608
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 6 deletions.
diff --git a/config/platform/myparcel.php b/config/platform/myparcel.php
@@ -111,6 +111,7 @@
                 'packageTypes'    => [
                     DeliveryOptions::PACKAGE_TYPE_PACKAGE_NAME,
                     DeliveryOptions::PACKAGE_TYPE_MAILBOX_NAME,
+                    DeliveryOptions::PACKAGE_TYPE_PACKAGE_SMALL_NAME
                 ],
                 'deliveryTypes'   => [
                     DeliveryOptions::DELIVERY_TYPE_STANDARD_NAME,

diff --git a/config/schema/myparcel/order/dhlforyou/base.json b/config/schema/myparcel/order/dhlforyou/base.json
@@ -15,7 +15,7 @@
           "enum": ["standard", "pickup", null]
         },
         "packageType": {
-          "enum": ["letter", "mailbox", "package", null]
+          "enum": ["letter", "mailbox", "package", "package_small", null]
         },
         "shipmentOptions": {
           "properties": {

diff --git a/config/schema/myparcel/order/dhlforyou/nl_package_small.json b/config/schema/myparcel/order/dhlforyou/nl_package_small.json
@@ -0,0 +1,25 @@
+{
+  "description": "order/dhlforyou/nl_package_small",
+  "properties": {
+    "deliveryOptions": {
+      "properties": {
+        "deliveryType": {
+          "enum": ["standard", "pickup", null]
+        },
+        "shipmentOptions": {
+          "properties": {
+            "ageCheck": {
+              "enum": [0, 1]
+            },
+            "onlyRecipient": {
+              "enum": [0, 1]
+            },
+            "signature": {
+              "enum": [0, 1]
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/config/validation/myparcel/order.php b/config/validation/myparcel/order.php
@@ -179,6 +179,11 @@
                             'name'   => DeliveryOptions::PACKAGE_TYPE_LETTER_NAME,
                             'schema' => 'order/dhlforyou/letter',
                         ],
+                        [
+                            'id'     => DeliveryOptions::PACKAGE_TYPE_PACKAGE_SMALL_ID,
+                            'name'   => DeliveryOptions::PACKAGE_TYPE_PACKAGE_SMALL_NAME,
+                            'schema' => 'order/dhlforyou/nl_package_small',
+                        ],
                     ],
                 ],
                 [

diff --git a/src/App/Order/Calculator/DhlForYou/DhlForYouShipmentOptionsCalculator.php b/src/App/Order/Calculator/DhlForYou/DhlForYouShipmentOptionsCalculator.php
@@ -65,5 +65,6 @@ private function calculateOptionsForCountry(): void
         $this->order->deliveryOptions->shipmentOptions->ageCheck        = TriStateService::DISABLED;
         $this->order->deliveryOptions->shipmentOptions->onlyRecipient   = TriStateService::DISABLED;
         $this->order->deliveryOptions->shipmentOptions->sameDayDelivery = TriStateService::DISABLED;
+        $this->order->deliveryOptions->shipmentOptions->tracked         = TriStateService::DISABLED;
     }
 }
diff --git a/...t__it_instantiates_carrier_from_external_identifier_with_data_set_default_carrier__1.json b/...t__it_instantiates_carrier_from_external_identifier_with_data_set_default_carrier__1.json
@@ -13,7 +13,7 @@
     "features": {
       "labelDescriptionLength": 45
     },
-    "packageTypes": ["package", "mailbox"],
+    "packageTypes": ["package", "mailbox", "package_small"],
     "shipmentOptions": {
       "ageCheck": true,
       "largeFormat": false,

diff --git a/..._instantiates_carrier_from_external_identifier_with_data_set_subscription_carrier__1.json b/..._instantiates_carrier_from_external_identifier_with_data_set_subscription_carrier__1.json
@@ -14,7 +14,7 @@
     "features": {
       "labelDescriptionLength": 45
     },
-    "packageTypes": ["package", "mailbox"],
+    "packageTypes": ["package", "mailbox", "package_small"],
     "shipmentOptions": {
       "ageCheck": true,
       "largeFormat": false,

diff --git a/tests/__snapshots__/CarrierTest__it_instantiates_carriers_from_name_with_(myparcel)__1.json b/tests/__snapshots__/CarrierTest__it_instantiates_carriers_from_name_with_(myparcel)__1.json
@@ -106,7 +106,7 @@
       "features": {
         "labelDescriptionLength": 45
       },
-      "packageTypes": ["package", "mailbox"],
+      "packageTypes": ["package", "mailbox", "package_small"],
       "shipmentOptions": {
         "ageCheck": true,
         "largeFormat": false,

diff --git a/tests/__snapshots__/PlatformManagerTest__it_gets_carriers_with_(myparcel)__1.json b/tests/__snapshots__/PlatformManagerTest__it_gets_carriers_with_(myparcel)__1.json
@@ -106,7 +106,7 @@
       "features": {
         "labelDescriptionLength": 45
       },
-      "packageTypes": ["package", "mailbox"],
+      "packageTypes": ["package", "mailbox", "package_small"],
       "shipmentOptions": {
         "ageCheck": true,
         "largeFormat": false,

diff --git a/...hots__/PlatformManagerTest__it_retrieves_config_for_each_platform_with_(myparcel)__1.json b/...hots__/PlatformManagerTest__it_retrieves_config_for_each_platform_with_(myparcel)__1.json
@@ -52,7 +52,7 @@
     {
       "name": "dhlforyou",
       "capabilities": {
-        "packageTypes": ["package", "mailbox"],
+        "packageTypes": ["package", "mailbox", "package_small"],
         "deliveryTypes": ["standard", "pickup"],
         "shipmentOptions": {
           "ageCheck": true,