MC:32658:MyAccount :: Order Details :: Order Details by Order Number Taxes and Discounts

- Added changes on taxes and related taxes tests

Author: avattam06

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

@@ -11,7 +11,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Api\Data\OrderExtensionInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 
 class OrderTotal implements ResolverInterface
@@ -35,9 +34,10 @@ public function resolve(
         $currency = $order->getOrderCurrencyCode();
         $extensionAttributes = $order->getExtensionAttributes();
 
-        $allAppliedTaxesForItemsData =  $this->getAllAppliedTaxesForItems(
-            $extensionAttributes->getItemAppliedTaxes() ?? []
+        $allAppliedTaxOnOrdersData =  $this->getAllAppliedTaxesOnOrders(
+            $extensionAttributes->getAppliedTaxes() ?? []
         );
+
         $appliedShippingTaxesForItemsData = $this->getAppliedShippingTaxesForItems(
             $extensionAttributes->getItemAppliedTaxes() ?? []
         );
@@ -47,7 +47,7 @@ public function resolve(
             'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' => $order->getTaxAmount(), 'currency' => $currency],
-            'taxes' => $this->getAppliedTaxesDetails($order, $allAppliedTaxesForItemsData),
+            'taxes' => $this->getAppliedTaxesDetails($order, $allAppliedTaxOnOrdersData),
             'discounts' => $this->getDiscountDetails($order),
             'total_shipping' => ['value' => $order->getShippingAmount(), 'currency' => $currency],
             'shipping_handling' => [
@@ -63,35 +63,33 @@ public function resolve(
                     'value' => $order->getShippingAmount(),
                     'currency' => $currency
                 ],
-                'taxes' => $this->getAppliedTaxesDetails($order, $appliedShippingTaxesForItemsData),
+                'taxes' => $this->getAppliedShippingTaxesDetails($order, $appliedShippingTaxesForItemsData),
                 'discounts' => $this->getShippingDiscountDetails($order),
             ]
         ];
     }
 
     /**
-     * Retrieve applied taxes that apply to items
+     * Retrieve applied taxes that apply to the order
      *
-     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $itemAppliedTaxes
+     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $appliedTaxes
      * @return array
      */
-    private function getAllAppliedTaxesForItems(array $itemAppliedTaxes): array
+    private function getAllAppliedTaxesOnOrders(array $appliedTaxes): array
     {
-        $allAppliedTaxesForItemsData = [];
-        foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
-            foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
-                $allAppliedTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
-                    'title' => $taxLineItem->getDataByKey('title'),
-                    'percent' => $taxLineItem->getDataByKey('percent'),
-                    'amount' => $taxLineItem->getDataByKey('amount'),
-                ];
-            }
+        $allAppliedTaxOnOrdersData = [];
+        foreach ($appliedTaxes as $taxIndex => $appliedTaxesData) {
+            $allAppliedTaxOnOrdersData[$taxIndex][$taxIndex] = [
+                'title' => $appliedTaxesData->getDataByKey('title'),
+                'percent' => $appliedTaxesData->getDataByKey('percent'),
+                'amount' => $appliedTaxesData->getDataByKey('amount'),
+            ];
         }
-        return $allAppliedTaxesForItemsData;
+        return $allAppliedTaxOnOrdersData;
     }
 
     /**
-     * Retrieve applied taxes that apply to shipping
+     * Retrieve applied shipping taxes on items for the orders
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface $itemAppliedTaxes
      * @return array
@@ -100,9 +98,10 @@ private function getAppliedShippingTaxesForItems(array $itemAppliedTaxes): array
     {
         $appliedShippingTaxesForItemsData = [];
         foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
-            foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
-                if ($appliedTaxForItem->getType() === "shipping") {
-                    $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
+            if ($appliedTaxForItem->getType() === "shipping") {
+                foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
+                    $taxItemIndexTitle = $taxLineItem->getDataByKey('title');
+                    $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndexTitle] = [
                         'title' => $taxLineItem->getDataByKey('title'),
                         'percent' => $taxLineItem->getDataByKey('percent'),
                         'amount' => $taxLineItem->getDataByKey('amount')
@@ -181,4 +180,32 @@ private function getAppliedTaxesDetails(OrderInterface $order, array $appliedTax
         }
         return $taxes;
     }
+
+    /**
+     * Returns taxes applied to the current order
+     *
+     * @param OrderInterface $order
+     * @param array $appliedShippingTaxesForItemsData
+     * @return array
+     */
+    private function getAppliedShippingTaxesDetails(OrderInterface $order, array $appliedShippingTaxesForItemsData): array
+    {
+        $shippingTaxes = [];
+        foreach ($appliedShippingTaxesForItemsData  as $appliedTaxesKeyIndex => $appliedShippingTaxes) {
+            foreach ($appliedShippingTaxes as $key => $appliedShippingTax) {
+                $appliedShippingTaxesArray = [
+                    'title' => $appliedShippingTax['title'] ?? null,
+                    'amount' => [
+                        'value' => $appliedShippingTax['amount'] ?? 0,
+                        'currency' => $order->getOrderCurrencyCode()
+                    ],
+                ];
+                if (!empty($appliedShippingTax)) {
+                    $appliedShippingTaxesArray['rate'] = $appliedShippingTax['percent'] ?? 0;
+                }
+                $shippingTaxes[] = $appliedShippingTaxesArray;
+            }
+        }
+        return $shippingTaxes;
+    }
 }

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

@@ -168,8 +168,8 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
      */
     private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [2.7, 1.35];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [4.05];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
@@ -744,8 +744,8 @@ public function testCustomerOrderWithTaxesExcludedOnShipping()
      */
     private function assertTotalsAndShippingWithExcludedTaxSetting($customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [1.5, 0.75];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [2.25];
 
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
@@ -819,8 +819,8 @@ public function testCustomerOrderWithTaxesIncludedOnShippingAndTotals()
      */
     private function assertTotalsAndShippingWithTaxes(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [1.5, 0.75];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [2.25];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);

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

@@ -163,8 +163,8 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
      */
     private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [4.05, 1.35];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [5.4];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);