Merge pull request #788 from dpfaffenbauer/price_formatter_currency_a…

…ware [OrderBundle] check in price-formatter also for currency-aware types
coreshop · Jan 22, 2019 · a967ddd · a967ddd
2 parents 8b36841 + 0730005
commit a967ddd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php
@@ -13,6 +13,7 @@
 namespace CoreShop\Bundle\OrderBundle\Pimcore\GridColumnConfig\Operator;
 
 use CoreShop\Component\Currency\Formatter\MoneyFormatterInterface;
+use CoreShop\Component\Currency\Model\CurrencyAwareInterface;
 use CoreShop\Component\Locale\Context\LocaleContextInterface;
 use CoreShop\Component\Order\Model\SaleInterface;
 use Pimcore\DataObject\GridColumnConfig\Operator\AbstractOperator;
@@ -64,7 +65,11 @@ public function getLabeledValue($element)
         $c = $children[0];
         $result = $c->getLabeledValue($element);
 
-        if ($element instanceof SaleInterface) {
+        if ($element instanceof CurrencyAwareInterface) {
+            $currency = $element->getCurrency();
+            $result->value = $this->moneyFormatter->format($result->value, $currency->getIsoCode(), $this->localeService->getLocaleCode());
+        }
+        elseif ($element instanceof SaleInterface) {
             $store = $element->getStore();
             $result->value = $this->moneyFormatter->format($result->value, $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode());
         }