Merge remote-tracking branch 'origin/MC-20638-shipments' into 241-customer-orders

Author: danielrenaud

app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Order\Shipment;
+
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\SalesGraphQl\Model\Shipment\Item\ShipmentItemFormatter;
+use Magento\SalesGraphQl\Model\Shipment\Item\FormatterInterface;
+
+/**
+ * Format Bundle shipment items for GraphQl output
+ */
+class BundleShipmentItemFormatter implements FormatterInterface
+{
+    /**
+     * @var ShipmentItemFormatter
+     */
+    private $itemFormatter;
+
+    /**
+     * @param ShipmentItemFormatter $itemFormatter
+     */
+    public function __construct(ShipmentItemFormatter $itemFormatter)
+    {
+        $this->itemFormatter = $itemFormatter;
+    }
+
+    /**
+     * Format bundle product shipment item
+     *
+     * @param ShipmentInterface $shipment
+     * @param ShipmentItemInterface $item
+     * @return array|null
+     */
+    public function formatShipmentItem(ShipmentInterface $shipment, ShipmentItemInterface $item): ?array
+    {
+        $orderItem = $item->getOrderItem();
+        $shippingType = $orderItem->getProductOptions()['shipment_type'] ?? null;
+        if ($shippingType == AbstractType::SHIPMENT_SEPARATELY && !$orderItem->getParentItemId()) {
+            //When bundle items are shipped separately the children are treated as their own items
+            return null;
+        }
+        return $this->itemFormatter->formatShipmentItem($shipment, $item);
+    }
+}

app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php renamed to app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver;
+namespace Magento\BundleGraphQl\Model\Resolver\Order\Item;
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -15,6 +15,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
 
 /**
  * Resolve bundle options items for order item
@@ -59,8 +60,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 $item = $value['model'];
                 return $this->getBundleOptions($item, $value);
             }
-            if ($value['model'] instanceof InvoiceItemInterface) {
-                /** @var InvoiceItemInterface $item */
+            if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
+                /** @var InvoiceItemInterface|ShipmentItemInterface $item */
                 $item = $value['model'];
                 // Have to pass down order and item to map to avoid refetching all data
                 return $this->getBundleOptions($item->getOrderItem(), $value);

app/code/Magento/BundleGraphQl/composer.json

@@ -10,6 +10,8 @@
         "magento/module-quote": "*",
         "magento/module-quote-graph-ql": "*",
         "magento/module-store": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-graph-ql": "*",
         "magento/framework": "*"
     },
     "license": [

app/code/Magento/BundleGraphQl/etc/graphql/di.xml

@@ -65,4 +65,32 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleOrderItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleInvoiceItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleShipmentItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\Shipment\ItemProvider">
+        <arguments>
+            <argument name="formatters" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\BundleGraphQl\Model\Order\Shipment\BundleShipmentItemFormatter\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/BundleGraphQl/etc/schema.graphqls

@@ -87,3 +87,29 @@ enum ShipBundleItemsEnum @doc(description: "This enumeration defines whether bun
     TOGETHER
     SEPARATELY
 }
+
+type BundleOrderItem implements OrderItemInterface {
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type BundleInvoiceItem implements InvoiceItemInterface{
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type BundleShipmentItem implements ShipmentItemInterface {
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
+    id: ID! @doc(description: "The unique identifier of the option")
+    label: String! @doc(description: "The label of the option")
+    values: [ItemSelectedBundleOptionValue] @doc(description: "A list of products that represent the values of the parent option")
+}
+
+type ItemSelectedBundleOptionValue @doc(description: "A list of values for the selected bundle product") {
+    id: ID! @doc(description: "The unique identifier of the value")
+    product_name: String! @doc(description: "The name of the child bundle product")
+    product_sku: String! @doc(description: "The SKU of the child bundle product")
+    quantity: Float! @doc(description: "Indicates how many of this bundle product were ordered")
+    price: Money! @doc(description: "The price of the child bundle product")
+}

app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver\OrderItem;
+namespace Magento\SalesGraphQl\Model\OrderItem;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;

app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver\OrderItem;
+namespace Magento\SalesGraphQl\Model\OrderItem;
 
 use Magento\Sales\Api\Data\OrderItemInterface;