Merge pull request #364 from magento-lynx/LYNX-892

LYNX-892: [AC-2.4.9] Introduce OrderTotal.grand_total_excl_tax field

Author: deepak-soni1

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

@@ -55,6 +55,7 @@ public function resolve(
                 'currency' => $order->getBaseCurrencyCode()
             ],
             'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
+            'grand_total_excl_tax' => ['value' => $this->getGrandTotalExclTax($order), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'subtotal_incl_tax' => ['value' => $order->getSubtotalInclTax(), 'currency' => $currency],
             'subtotal_excl_tax' => ['value' => $order->getSubtotal(), 'currency' => $currency],
@@ -217,4 +218,17 @@ private function getShippingDiscountDetails(OrderInterface $order): array
         }
         return $shippingDiscounts;
     }
+
+    /**
+     * Get grand total excluding tax
+     *
+     * @param OrderInterface $order
+     * @return float
+     */
+    private function getGrandTotalExclTax(OrderInterface $order): float
+    {
+        return (float) ($order->getSubtotal()
+            + $order->getShippingAmount()
+            - abs((float)$order->getDiscountAmount()));
+    }
 }

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

@@ -170,6 +170,7 @@ type OrderTotal @doc(description: "Contains details about the sales total amount
     shipping_handling: ShippingHandling @doc(description: "Details about the shipping and handling costs for the order.")
     subtotal_incl_tax: Money! @doc(description: "The subtotal of the order, including taxes.")
     subtotal_excl_tax: Money! @doc(description: "The subtotal of the order, excluding taxes.")
+    grand_total_excl_tax: Money! @doc(description: "The grand total of the order, excluding taxes.")
 }
 
 type Invoice @doc(description: "Contains invoice details.") {

app/code/Magento/Tax/Test/Fixture/TaxRate.php

@@ -1,14 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Tax\Test\Fixture;
 
 use Magento\Framework\DataObject;
 use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\TestFramework\Fixture\Api\DataMerger;
 use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
@@ -24,20 +25,19 @@ class TaxRate implements RevertibleDataFixtureInterface
         'zip_is_range' => null,
         'zip_from' => null,
         'zip_to' => null,
-        'titles' => [],
+        'titles' => []
     ];
 
     /**
-     * @var ServiceFactory
-     */
-    private ServiceFactory $serviceFactory;
-
-    /**
+     * TaxRate Constructor
+     *
      * @param ServiceFactory $serviceFactory
+     * @param DataMerger $dataMerger
      */
-    public function __construct(ServiceFactory $serviceFactory)
-    {
-        $this->serviceFactory = $serviceFactory;
+    public function __construct(
+        private readonly ServiceFactory $serviceFactory,
+        private readonly DataMerger $dataMerger
+    ) {
     }
 
     /**
@@ -46,10 +46,13 @@ public function __construct(ServiceFactory $serviceFactory)
     public function apply(array $data = []): ?DataObject
     {
         $service = $this->serviceFactory->create(TaxRateRepositoryInterface::class, 'save');
+        $data = $this->dataMerger->merge(
+            self::DEFAULT_DATA,
+            $data
+        );
+        $data['code'] = str_replace('%uniqid%', uniqid(), $data['code']);
 
-        return $service->execute([
-            'taxRate' => array_merge(self::DEFAULT_DATA, $data),
-        ]);
+        return $service->execute(['taxRate' => $data]);
     }
 
     /**