ACP2E-3276: Order reports showing the wrong currency symbol

Author: lakshmana49

app/code/Magento/Directory/Test/Fixture/CurrencyRate.php

@@ -1,7 +1,18 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 declare(strict_types=1);
 
@@ -11,6 +22,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DataObject;
 use Magento\Framework\Locale\FormatInterface;
+use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
 /**
@@ -24,9 +36,9 @@ class CurrencyRate implements RevertibleDataFixtureInterface
     private $format;
 
     /**
-     * @var Currency
+     * @var ServiceFactory
      */
-    private $currency;
+    private $serviceFactory;
 
     /**
      * @var ResourceConnection
@@ -35,11 +47,11 @@ class CurrencyRate implements RevertibleDataFixtureInterface
 
     public function __construct(
         FormatInterface $format,
-        Currency $currency,
+        ServiceFactory $serviceFactory,
         ResourceConnection $resourceConnection
     ) {
         $this->format = $format;
-        $this->currency = $currency;
+        $this->serviceFactory = $serviceFactory;
         $this->resourceConnection = $resourceConnection;
     }
 
@@ -52,7 +64,9 @@ public function apply(array $data = []): ?DataObject
                     $data[$currencyCode][$currencyTo] = $value;
                 }
             }
-            $this->currency->saveRates($data);
+            $service = $this->serviceFactory->create(Currency::class, 'saveRates');
+
+            return $service->execute(['rates' => $data]);
         }
     }
 

dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Sales/AdminOrderReports.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
+
+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\Quote\Test\Fixture\AddProductToCart as AddProductToCartFixture;
+use Magento\Quote\Test\Fixture\CustomerCart;
+use Magento\Store\Model\ScopeInterface;
+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\Config as Config;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractController;
+
+class AdminOrderReports extends AbstractController
+{
+    #[
+        DbIsolation(false),
+        AppArea('adminhtml'),
+        Config('catalog/price/scope', 1),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        Config('currency/options/default', 'EUR', ScopeInterface::SCOPE_WEBSITE, '$website2.code$'),
+        Config('currency/options/allow', 'EUR', ScopeInterface::SCOPE_WEBSITE, '$website2.code$'),
+        DataFixture(CurrencyRate::class, ['USD' => ['EUR' => 0.8]]),
+        DataFixture(ProductFixture::class, ['website_ids' => [1, '$website2.id$']], as: 'p1'),
+        DataFixture(Customer::class, ['website_id' => '$website2.id$'], as: 'customer'),
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], as: 'cart'),
+        DataFixture(
+            AddProductToCartFixture::class,
+            ['cart_id' => '$cart.id$', 'product_id' => '$p1.id$', 'qty' => 1]
+        ),
+        DataFixture(SetBillingAddressFixture::class, ['cart_id' => '$cart.id$'], as: 'billingAddress'),
+        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$'], as: 'order'),
+    ]
+    public function testAdminOrderReportsForMultiWebsiteWithDifferentDisplayCurrencyT()
+    {
+        $order = Bootstrap::getObjectManager()->get(DataFixtureStorageManager::class)->getStorage()->get('order');
+        $this->assertNotEmpty($order->getEntityId());
+    }
+}