Merge branch 'mainline-develop' into checkout

Author: Olexii Korshenko

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php

@@ -60,6 +60,7 @@ protected function _prepareLayout()
      * Get header
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getHeader()
     {
@@ -70,6 +71,7 @@ public function getHeader()
      * Get save button html
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getSaveButtonHtml()
     {
@@ -80,6 +82,7 @@ public function getSaveButtonHtml()
      * Get reset button html
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getResetButtonHtml()
     {
@@ -90,6 +93,7 @@ public function getResetButtonHtml()
      * Get import button html
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getImportButtonHtml()
     {
@@ -100,6 +104,7 @@ public function getImportButtonHtml()
      * Get services html
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getServicesHtml()
     {
@@ -110,6 +115,7 @@ public function getServicesHtml()
      * Get rates matrix html
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getRatesMatrixHtml()
     {
@@ -120,6 +126,7 @@ public function getRatesMatrixHtml()
      * Get import form action url
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getImportFormAction()
     {

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php

@@ -83,6 +83,7 @@ protected function _prepareLayout()
      * Get rates form action
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getRatesFormAction()
     {

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php

@@ -77,6 +77,7 @@ protected function _prepareLayout()
      * Returns page header
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getHeader()
     {
@@ -87,6 +88,7 @@ public function getHeader()
      * Returns URL for save action
      *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getFormActionUrl()
     {
@@ -97,6 +99,7 @@ public function getFormActionUrl()
      * Returns website id
      *
      * @return int
+     * @codeCoverageIgnore
      */
     public function getWebsiteId()
     {
@@ -107,6 +110,7 @@ public function getWebsiteId()
      * Returns store id
      *
      * @return int
+     * @codeCoverageIgnore
      */
     public function getStoreId()
     {
@@ -130,6 +134,7 @@ public function getCurrencySymbolsData()
      * Returns inheritance text
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getInheritText()
     {

app/code/Magento/CurrencySymbol/Helper/Data.php

@@ -3,29 +3,26 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\CurrencySymbol\Model;
+
+use Magento\Framework\Locale\Currency;
 
 /**
  * Currency Symbol Observer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\CurrencySymbol\Model;
-
 class Observer
 {
     /**
-     * Currency symbol data
-     *
-     * @var \Magento\CurrencySymbol\Helper\Data
+     * @var \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory
      */
-    protected $_currencySymbolData = null;
+    protected $symbolFactory;
 
     /**
-     * @param \Magento\CurrencySymbol\Helper\Data $currencySymbolData
+     * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
      */
-    public function __construct(\Magento\CurrencySymbol\Helper\Data $currencySymbolData)
+    public function __construct(\Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory)
     {
-        $this->_currencySymbolData = $currencySymbolData;
+        $this->symbolFactory = $symbolFactory;
     }
 
     /**
@@ -38,8 +35,28 @@ public function currencyDisplayOptions(\Magento\Framework\Event\Observer $observ
     {
         $baseCode = $observer->getEvent()->getBaseCode();
         $currencyOptions = $observer->getEvent()->getCurrencyOptions();
-        $currencyOptions->setData($this->_currencySymbolData->getCurrencyOptions($baseCode));
+        $currencyOptions->setData($this->getCurrencyOptions($baseCode));
 
         return $this;
     }
+
+    /**
+     * Get currency display options
+     *
+     * @param string $baseCode
+     * @return array
+     */
+    protected function getCurrencyOptions($baseCode)
+    {
+        $currencyOptions = [];
+        if ($baseCode) {
+            $customCurrencySymbol = $this->symbolFactory->create()->getCurrencySymbol($baseCode);
+            if ($customCurrencySymbol) {
+                $currencyOptions[Currency::CURRENCY_OPTION_SYMBOL] = $customCurrencySymbol;
+                $currencyOptions[Currency::CURRENCY_OPTION_DISPLAY] = \Magento\Framework\Currency::USE_SYMBOL;
+            }
+        }
+
+        return $currencyOptions;
+    }
 }