Merge remote-tracking branch 'origin/MC-40030' into 2.4-develop-pr49

Author: Serhii Balko

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php

@@ -17,6 +17,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Contains tests for Price class
+ */
 class PriceTest extends TestCase
 {
     /**
@@ -34,6 +37,9 @@ class PriceTest extends TestCase
      */
     private $storeManagerMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -57,12 +63,20 @@ protected function setUp(): void
     }
 
     /**
-     * @param $hasCurrency
-     * @param $dataSource
-     * @param $currencyCode
+     * Test for prepareDataSource method
+     *
+     * @param bool $hasCurrency
+     * @param array $dataSource
+     * @param string $currencyCode
+     * @param int|null $expectedStoreId
      * @dataProvider testPrepareDataSourceDataProvider
      */
-    public function testPrepareDataSource($hasCurrency, $dataSource, $currencyCode)
+    public function testPrepareDataSource(
+        bool $hasCurrency,
+        array $dataSource,
+        string $currencyCode,
+        ?int $expectedStoreId = null
+    ): void
     {
         $itemName = 'itemName';
         $oldItemValue = 'oldItemValue';
@@ -79,6 +93,7 @@ public function testPrepareDataSource($hasCurrency, $dataSource, $currencyCode)
             ->willReturn($currencyCode);
         $this->storeManagerMock->expects($hasCurrency ? $this->never() : $this->once())
             ->method('getStore')
+            ->with($expectedStoreId)
             ->willReturn($store);
         $store->expects($hasCurrency ? $this->never() : $this->once())
             ->method('getBaseCurrency')
@@ -98,7 +113,12 @@ public function testPrepareDataSource($hasCurrency, $dataSource, $currencyCode)
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }
 
-    public function testPrepareDataSourceDataProvider()
+    /**
+     * Provider for testPrepareDataSource
+     *
+     * @return array
+     */
+    public function testPrepareDataSourceDataProvider(): array
     {
         $dataSource1 = [
             'data' => [
@@ -119,9 +139,31 @@ public function testPrepareDataSourceDataProvider()
                 ]
             ]
         ];
+        $dataSource3 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue',
+                        'store_id' => '2'
+                    ]
+                ]
+            ]
+        ];
+        $dataSource4 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue',
+                        'store_id' => 'abc'
+                    ]
+                ]
+            ]
+        ];
         return [
             [true, $dataSource1, 'US'],
             [false, $dataSource2, 'SAR'],
+            [false, $dataSource3, 'SAR', 2],
+            [false, $dataSource4, 'SAR'],
         ];
     }
 }

app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -77,8 +78,10 @@ public function prepareDataSource(array $dataSource)
             foreach ($dataSource['data']['items'] as & $item) {
                 $currencyCode = isset($item['base_currency_code']) ? $item['base_currency_code'] : null;
                 if (!$currencyCode) {
+                    $storeId = isset($item['store_id']) && (int)$item['store_id'] !== 0 ? $item['store_id'] :
+                        $this->context->getFilterParam('store_id', Store::DEFAULT_STORE_ID);
                     $store = $this->storeManager->getStore(
-                        $this->context->getFilterParam('store_id', \Magento\Store\Model\Store::DEFAULT_STORE_ID)
+                        $storeId
                     );
                     $currencyCode = $store->getBaseCurrency()->getCurrencyCode();
                 }