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

- add base64 encode
- fix static

Author: cpartica

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

@@ -29,7 +29,10 @@ public function __construct(array $productTypeNameResolvers = [])
     }
 
     /**
-     * @inheritdoc
+     * Resolve item type of an invoice through composite resolvers
+     *
+     * @param array $data
+     * @return string
      * @throws GraphQlInputException
      */
     public function resolveType(array $data): string

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

@@ -29,7 +29,10 @@ public function __construct(array $productTypeNameResolvers = [])
     }
 
     /**
-     * {@inheritdoc}
+     * Resolve item type of an order through composite resolvers
+     *
+     * @param array $data
+     * @return string
      * @throws GraphQlInputException
      */
     public function resolveType(array $data) : string

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

@@ -77,7 +77,7 @@ public function resolve(
             $orders[] = [
                 'created_at' => $order['created_at'],
                 'grand_total' => $order['grand_total'],
-                'id' => $order['entity_id'],
+                'id' => base64_encode($order['entity_id']),
                 'increment_id' => $order['increment_id'],
                 'number' => $order['increment_id'],
                 'order_date' => $order['created_at'],

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

@@ -41,7 +41,7 @@ public function resolve(
                 $index = $key;
                 $appliedTaxType = $appliedTaxForItem->getType();
                 $taxLineItems = $appliedTaxForItem->getAppliedTaxes();
-                foreach ($taxLineItems as $new => $taxLineItem) {
+                foreach ($taxLineItems as $taxLineItem) {
                     $allAppliedTaxesForItemsData[$key][$index]['title'] = $taxLineItem->getDataByKey('title');
                     $allAppliedTaxesForItemsData[$key][$index]['percent'] = $taxLineItem->getDataByKey('percent');
                     $allAppliedTaxesForItemsData[$key][$index]['amount'] = $taxLineItem->getDataByKey('amount');
@@ -136,7 +136,7 @@ private function getAppliedTaxesDetails(Order $order, array $appliedTaxesArray):
         if (empty($appliedTaxesArray)) {
             $taxes [] = [];
         } else {
-            foreach ($appliedTaxesArray as $key =>  $appliedTaxes) {
+            foreach ($appliedTaxesArray as $key => $appliedTaxes) {
                 if (empty($appliedTaxes[$key])) {
                     $taxes [] = [
                         'title' => $appliedTaxes[$key]['title'] ?? " ",

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

@@ -55,7 +55,7 @@ public function resolve(
         /** @var Order $order */
         foreach ($orders as $order) {
             $items[] = [
-                'id' => base64_encode($order->getId()),
+                'id' => $order->getId(),
                 'increment_id' => $order->getIncrementId(),
                 'order_number' => $order->getIncrementId(),
                 'created_at' => $order->getCreatedAt(),

app/code/Magento/SalesGraphQl/composer.json

@@ -8,7 +8,6 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-catalog": "*",
-        "magento/module-shipping": "*",
         "magento/module-graph-ql": "*"
     },
     "suggest": {

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

@@ -462,6 +462,7 @@ public function testGetMatchingOrdersForLowerQueryLength()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Sales/_files/orders_with_customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testGetMultipleCustomerOrdersQueryWithDefaultPagination()
     {
@@ -816,7 +817,8 @@ public function testGetCustomerOrdersTwoStoreViewQuery(string $orderNumber, stri
             $query,
             [],
             '',
-            array_merge($this->customerAuthenticationHeader->execute(
+            array_merge(
+                $this->customerAuthenticationHeader->execute(
                 $currentEmail, $currentPassword),
                 ['Store' => $store]
             )
@@ -924,24 +926,23 @@ private function assertTotalsWithTaxesAndDiscountsOnShippingAndTotal(array $cust
         $this->assertCount(2, $customerOrderItem['total']['taxes']);
         $expectedProductAndShippingTaxes =
             [
-               [
+                [
                     'amount' => [
-                            'value' => 2.7,
-                            'currency' => 'USD'
-                        ],
-                'title' => 'US-TEST-*-Rate-1',
-                'rate' => 7.5
-                ],
-               [
-                'amount' => [
-                    'value' => 1.35,
-                    'currency' => 'USD'
+                        'value' => 2.7,
+                        'currency' => 'USD',
+                    ],
+                    'title' => 'US-TEST-*-Rate-1',
+                    'rate' => 7.5,
                 ],
-
-                'title' => 'US-TEST-*-Rate-1',
-                'rate' => 7.5
-         ]
-];
+                [
+                    'amount' => [
+                        'value' => 1.35,
+                        'currency' => 'USD'
+                    ],
+                    'title' => 'US-TEST-*-Rate-1',
+                    'rate' => 7.5,
+                ]
+            ];
         $this->assertEquals($expectedProductAndShippingTaxes, $customerOrderItem['total']['taxes']);
         $this->assertEquals(
             21.5,
@@ -1377,7 +1378,8 @@ private function setPaymentMethod(string $cartId, array $method): void
         $currentEmail = '[email protected]';
         $currentPassword = 'password';
         $this->graphQlMutation(
-            $query, [],
+            $query,
+            [],
             '',
             $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
         );