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

cpartica · cpartica · commit 91dbe14fade3 · 2020-06-19T10:00:46.000-05:00
- fix static
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
@@ -34,7 +34,7 @@ public function resolve(
         }
 
         if (!(($value['order'] ?? null) instanceof OrderInterface)) {
-                throw new LocalizedException(__('"order" value should be specified'));
+            throw new LocalizedException(__('"order" value should be specified'));
         }
 
         /** @var OrderInterface $orderModel */
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoices.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoices.php
@@ -12,7 +12,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\Data\InvoiceInterface as Invoice;
+use Magento\Sales\Api\Data\InvoiceInterface;
 
 /**
  * Resolver for Invoice
@@ -36,7 +36,7 @@ public function resolve(
         /** @var OrderInterface $orderModel */
         $orderModel = $value['model'];
         $invoices = [];
-        /** @var Invoice $invoice */
+        /** @var InvoiceInterface $invoice */
         foreach ($orderModel->getInvoiceCollection() as $invoice) {
             $invoices[] = [
                 'id' => base64_encode($invoice->getEntityId()),
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
@@ -137,6 +137,7 @@ private function fetch()
                 'product_sku' => $orderItem->getSku(),
                 'product_url_key' => $associatedProduct ? $associatedProduct->getUrlKey() : null,
                 'product_type' => $orderItem->getProductType(),
+                'status' => $orderItem->getStatus(),
                 'discounts' => $this->getDiscountDetails($associatedOrder, $orderItem),
                 'product_sale_price' => [
                     'value' => $orderItem->getPrice(),
@@ -224,7 +225,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn
             $discounts = [];
         } else {
             $discounts [] = [
-                'label' => $associatedOrder->getDiscountDescription() ?? "null",
+                'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
                 'amount' => [
                     'value' => $orderItem->getDiscountAmount() ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -35,8 +35,12 @@ public function resolve(
         $currency = $order->getOrderCurrencyCode();
         $extensionAttributes = $order->getExtensionAttributes();
 
-        $allAppliedTaxesForItemsData =  $this->getAllAppliedTaxesForItemsData($extensionAttributes);
-        $appliedShippingTaxesForItemsData = $this->getAppliedShippingTaxesForItemsData($extensionAttributes);
+        $allAppliedTaxesForItemsData =  $this->getAllAppliedTaxesForItems(
+            $extensionAttributes->getItemAppliedTaxes() ?? []
+        );
+        $appliedShippingTaxesForItemsData = $this->getAppliedShippingTaxesForItems(
+            $extensionAttributes->getItemAppliedTaxes() ?? []
+        );
 
         return [
             'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $currency],
@@ -66,13 +70,15 @@ public function resolve(
     }
 
     /**
-     * @param OrderExtensionInterface $extensionAttributes
+     * Retrieve applied taxes that apply to items
+     *
+     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $itemAppliedTaxes
      * @return array
      */
-    private function getAllAppliedTaxesForItemsData(OrderExtensionInterface $extensionAttributes): array
+    private function getAllAppliedTaxesForItems(array $itemAppliedTaxes): array
     {
         $allAppliedTaxesForItemsData = [];
-        foreach ($extensionAttributes->getItemAppliedTaxes() ?? [] as $taxItemIndex => $appliedTaxForItem) {
+        foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
             foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
                 $allAppliedTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
                     'title' => $taxLineItem->getDataByKey('title'),
@@ -85,13 +91,15 @@ private function getAllAppliedTaxesForItemsData(OrderExtensionInterface $extensi
     }
 
     /**
-     * @param OrderExtensionInterface $extensionAttributes
+     * Retrieve applied taxes that apply to shipping
+     *
+     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface $extensionAttributes
      * @return array
      */
-    private function getAppliedShippingTaxesForItemsData(OrderExtensionInterface $extensionAttributes): array
+    private function getAppliedShippingTaxesForItems(array $itemAppliedTaxes): array
     {
         $appliedShippingTaxesForItemsData = [];
-        foreach ($extensionAttributes->getItemAppliedTaxes() ?? [] as $taxItemIndex => $appliedTaxForItem) {
+        foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
             foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
                 if ($appliedTaxForItem->getType() === "shipping") {
                     $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -164,7 +164,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
             $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']
         );
         $this->assertEquals(
-            'null',
+            'Discount',
             $customerOrderResponse[0]['items'][0]['discounts'][0]['label']
         );
         $customerOrderItem = $customerOrderResponse[0];
@@ -204,7 +204,7 @@ private function assertTotalsWithTaxesAndDiscounts2(array $customerOrderItemTota
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'null'
+                        'label' => 'Discount'
                     ]
                 ],
                 'taxes'=> [
@@ -217,7 +217,7 @@ private function assertTotalsWithTaxesAndDiscounts2(array $customerOrderItemTota
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => -6, 'currency' =>'USD'],
-                    'label' => 'null'
+                    'label' => 'Discount'
                 ]
             ]
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -19,7 +19,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class RetrieveOrdersWithBundleProductByOrderNumberTest
+ * Test for orders that have a bundle product
  */
 class RetrieveOrdersWithBundleProductByOrderNumberTest extends GraphQlAbstract
 {
@@ -155,7 +155,7 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
         $this->assertEquals('simple1', $childItemsInTheOrder[0]['values'][0]['product_sku']);
         $this->assertEquals('simple2', $childItemsInTheOrder[1]['values'][0]['product_sku']);
 
-        //$this->assertTotalsOnBundleProductWithTaxesAndDiscounts($customerOrderItems);
+        $this->assertTotalsOnBundleProductWithTaxesAndDiscounts($customerOrderItems);
         $this->assertTotalsOnBundleProductWithTaxesAndDiscounts2($customerOrderItems['total']);
         $this->deleteOrder();
     }
@@ -187,28 +187,28 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts2(array $custom
             'total_tax' => ['value' => 5.4, 'currency' =>'USD'],
             'total_shipping' => ['value' => 20, 'currency' =>'USD'],
             'shipping_handling' => [
-            'amount_including_tax' => ['value' => 21.5],
-            'amount_excluding_tax' => ['value' => 20],
-            'total_amount' => ['value' => 20],
-            'discounts' => [
-              0 => ['amount'=>['value'=>2],
-                  'label' => 'null'
-                  ]
+                'amount_including_tax' => ['value' => 21.5],
+                'amount_excluding_tax' => ['value' => 20],
+                'total_amount' => ['value' => 20],
+                'discounts' => [
+                    0 => ['amount'=>['value'=>2],
+                        'label' => 'Discount'
+                    ]
                 ],
-            'taxes'=> [
-              0 => [
-                    'amount'=>['value' => 1.35],
-                    'title' => 'US-TEST-*-Rate-1',
-                    'rate' => 7.5
-               ]
+                'taxes'=> [
+                    0 => [
+                        'amount'=>['value' => 1.35],
+                        'title' => 'US-TEST-*-Rate-1',
+                        'rate' => 7.5
+                    ]
+                ]
+            ],
+            'discounts' => [
+                0 => ['amount' => [ 'value' => -8, 'currency' =>'USD'],
+                    'label' => 'Discount'
+                ]
             ]
-        ],
-        'discounts' => [
-              0 => ['amount' => [ 'value' => -8, 'currency' =>'USD'],
-                    'label' => 'null'
-              ]
-        ]
-      ];
+        ];
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
     }
 
@@ -306,7 +306,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
             $customerOrderItem['total']['shipping_handling']['discounts'][0]['amount']['value']
         );
         $this->assertEquals(
-            'null',
+            'Discount',
             $customerOrderItem['total']['shipping_handling']['discounts'][0]['label']
         );
         $this->assertEquals(
@@ -318,7 +318,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
             $customerOrderItem['total']['discounts'][0]['amount']['currency']
         );
         $this->assertEquals(
-            'null',
+            'Discount',
             $customerOrderItem['total']['discounts'][0]['label']
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function resolve(`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (!(($value['order'] ?? null) instanceof OrderInterface)) {`
`37`		`- throw new LocalizedException(__('"order" value should be specified'));`
	`37`	`+ throw new LocalizedException(__('"order" value should be specified'));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/** @var OrderInterface $orderModel */`