MC-20638: MyAccount :: Order Details :: Shipping Details by Order Number

Author: danielrenaud

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php

@@ -129,9 +129,13 @@ public function testOrderShipmentWithUpsCarrier()
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertEquals('UPS Next Day Air', $result['customer']['orders']['items'][0]['shipping_method']);
         $this->assertEquals('United Parcel Service', $result['customer']['orders']['items'][0]['carrier']);
-
         $shipments = $result['customer']['orders']['items'][0]['shipments'];
-        $this->assertCount(2, $shipments);
+        $expectedTracking = [
+            'title' => 'United Parcel Service',
+            'carrier' => 'ups',
+            'number' => '987654321'
+        ];
+        $this->assertEquals($expectedTracking, $shipments[0]['tracking'][0]);
     }
 
     /**

dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php

@@ -4,18 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
-use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Api\ShipOrderInterface;
 use Magento\Sales\Model\Order;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Framework\DB\Transaction;
+use Magento\Sales\Model\Order\ShipmentFactory;
 
 Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product.php');
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var ShipOrderInterface $shipOrder */
-$shipOrder = $objectManager->create(ShipOrderInterface::class);
+/** @var Transaction $transaction */
+$transaction = $objectManager->get(Transaction::class);
 /** @var Order $order */
 $order = $objectManager->create(Order::class)->loadByIncrementId('100000001');
 //Set the shipping method
@@ -26,31 +25,14 @@
 //Create Shipment with UPS tracking and some items
 $shipmentItems = [];
 foreach ($order->getItems() as $orderItem) {
-    if (count($shipmentItems) === 2) {
-        break;
-    }
-    /** @var ShipmentItemCreationInterface $shipmentItem */
-    $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
-    $shipmentItem->setOrderItemId($orderItem->getItemId());
-    $shipmentItem->setQty($orderItem->getQtyOrdered());
-    $shipmentItems[] = $shipmentItem;
+    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
 }
-/** @var ShipmentTrackCreationInterface $track */
-$track = $objectManager->create(ShipmentTrackCreationInterface::class);
-$track->setCarrierCode('ups');
-$track->setTitle('United Parcel Service');
-$track->setTrackNumber('987654321');
-$shipOrder->execute($order->getId(), $shipmentItems, false, false, null, [$track]);
+$tracking = [
+    'carrier_code' => 'ups',
+    'title' => 'United Parcel Service',
+    'number' => '987654321'
+];
 
-//Create second Shipment
-$shipmentItems = [];
-foreach ($order->getItems() as $orderItem) {
-    if ($orderItem->getQtyShipped() === 0) {
-        /** @var ShipmentItemCreationInterface $shipmentItem */
-        $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
-        $shipmentItem->setOrderItemId($orderItem->getItemId());
-        $shipmentItem->setQty($orderItem->getQtyOrdered());
-        $shipmentItems[] = $shipmentItem;
-    }
-}
-$shipOrder->execute($order->getId(), $shipmentItems);
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);
+$shipment->register();
+$transaction->addObject($shipment)->addObject($order)->save();