Skip to content

Commit 801da3f

Browse files
committed
Fixes failed tests for Data Object
- fixed currency renderer for grid columns
1 parent 7900123 commit 801da3f

File tree

1 file changed

+6
-3
lines changed
  • app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer

1 file changed

+6
-3
lines changed

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,14 @@ protected function _getCurrencyCode($row)
118118
protected function _getRate($row)
119119
{
120120
if ($rate = $this->getColumn()->getRate()) {
121-
return (float)$rate;
121+
return (float) $rate;
122122
}
123-
if ($rate = $row->getData($this->getColumn()->getRateField())) {
124-
return (float)$rate;
123+
$rateField = $this->getColumn()->getRateField();
124+
125+
if ($rateField !== null && $rate = $row->getData($rateField)) {
126+
return (float) $rate;
125127
}
128+
126129
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
127130
}
128131

0 commit comments

Comments
 (0)