fix(orders): fix contract ids being ignored on export

myparcelnl · Feb 14, 2024 · 35028f6 · 35028f6
1 parent 259b0f8
commit 35028f6
Show file tree

Hide file tree

Showing 30 changed files with 84 additions and 2 deletions.
diff --git a/src/Fulfilment/Request/PostOrdersRequest.php b/src/Fulfilment/Request/PostOrdersRequest.php
@@ -128,6 +128,7 @@ private function getShipment(Order $order): array
 
         return [
             'carrier'             => $shipment->carrier,
+            'contract_id'         => $shipment->contractId ? (int) $shipment->contractId : null,
             'customs_declaration' => $this->encodeCustomsDeclaration($shipment),
             'drop_off_point'      => $shipment->dropOffPoint
                 ? $shipment->dropOffPoint->toArray(Arrayable::ENCODED)

diff --git a/src/Shipment/Request/PostShipmentsRequest.php b/src/Shipment/Request/PostShipmentsRequest.php
@@ -92,6 +92,9 @@ protected function encodeShipment(Shipment $shipment): array
     {
         return Utils::filterNull([
             'carrier'              => $shipment->carrier->id,
+            'contract_id'          => $shipment->carrier->subscriptionId
+                ? (int) $shipment->carrier->subscriptionId
+                : null,
             'customs_declaration'  => $this->encodeCustomsDeclaration($shipment),
             'drop_off_point'       => $this->getDropOffPoint($shipment),
             'general_settings'     => [

diff --git a/tests/Datasets/pdkOrdersToNl.php b/tests/Datasets/pdkOrdersToNl.php
@@ -34,7 +34,11 @@
     'carrier dhl for you' => function () {
         return factory(PdkOrderCollection::class)->push(
             factory(PdkOrder::class)
-                ->withDeliveryOptions(factory(DeliveryOptions::class)->withCarrier(Carrier::CARRIER_DHL_FOR_YOU_NAME))
+                ->withDeliveryOptions(
+                    factory(DeliveryOptions::class)->withCarrier(
+                        sprintf('%s:1234', Carrier::CARRIER_DHL_FOR_YOU_NAME)
+                    )
+                )
         );
     },
 

diff --git a/tests/Unit/Shipment/Repository/CreateConceptsTest.php b/tests/Unit/Shipment/Repository/CreateConceptsTest.php
@@ -98,6 +98,22 @@ function (ShipmentCollectionFactory $shipmentCollectionFactory) {
             );
         },
     ],
+    'subscription carrier'                        => [
+        'input' => function () {
+            return factory(ShipmentCollection::class)->push(
+                factory(Shipment::class)
+                    ->withCarrier(
+                        factory(Carrier::class)
+                            ->withId(Carrier::CARRIER_POSTNL_ID)
+                            ->withSubscriptionId(1234)
+                            ->withCapabilities(
+                                factory(CarrierCapabilities::class)->withEverything()
+                            )
+                    )
+                    ->withRecipient(DEFAULT_INPUT_RECIPIENT)
+            );
+        },
+    ],
     'address with address1 and address2 combined' => [
         'input' => function () {
             return factory(ShipmentCollection::class)->push(

diff --git a/...tes_a_valid_request_from_a_shipment_collection_with_data_set_subscription_carrier__1.json b/...tes_a_valid_request_from_a_shipment_collection_with_data_set_subscription_carrier__1.json
@@ -0,0 +1,22 @@
+[
+  {
+    "carrier": 1,
+    "contract_id": 1234,
+    "general_settings": {
+      "save_recipient_address": 0
+    },
+    "options": {
+      "package_type": 1,
+      "delivery_type": 2
+    },
+    "physical_properties": {
+      "weight": 0
+    },
+    "recipient": {
+      "cc": "NL",
+      "city": "Hoofddorp",
+      "person": "Jaap Krekel",
+      "postal_code": "2132JE"
+    }
+  }
+]
diff --git a/...er_with_data_set_default__data_set_export_age_check__data_set_carrier_dhl_for_you__1.json b/...er_with_data_set_default__data_set_export_age_check__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...er_with_data_set_default__data_set_export_insurance__data_set_carrier_dhl_for_you__1.json b/...er_with_data_set_default__data_set_export_insurance__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...with_data_set_default__data_set_export_large_format__data_set_carrier_dhl_for_you__1.json b/...with_data_set_default__data_set_export_large_format__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...th_data_set_default__data_set_export_only_recipient__data_set_carrier_dhl_for_you__1.json b/...th_data_set_default__data_set_export_only_recipient__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...order_with_data_set_default__data_set_export_return__data_set_carrier_dhl_for_you__1.json b/...order_with_data_set_default__data_set_export_return__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...er_with_data_set_default__data_set_export_signature__data_set_carrier_dhl_for_you__1.json b/...er_with_data_set_default__data_set_export_signature__data_set_carrier_dhl_for_you__1.json
@@ -3,6 +3,7 @@
     "shipments": [
       {
         "carrier": 9,
+        "contract_id": 1234,
         "general_settings": {
           "save_recipient_address": 0
         },

diff --git a/...with_data_set_order_mode__data_set_export_age_check__data_set_carrier_dhl_for_you__1.json b/...with_data_set_order_mode__data_set_export_age_check__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/..._order_with_data_set_order_mode__data_set_export_age_check__data_set_single_order__1.json b/..._order_with_data_set_order_mode__data_set_export_age_check__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...data_set_order_mode__data_set_export_age_check__data_set_various_delivery_options__1.json b/...data_set_order_mode__data_set_export_age_check__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...with_data_set_order_mode__data_set_export_insurance__data_set_carrier_dhl_for_you__1.json b/...with_data_set_order_mode__data_set_export_insurance__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/..._order_with_data_set_order_mode__data_set_export_insurance__data_set_single_order__1.json b/..._order_with_data_set_order_mode__data_set_export_insurance__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...data_set_order_mode__data_set_export_insurance__data_set_various_delivery_options__1.json b/...data_set_order_mode__data_set_export_insurance__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...h_data_set_order_mode__data_set_export_large_format__data_set_carrier_dhl_for_you__1.json b/...h_data_set_order_mode__data_set_export_large_format__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...der_with_data_set_order_mode__data_set_export_large_format__data_set_single_order__1.json b/...der_with_data_set_order_mode__data_set_export_large_format__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...a_set_order_mode__data_set_export_large_format__data_set_various_delivery_options__1.json b/...a_set_order_mode__data_set_export_large_format__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...data_set_order_mode__data_set_export_only_recipient__data_set_carrier_dhl_for_you__1.json b/...data_set_order_mode__data_set_export_only_recipient__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...r_with_data_set_order_mode__data_set_export_only_recipient__data_set_single_order__1.json b/...r_with_data_set_order_mode__data_set_export_only_recipient__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...set_order_mode__data_set_export_only_recipient__data_set_various_delivery_options__1.json b/...set_order_mode__data_set_export_only_recipient__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...er_with_data_set_order_mode__data_set_export_return__data_set_carrier_dhl_for_you__1.json b/...er_with_data_set_order_mode__data_set_export_return__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...rts_order_with_data_set_order_mode__data_set_export_return__data_set_single_order__1.json b/...rts_order_with_data_set_order_mode__data_set_export_return__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...th_data_set_order_mode__data_set_export_return__data_set_various_delivery_options__1.json b/...th_data_set_order_mode__data_set_export_return__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...with_data_set_order_mode__data_set_export_signature__data_set_carrier_dhl_for_you__1.json b/...with_data_set_order_mode__data_set_export_signature__data_set_carrier_dhl_for_you__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": 1234,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/..._order_with_data_set_order_mode__data_set_export_signature__data_set_single_order__1.json b/..._order_with_data_set_order_mode__data_set_export_signature__data_set_single_order__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...data_set_order_mode__data_set_export_signature__data_set_various_delivery_options__1.json b/...data_set_order_mode__data_set_export_signature__data_set_various_delivery_options__1.json
@@ -31,6 +31,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -93,6 +94,7 @@
         ],
         "shipment": {
           "carrier": 1,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {
@@ -156,6 +158,7 @@
         ],
         "shipment": {
           "carrier": 9,
+          "contract_id": null,
           "customs_declaration": null,
           "drop_off_point": null,
           "options": {

diff --git a/...ots__/PdkOrderTest__it_creates_a_storable_array_with_data_set_carrier_dhl_for_you__1.json b/...ots__/PdkOrderTest__it_creates_a_storable_array_with_data_set_carrier_dhl_for_you__1.json
@@ -3,7 +3,7 @@
     "exported": false,
     "deliveryOptions": {
       "carrier": {
-        "externalIdentifier": "dhlforyou"
+        "externalIdentifier": "dhlforyou:1234"
       },
       "labelAmount": 1,
       "shipmentOptions": {