Merge remote-tracking branch 'origin/MC-20636-bundle' into MC-20637

Author: Prabhu Ram

app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php

@@ -16,7 +16,9 @@
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
 use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * Resolve bundle options items for order item
@@ -70,24 +72,34 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             if (!isset($value['model']) || !($value['model'] instanceof OrderItemInterface)) {
                 throw new LocalizedException(__('"model" value should be specified'));
             }
-            /** @var OrderItemInterface $orderItem */
-            $orderItem = $value['model'];
-            return $this->getBundleOptions($orderItem);
+            /** @var ExtensibleDataInterface $item */
+            $item = $value['model'];
+            return $this->getBundleOptions($item);
         });
     }
 
 
     /**
      * Format bundle options and values from a parent bundle order item
      *
-     * @param OrderItemInterface $item
+     * @param ExtensibleDataInterface $item
      * @return array
      */
-    private function getBundleOptions(OrderItemInterface $item): array
+    private function getBundleOptions(ExtensibleDataInterface $item): array
     {
         $bundleOptions = [];
         if ($item->getProductType() === 'bundle') {
-            $options = $item->getProductOptions();
+            $options = [];
+            if ($item instanceof OrderItemInterface) {
+                $options = $item->getProductOptions();
+            } elseif  ($item instanceof InvoiceItemInterface) {
+                $orderItemArray = $this->orderItemProvider
+                    ->getOrderItemById((int)$item->getOrderItemId());
+                /** @var OrderItemInterface $orderItem */
+                $orderItem = $orderItemArray['model'];
+                $options = $orderItem->getProductOptions();
+            }
+
             if (isset($options['bundle_options'])) {
                 //loop through options
                 foreach ($options['bundle_options'] as $bundleOptionKey => $bundleOption) {

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

@@ -87,7 +87,8 @@ type BundleOrderItem implements OrderItemInterface {
 }
 
 type SelectedBundleOptionItems {
-    label: String!
+    id: ID! @doc(description: "The unique identifier of the option")
+    label: String! @doc(description: "The label of the option")
     items: [OrderItem] @doc(description: "A list of products that represent the values of the parent option")
 }
 
@@ -139,8 +140,7 @@ type InvoiceItem implements InvoiceItemInterface {
 }
 
 type BundleInvoiceItem implements InvoiceItemInterface {
-    bundle_options: [SelectedBundleOptionItems]
-    child_items: [InvoiceItemInterface] @doc(description: "A list of child products that are assigned to the bundle product")
+    bundle_options: [SelectedBundleOptionItems] @doc(description: "A list of bundle options that are assigned to the bundle product")
 }
 
 type InvoiceTotal implements SalesTotalAmountInterface @doc(description: "Invoice total amount details") {