fix currency in new widget

Author: rogerdz

app/code/Magento/Catalog/Block/Product/NewProduct.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Block\Product;
 
 use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Framework\App\Http\Context as HttpContext;
 
 /**
  * New products block
@@ -18,29 +19,29 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
     /**
      * Default value for products count that will be shown
      */
-    const DEFAULT_PRODUCTS_COUNT = 10;
+    public const DEFAULT_PRODUCTS_COUNT = 10;
 
     /**
-     * Products count
+     * How much product should be displayed at once
      *
      * @var int
      */
     protected $_productsCount;
 
     /**
-     * @var \Magento\Framework\App\Http\Context
+     * @var HttpContext
      */
     protected $httpContext;
 
     /**
-     * Catalog product visibility
+     * Catalog product visibility model
      *
      * @var \Magento\Catalog\Model\Product\Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Product collection factory
+     * Catalog product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
      */
@@ -57,7 +58,7 @@ public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
-        \Magento\Framework\App\Http\Context $httpContext,
+        HttpContext $httpContext,
         array $data = []
     ) {
         $this->_productCollectionFactory = $productCollectionFactory;
@@ -95,13 +96,15 @@ protected function _construct()
      */
     public function getCacheKeyInfo()
     {
+        $store = $this->_storeManager->getStore();
         return [
            'CATALOG_PRODUCT_NEW',
-           $this->_storeManager->getStore()->getId(),
+           $store->getId(),
            $this->_design->getDesignTheme()->getId(),
            $this->httpContext->getValue(CustomerContext::CONTEXT_GROUP),
            'template' => $this->getTemplate(),
-           $this->getProductsCount()
+           $this->getProductsCount(),
+           $this->httpContext->getValue(HttpContext::CONTEXT_CURRENCY) ?: $store->getDefaultCurrency()->getCode()
         ];
     }
 

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php

@@ -53,10 +53,12 @@ public function testGetCacheKeyInfo()
         $this->assertEquals('CATALOG_PRODUCT_NEW', $info[0]);
 
         $this->assertSame(1, array_shift($keys));
+
+        $currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->getStore();
         $this->assertEquals(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Store\Model\StoreManagerInterface::class
-            )->getStore()->getId(),
+            $currentStore->getId(),
             $info[1]
         );
 
@@ -84,6 +86,9 @@ public function testGetCacheKeyInfo()
          */
         $this->assertSame(4, array_shift($keys));
         $this->assertNotEquals('', $info[4]);
+
+        $this->assertSame(5, array_shift($keys));
+        $this->assertSame($currentStore->getDefaultCurrency()->getCode(), $info[5]);
     }
 
     public function testSetGetProductsCount()