Merge remote-tracking branch 'chaika/MC-37371' into PR-10-14

Author: dhorytskyi

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

@@ -12,6 +12,8 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Sales\Ui\Component\Listing\Column\Price;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -27,6 +29,11 @@ class PriceTest extends TestCase
      */
     protected $currencyMock;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -40,31 +47,45 @@ protected function setUp(): void
             ->setMethods(['load', 'format'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = $objectManager->getObject(
             Price::class,
-            ['currency' => $this->currencyMock, 'context' => $contextMock]
+            ['currency' => $this->currencyMock, 'context' => $contextMock, 'storeManager' => $this->storeManagerMock]
         );
     }
 
-    public function testPrepareDataSource()
+    /**
+     * @param $hasCurrency
+     * @param $dataSource
+     * @param $currencyCode
+     * @dataProvider testPrepareDataSourceDataProvider
+     */
+    public function testPrepareDataSource($hasCurrency, $dataSource, $currencyCode)
     {
         $itemName = 'itemName';
         $oldItemValue = 'oldItemValue';
         $newItemValue = 'newItemValue';
-        $dataSource = [
-            'data' => [
-                'items' => [
-                    [
-                        $itemName => $oldItemValue,
-                        'base_currency_code' => 'US'
-                    ]
-                ]
-            ]
-        ];
+
+        $store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getCurrencyCode')
+            ->willReturn($currencyCode);
+        $this->storeManagerMock->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getStore')
+            ->willReturn($store);
+        $store->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getBaseCurrency')
+            ->willReturn($currencyMock);
 
         $this->currencyMock->expects($this->once())
             ->method('load')
-            ->with($dataSource['data']['items'][0]['base_currency_code'])
             ->willReturnSelf();
 
         $this->currencyMock->expects($this->once())
@@ -76,4 +97,31 @@ public function testPrepareDataSource()
         $dataSource = $this->model->prepareDataSource($dataSource);
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }
+
+    public function testPrepareDataSourceDataProvider()
+    {
+        $dataSource1 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue',
+                        'base_currency_code' => 'US'
+                    ]
+                ]
+            ]
+        ];
+        $dataSource2 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue'
+                    ]
+                ]
+            ]
+        ];
+        return [
+            [true, $dataSource1, 'US'],
+            [false, $dataSource2, 'SAR'],
+        ];
+    }
 }

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

@@ -7,14 +7,18 @@
 
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Directory\Model\Currency;
 
 /**
  * Class Price
+ *
+ * UiComponent class for Price format column
  */
 class Price extends Column
 {
@@ -28,6 +32,11 @@ class Price extends Column
      */
     private $currency;
 
+    /**
+     * @var StoreManagerInterface|null
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
@@ -37,18 +46,22 @@ class Price extends Column
      * @param array $components
      * @param array $data
      * @param Currency $currency
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         PriceCurrencyInterface $priceFormatter,
         array $components = [],
         array $data = [],
-        Currency $currency = null
+        Currency $currency = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->priceFormatter = $priceFormatter;
-        $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->create(Currency::class);
+        $this->currency = $currency ?: ObjectManager::getInstance()
+            ->get(Currency::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -63,6 +76,12 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
                 $currencyCode = isset($item['base_currency_code']) ? $item['base_currency_code'] : null;
+                if (!$currencyCode) {
+                    $store = $this->storeManager->getStore(
+                        $this->context->getFilterParam('store_id', \Magento\Store\Model\Store::DEFAULT_STORE_ID)
+                    );
+                    $currencyCode = $store->getBaseCurrency()->getCurrencyCode();
+                }
                 $basePurchaseCurrency = $this->currency->load($currencyCode);
                 $item[$this->getData('name')] = $basePurchaseCurrency
                     ->format($item[$this->getData('name')], [], false);