Merge remote-tracking branch 'origin/BUG#AC-2664' into Hammer_Quality_Backlog_GraphQl_13042022

Author: glo71317

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

@@ -76,8 +76,7 @@ public function testPrepareDataSource(
         array $dataSource,
         string $currencyCode,
         ?int $expectedStoreId = null
-    ): void
-    {
+    ): void {
         $itemName = 'itemName';
         $oldItemValue = 'oldItemValue';
         $newItemValue = 'newItemValue';
@@ -159,11 +158,24 @@ public function testPrepareDataSourceDataProvider(): array
                 ]
             ]
         ];
+        $dataSource5 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue',
+                        'store_id' => '123Test',
+                        'base_currency_code' => '',
+                    ]
+                ]
+            ]
+        ];
+
         return [
             [true, $dataSource1, 'US'],
             [false, $dataSource2, 'SAR'],
             [false, $dataSource3, 'SAR', 2],
             [false, $dataSource4, 'SAR'],
+            [false, $dataSource5, 'INR'],
         ];
     }
 }

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

@@ -76,13 +76,13 @@ 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;
+                $currencyCode = $item['base_currency_code'] ?? null;
+
                 if (!$currencyCode) {
-                    $storeId = isset($item['store_id']) && (int)$item['store_id'] !== 0 ? $item['store_id'] :
+                    $itemStoreId = $item['store_id'] ?? '';
+                    $storeId = $itemStoreId && is_numeric($itemStoreId) ? $itemStoreId :
                         $this->context->getFilterParam('store_id', Store::DEFAULT_STORE_ID);
-                    $store = $this->storeManager->getStore(
-                        $storeId
-                    );
+                    $store = $this->storeManager->getStore($storeId);
                     $currencyCode = $store->getBaseCurrency()->getCurrencyCode();
                 }
                 $basePurchaseCurrency = $this->currency->load($currencyCode);