MC-20636: Order Details :: Order Details by Order Number

- add support for bundle

Author: cpartica

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

@@ -18,7 +18,7 @@ public function resolveType(array $data): string
     {
         if (isset($data['product_type'])) {
             if ($data['product_type'] == 'bundle') {
-                return 'OrderItemBundle';
+                return 'BundleOrderItem';
             }
         }
         return 'OrderItem';

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php

@@ -129,25 +129,50 @@ private function fetch()
             /** @var OrderInterface $associatedOrder */
             $associatedOrder = $orderList[$orderItem->getOrderId()];
             $itemOptions = $this->optionsProcessor->getItemOptions($orderItem);
-            $this->orderItemList[$orderItem->getItemId()] = [
-                'id' => base64_encode($orderItem->getItemId()),
-                'product_name' => $orderItem->getName(),
-                'product_sku' => $orderItem->getSku(),
-                'product_url_key' => $associatedProduct ? $associatedProduct->getUrlKey() : null,
-                'product_type' => $orderItem->getProductType(),
-                'product_sale_price' => [
-                    'value' => $orderItem->getPrice(),
-                    'currency' => $associatedOrder->getOrderCurrencyCode()
-                ],
-                'selected_options' => $itemOptions['selected_options'],
-                'entered_options' => $itemOptions['entered_options'],
-                'quantity_ordered' => $orderItem->getQtyOrdered(),
-                'quantity_shipped' => $orderItem->getQtyShipped(),
-                'quantity_refunded' => $orderItem->getQtyRefunded(),
-                'quantity_invoiced' => $orderItem->getQtyInvoiced(),
-                'quantity_canceled' => $orderItem->getQtyCanceled(),
-                'quantity_returned' => $orderItem->getQtyReturned()
-            ];
+
+            if (!$orderItem->getParentItem()) {
+                $this->orderItemList[$orderItem->getItemId()] = [
+                    'id' => base64_encode($orderItem->getItemId()),
+                    'product_name' => $orderItem->getName(),
+                    'product_sku' => $orderItem->getSku(),
+                    'product_url_key' => $associatedProduct ? $associatedProduct->getUrlKey() : null,
+                    'product_type' => $orderItem->getProductType(),
+                    'product_sale_price' => [
+                        'value' => $orderItem->getPrice(),
+                        'currency' => $associatedOrder->getOrderCurrencyCode()
+                    ],
+                    'selected_options' => $itemOptions['selected_options'],
+                    'entered_options' => $itemOptions['entered_options'],
+                    'quantity_ordered' => $orderItem->getQtyOrdered(),
+                    'quantity_shipped' => $orderItem->getQtyShipped(),
+                    'quantity_refunded' => $orderItem->getQtyRefunded(),
+                    'quantity_invoiced' => $orderItem->getQtyInvoiced(),
+                    'quantity_canceled' => $orderItem->getQtyCanceled(),
+                    'quantity_returned' => $orderItem->getQtyReturned(),
+                ];
+            } else {
+                // case where
+                $this->orderItemList[$orderItem->getParentItemId()]['child_items'][$orderItem->getItemId()] = [
+                    'id' => base64_encode($orderItem->getItemId()),
+                    'product_name' => $orderItem->getName(),
+                    'product_sku' => $orderItem->getSku(),
+                    'product_url_key' => $associatedProduct ? $associatedProduct->getUrlKey() : null,
+                    'product_type' => $orderItem->getProductType(),
+                    'product_sale_price' => [
+                        'value' => $orderItem->getPrice(),
+                        'currency' => $associatedOrder->getOrderCurrencyCode()
+                    ],
+                    'selected_options' => $itemOptions['selected_options'],
+                    'entered_options' => $itemOptions['entered_options'],
+                    'quantity_ordered' => $orderItem->getQtyOrdered(),
+                    'quantity_shipped' => $orderItem->getQtyShipped(),
+                    'quantity_refunded' => $orderItem->getQtyRefunded(),
+                    'quantity_invoiced' => $orderItem->getQtyInvoiced(),
+                    'quantity_canceled' => $orderItem->getQtyCanceled(),
+                    'quantity_returned' => $orderItem->getQtyReturned(),
+                ];
+            }
+
         }
 
         return $this->orderItemList;

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php

@@ -7,13 +7,29 @@
 
 namespace Magento\SalesGraphQl\Model\Resolver\OrderItem;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Api\Data\OrderItemInterface;
 
 /**
  * Process order item options to format for GraphQl output
  */
 class OptionsProcessor
 {
+    /**
+     * Serializer
+     *
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @param Json $serializer
+     */
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
     /**
      * Get Order item options.
      *
@@ -82,4 +98,23 @@ private function processAttributesInfo(array $attributesInfo): array
         }
         return ['selected_options' => $selectedOptions, 'entered_options' => []];
     }
+
+    /**
+     * TODO: use this method for bundle options
+     *
+     * @param mixed $item
+     * @return mixed|null
+     */
+    public function getSelectionAttributes($item)
+    {
+        if ($item instanceof \Magento\Sales\Model\Order\Item) {
+            $options = $item->getProductOptions();
+        } else {
+            $options = $item->getOrderItem()->getProductOptions();
+        }
+        if (isset($options['bundle_selection_attributes'])) {
+            return $this->serializer->unserialize($options['bundle_selection_attributes']);
+        }
+        return null;
+    }
 }

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

@@ -60,7 +60,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $parentOrder = $value['model'];
         $orderItemIds = [];
         foreach ($parentOrder->getItems() as $item) {
-            $orderItemIds[] = (int)$item->getItemId();
+            if ((!$item->getParentItemId())) {
+                $orderItemIds[] = (int)$item->getItemId();
+            }
             $this->orderItemProvider->addOrderItemId((int)$item->getItemId());
         }