Merge remote-tracking branch 'magento-l3/ACP2E-1769' into JUN062023_PR_sarmistha

Author: glo23503

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

@@ -14,6 +14,8 @@
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Data provider for order items
@@ -45,6 +47,11 @@ class DataProvider
      */
     private $optionsProcessor;
 
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
     /**
      * @var int[]
      */
@@ -61,19 +68,22 @@ class DataProvider
      * @param OrderRepositoryInterface $orderRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param OptionsProcessor $optionsProcessor
+     * @param TaxHelper|null $taxHelper
      */
     public function __construct(
         OrderItemRepositoryInterface $orderItemRepository,
         ProductRepositoryInterface $productRepository,
         OrderRepositoryInterface $orderRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        OptionsProcessor $optionsProcessor
+        OptionsProcessor $optionsProcessor,
+        ?TaxHelper $taxHelper = null
     ) {
         $this->orderItemRepository = $orderItemRepository;
         $this->productRepository = $productRepository;
         $this->orderRepository = $orderRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->optionsProcessor = $optionsProcessor;
+        $this->taxHelper = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
     }
 
     /**
@@ -140,7 +150,9 @@ private function fetch()
                 'status' => $orderItem->getStatus(),
                 'discounts' => $this->getDiscountDetails($associatedOrder, $orderItem),
                 'product_sale_price' => [
-                    'value' => $orderItem->getPrice(),
+                    'value' => $this->taxHelper->displaySalesPriceInclTax($associatedOrder->getStoreId())
+                        ? $orderItem->getPriceInclTax()
+                        : $orderItem->getPrice(),
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ],
                 'selected_options' => $itemOptions['selected_options'],

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

@@ -28,6 +28,8 @@
 use Magento\Quote\Test\Fixture\CustomerCart;
 use Magento\TestFramework\Fixture\DataFixtureStorage;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\TestFramework\Fixture\Config;
 
 /**
  * Class RetrieveOrdersTest
@@ -107,6 +109,9 @@ public function testGetCustomerOrdersSimpleProductQuery()
         $this->assertEquals($expectedOrderTotal, $actualOrderTotalFromResponse, 'Totals do not match');
     }
 
+    #[
+        Config(TaxConfig::XML_PATH_DISPLAY_SALES_PRICE, TaxConfig::DISPLAY_TYPE_INCLUDING_TAX),
+    ]
     /**
      *  Verify the customer order with tax, discount with shipping tax class set for calculation setting
      *
@@ -168,6 +173,8 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
             ]
         ];
         $this->assertResponseFields($customerOrderResponse[0]["payment_methods"], $paymentMethodAssertionMap);
+        $this->assertEquals(10.75, $customerOrderResponse[0]['items'][0]['product_sale_price']['value']);
+        $this->assertEquals(7.5, $customerOrderResponse[0]['total']['taxes'][0]['rate']);
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
@@ -1393,7 +1400,13 @@ private function getCustomerOrderQuery($orderNumber): array
            billing_address {
            ... address
            }
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
+           items{
+             product_name
+             product_sku
+             quantity_ordered
+             product_sale_price {value}
+             discounts {amount{value currency} label}
+           }
            total {
              base_grand_total{value currency}
              grand_total{value currency}