Merge pull request #623 from postnl/feature/POSTNL-149-restapi-shippi…

…ng-extension

POSTNL-149 - Latest magento support as it changes orderId to order

Plugin/Shipment/ShippingBuilder.php

@@ -65,4 +65,15 @@ public function afterSetOrderId(
         $this->orderId = (int)$orderId;
         return $result;
     }
+
+    public function afterSetOrder(
+        SubjectClass $subject,
+        $result,
+        $order
+    ) {
+        if ($order) {
+            $this->orderId = $order->getId();
+        }
+        return $result;
+    }
 }