Skip to content

Commit 52601f0

Browse files
committed
Merge remote-tracking branch 'origin/MC-17675' into 2.3-develop-pr26
2 parents 1e58f70 + 684ffee commit 52601f0

File tree

1 file changed

+9
-1
lines changed
  • app/code/Magento/Backend/Block/Dashboard

1 file changed

+9
-1
lines changed

app/code/Magento/Backend/Block/Dashboard/Bar.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Backend\Block\Dashboard;
77

8+
use Magento\Store\Model\Store;
9+
810
/**
911
* Adminhtml dashboard bar block
1012
*
@@ -23,6 +25,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
2325
protected $_currentCurrencyCode = null;
2426

2527
/**
28+
* Get totals
29+
*
2630
* @return array
2731
*/
2832
public function getTotals()
@@ -31,6 +35,8 @@ public function getTotals()
3135
}
3236

3337
/**
38+
* Add total
39+
*
3440
* @param string $label
3541
* @param float $value
3642
* @param bool $isQuantity
@@ -73,6 +79,7 @@ public function setCurrency($currency)
7379
* Retrieve currency model if not set then return currency model for current store
7480
*
7581
* @return \Magento\Directory\Model\Currency
82+
* @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
7683
*/
7784
public function getCurrency()
7885
{
@@ -90,7 +97,8 @@ public function getCurrency()
9097
$this->getRequest()->getParam('group')
9198
)->getWebsite()->getBaseCurrency();
9299
} else {
93-
$this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
100+
$this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
101+
->getBaseCurrency();
94102
}
95103
}
96104

0 commit comments

Comments
 (0)