shipments now completely serialized via JMS serializer

src/CoreShop/Bundle/CoreBundle/Resources/config/serializer/Model.OrderShipment.yml

@@ -0,0 +1,15 @@
+CoreShop\Component\Core\Model\OrderShipment:
+    exclusion_policy: ALL
+    xml_root_name: order_shipment
+    virtual_properties:
+        carrierName:
+            serialized_name: carrierName
+            exp: 'object.getCarrier() != null ? object.getCarrier().getIdentifier() : null'
+            type: string
+            groups: [Detailed]
+        weight:
+            serialized_name: weight
+            exp: object.getWeight()
+            type: double
+            groups: [Detailed]
+

src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php

@@ -332,11 +332,6 @@ protected function getShipments($order)
         foreach ($shipments as $shipment) {
             $data = $this->getSerializer()->toArray($shipment);
 
-            //This should be in CoreBundle, but for BC reasons, we keep it here
-            if (method_exists($shipment, 'getCarrier')) {
-                $data['carrierName'] = $shipment->getCarrier()->getTitle();
-            }
-
             $availableTransitions = $this->getWorkflowStateManager()->parseTransitions($shipment, 'coreshop_shipment', [
                 'create',
                 'ship',

src/CoreShop/Bundle/OrderBundle/Resources/config/serializer/Model.OrderShipment.yml

@@ -0,0 +1,39 @@
+CoreShop\Component\Order\Model\OrderShipment:
+    exclusion_policy: ALL
+    xml_root_name: order_shipment
+    virtual_properties:
+        o_id:
+            serialized_name: o_id
+            exp: object.getId()
+            type: integer
+            groups: [Detailed]
+        documentType:
+            serialized_name: documentType
+            exp: object.getDocumentType()
+            type: string
+            groups: [Detailed]
+        shipmentDate:
+            serialized_name: invoiceDate
+            exp: object.getShipmentDate()
+            type: integer
+            groups: [Detailed]
+        documentDate:
+            serialized_name: documentDate
+            exp: object.getDocumentDate()
+            type: integer
+            groups: [Detailed]
+        shipmentNumber:
+            serialized_name: shipmentNumber
+            exp: object.getShipmentNumber()
+            type: string
+            groups: [Detailed]
+        trackingCode:
+            serialized_name: trackingCode
+            exp: object.getTrackingCode()
+            type: integer
+            groups: [Detailed]
+        items:
+            serialized_name: items
+            exp: object.getItems()
+            type: array
+            groups: [Detailed]

src/CoreShop/Bundle/OrderBundle/Resources/config/serializer/Model.OrderShipmentItem.yml

@@ -0,0 +1,14 @@
+CoreShop\Component\Order\Model\OrderShipmentItem:
+    exclusion_policy: ALL
+    xml_root_name: order_shipment_item
+    virtual_properties:
+        _itemName:
+            serialized_name: _itemName
+            exp: 'object.getOrderItem() != null ? object.getOrderItem().getName() : null'
+            type: string
+            groups: [Detailed]
+        name:
+            serialized_name: name
+            exp: 'object.getOrderItem() != null ? object.getOrderItem().getName() : null'
+            type: string
+            groups: [Detailed]