ACP2E-3276: Order reports showing the wrong currency symbol

Author: lakshmana49

app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection/GeneratedReportSection.xml

@@ -10,6 +10,5 @@
     <section name="GeneratedReportSection">
         <element name="ordersCount" type="text" selector="//tr[@class='totals']/th[@class=' col-orders col-orders_count col-number']"/>
         <element name="canceledOrders" type="text" selector="//tr[@class='totals']/th[@class=' col-canceled col-total_canceled_amount a-right']"/>
-        <element name="salesTotals" type="text" selector="//tr[@class='totals']/th[@class=' col-sales-total col-total_income_amount a-right']"/>
     </section>
 </sections>

app/code/Magento/Reports/Test/Mftf/Test/AdminOrderReportsForMultiWebsiteWithDifferentDisplayCurrencyTest.xml

@@ -1,57 +1,78 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
 use Magento\Catalog\Helper\Data;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
-use Magento\Checkout\Test\Fixture\PlaceOrder as PlaceOrderFixture;
 use Magento\Checkout\Test\Fixture\SetBillingAddress as SetBillingAddressFixture;
 use Magento\Checkout\Test\Fixture\SetDeliveryMethod as SetDeliveryMethodFixture;
 use Magento\Checkout\Test\Fixture\SetPaymentMethod as SetPaymentMethodFixture;
 use Magento\Checkout\Test\Fixture\SetShippingAddress as SetShippingAddressFixture;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Directory\Test\Fixture\CurrencyRate;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Test\Fixture\AddProductToCart as AddProductToCartFixture;
 use Magento\Quote\Test\Fixture\CustomerCart;
-use Magento\Sales\Test\Fixture\Invoice as InvoiceFixture;
+use Magento\Sales\Api\InvoiceOrderInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
 use Magento\Store\Test\Fixture\Store as StoreFixture;
 use Magento\Store\Test\Fixture\Website as WebsiteFixture;
-use Magento\TestFramework\Fixture\AppArea;
-use Magento\TestFramework\Fixture\AppIsolation;
 use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorage;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
-class AdminOrderReports extends AbstractBackendController
+/**
+ * Test for order reports.
+ */
+class AdminOrderReportsTest extends AbstractBackendController
 {
     /**
      * @var DataFixtureStorage
      */
     private $fixtures;
 
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var InvoiceOrderInterface
+     */
+    private $invoiceOrder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     protected function setUp(): void
     {
         parent::setUp();
+        $this->cartManagement = $this->_objectManager->get(CartManagementInterface::class);
+        $this->invoiceOrder = $this->_objectManager->get(InvoiceOrderInterface::class);
         $this->fixtures = $this->_objectManager->get(DataFixtureStorageManager::class)->getStorage();
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
     }
 
     /**
+     * Test to verify admin order reports for multi website with different display currency.
+     *
      * @throws NoSuchEntityException
      * @throws CouldNotSaveException
      * @throws StateException
@@ -63,12 +84,12 @@ protected function setUp(): void
         DataFixture(WebsiteFixture::class, ['code' => 'website2'], as: 'website2'),
         DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
         DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
-        Config('currency/options/default', 'EUR', 'website', 'website2'),
-        Config('currency/options/allow', 'EUR', 'website', 'website2'),
+        Config('currency/options/default', 'EUR', ScopeInterface::SCOPE_WEBSITE, 'website2'),
+        Config('currency/options/allow', 'EUR', ScopeInterface::SCOPE_WEBSITE, 'website2'),
         DataFixture(CurrencyRate::class, ['USD' => ['EUR' => '0.8']]),
         DataFixture(ProductFixture::class, ['website_ids' => [1, '$website2.id$']], as: 'p1'),
         DataFixture(Customer::class, ['store_id' => '$store2.id$', 'website_id' => '$website2.id$'], as: 'customer'),
-        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$', 'currency' => 'EUR'], as: 'cart', scope: 'store2'),
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], as: 'cart', scope: 'store2'),
         DataFixture(
             AddProductToCartFixture::class,
             ['cart_id' => '$cart.id$', 'product_id' => '$p1.id$', 'qty' => 1]
@@ -77,36 +98,40 @@ protected function setUp(): void
         DataFixture(SetShippingAddressFixture::class, ['cart_id' => '$cart.id$'], as: 'shippingAddress'),
         DataFixture(SetDeliveryMethodFixture::class, ['cart_id' => '$cart.id$']),
         DataFixture(SetPaymentMethodFixture::class, ['cart_id' => '$cart.id$']),
-        DataFixture(PlaceOrderFixture::class, ['cart_id' => '$cart.id$'], 'order'),
-        DataFixture(InvoiceFixture::class, ['order_id' => '$order.id$'], 'invoice'),
     ]
     public function testAdminOrderReportsForMultiWebsiteWithDifferentDisplayCurrency()
     {
-        $scopeConfig = ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-
+        $cart = $this->fixtures->get('cart');
         $websiteId = (int) $this->fixtures->get('website2')->getId();
 
+        $store = $this->storeManager->getStore();
+        $store->setCurrentCurrencyCode('EUR');
+
+        $orderId = $this->cartManagement->placeOrder($cart->getId());
+        $this->assertNotEmpty($orderId);
+        $invoiceId = $this->invoiceOrder->execute($orderId);
+        $this->assertNotEmpty($invoiceId);
+
         $this->_objectManager->create('Magento\Sales\Model\ResourceModel\Report\Order')->aggregate();
 
-        $beforeCurrentdate = date('m-d-Y', strtotime('-1 day'));
-        $afterCurrentdate = date('m-d-Y', strtotime('+1 day'));
+        $beforeCurrentDate = date('m-d-Y', strtotime('-1 day'));
+        $afterCurrentDate = date('m-d-Y', strtotime('+1 day'));
 
         $requestArray = [
             'report_type' => 'created_at_order',
             'period_type' => 'day',
-            'from' => $beforeCurrentdate,
-            'to' => $afterCurrentdate,
+            'from' => $beforeCurrentDate,
+            'to' => $afterCurrentDate,
             'show_order_statuses' => '0',
             'show_empty_rows' => '0',
             'show_actual_columns' => '0',
         ];
         $filterData = base64_encode(http_build_query($requestArray));
         $this->dispatch("backend/reports/report_sales/sales/website/{$websiteId}/filter/{$filterData}/");
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
-        $body = $this->getResponse()->getBody();
         $layout = $this->_objectManager->get(LayoutInterface::class);
         $salesReportGrid = $layout->getBlock('adminhtml_sales_sales.grid');
         $blockHtml = $salesReportGrid->toHtml();
-        $this->assertNotEmpty($blockHtml);
+        $this->assertStringContainsString('€', $blockHtml);
     }
 }