Merge remote-tracking branch 'origin/MC-37689' into 2.4-develop-pr119

Author: zakdma

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php

@@ -71,9 +71,10 @@ public function getItemCollection()
     public function getItemPrice(Product $product)
     {
         $customPrice = $this->getCartItemCustomPrice($product);
-        $price = $customPrice ?? $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
 
-        return $this->convertPrice($price);
+        return $customPrice !== null
+            ? $this->convertPrice($customPrice)
+            : $this->priceCurrency->format($product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue());
     }
 
     /**

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/CartTest.php

@@ -8,9 +8,11 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
 
 use Magento\Backend\Model\Session\Quote;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Model\QuoteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -23,7 +25,7 @@
  */
 class CartTest extends TestCase
 {
-    /** @var ObjectManagerInterface */
+    /** @var ObjectManager */
     private $objectManager;
 
     /** @var Cart */
@@ -32,6 +34,9 @@ class CartTest extends TestCase
     /** @var Quote */
     private $session;
 
+    /** @var ProductRepository */
+    private $productRepository;
+
     /**
      * @inheritdoc
      */
@@ -42,6 +47,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Cart::class);
         $this->session = $this->objectManager->get(Quote::class);
+        $this->productRepository = $this->objectManager->get(ProductRepository::class);
     }
 
     /**
@@ -50,7 +56,8 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->session->clearStorage();
-
+        $this->objectManager->removeSharedInstance(\Magento\Sales\Model\AdminOrder\Create::class, true);
+        $this->objectManager->removeSharedInstance(QuoteRepository::class);
         parent::tearDown();
     }
 
@@ -77,4 +84,21 @@ public function testClearShoppingCartButton(): void
         $this->assertEquals(sprintf("order.clearShoppingCart('%s')", $confirmation), $button->getOnclick());
         $this->assertEquals(__('Clear Shopping Cart'), $button->getLabel());
     }
+
+    /**
+     * @magentoDataFixture Magento/Directory/_files/usd_cny_rate.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_two_products_and_customer_and_custom_price.php
+     *
+     * @magentoConfigFixture default/currency/options/base USD
+     * @magentoConfigFixture current_store currency/options/default CNY
+     * @magentoConfigFixture current_store currency/options/allow CNY,USD
+     */
+    public function testGetItemPriceConvert()
+    {
+        $this->session->setCustomerId(1);
+        $customPrice = $this->block->getItemPrice($this->productRepository->get('simple'));
+        $this->assertStringContainsString('84.00', $customPrice);
+        $price = $this->block->getItemPrice($this->productRepository->get('custom-design-simple-product'));
+        $this->assertStringContainsString('70.00', $price);
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer_and_custom_price.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Quote\Model\Quote\Item\Updater;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/quote_with_two_products_and_customer.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = $objectManager->get(QuoteFactory::class);
+/** @var Quote $quoteResource */
+$quoteResource = $objectManager->get(Quote::class);
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test01', 'reserved_order_id');
+$productRepository = $objectManager->get(ProductRepository::class);
+$quoteItem = $quote->getItemByProduct($productRepository->get('simple'));
+/** @var Updater $updater */
+$updater = $objectManager->get(Updater::class);
+$updater->update(
+    $quoteItem,
+    [
+        'qty' => 1,
+        'custom_price' => 12,
+    ]
+);
+$quote->collectTotals();
+$quoteResource->save($quote);

dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer_and_custom_price_rollback.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Sales/_files/quote_with_two_products_and_customer_rollback.php'
+);

dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer_rollback.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address_rollback.php');