Merge remote-tracking branch 'mainline/develop' into develop

Author: oshmyheliuk

app/code/Magento/Backend/i18n/en_US.csv

@@ -456,3 +456,4 @@ Pagination,Pagination
 "Anchor Text for Next","Anchor Text for Next"
 "Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used.","Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used."
 "Theme Name","Theme Name"
+"Deployment config file %1 is not writable.","Deployment config file %1 is not writable."

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -110,7 +110,10 @@ protected function _generateRow($filename)
             $row[$key] = $value;
         }
         $row['size'] = $this->_varDirectory->stat($this->_varDirectory->getRelativePath($filename))['size'];
-        $row['id'] = $row['time'] . '_' . $row['type'];
+        if (isset($row['display_name']) && $row['display_name'] == '') {
+            $row['display_name'] = 'WebSetupWizard';
+        }
+        $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
         return $row;
     }
 }

app/code/Magento/Braintree/etc/adminhtml/di.xml

@@ -19,7 +19,7 @@
         </arguments>
     </type>
 
-    <virtualType name="BraintreeAuthorizeDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
                 <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
@@ -30,7 +30,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeVaultAuthorizeDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeVaultAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
                 <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>

app/code/Magento/Catalog/Helper/Product/ProductList.php

@@ -18,7 +18,7 @@ class ProductList
      */
     const XML_PATH_LIST_MODE = 'catalog/frontend/list_mode';
 
-    const VIEW_MODE_LIST = 'view';
+    const VIEW_MODE_LIST = 'list';
     const VIEW_MODE_GRID = 'grid';
 
     const DEFAULT_SORT_DIRECTION = 'asc';

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php

@@ -10,6 +10,7 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection as GroupCollection;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory as GroupCollectionFactory;
@@ -28,6 +29,9 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Api\Data\AttributeGroupInterface;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Currency;
+use Magento\Framework\Locale\Currency as CurrencyLocale;
+Use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class EavTest
@@ -138,9 +142,35 @@ class EavTest extends AbstractModifierTest
      */
     private $eavAttributeMock;
 
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    /**
+     * @var Currency|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $currencyMock;
+
+    /**
+     * @var CurrencyLocale|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $currencyLocaleMock;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+    
+    /**
+     * @var Eav
+     */
+    protected $eav;
+
     protected function setUp()
     {
         parent::setUp();
+        $this->objectManager = new ObjectManager($this);
         $this->eavConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -236,6 +266,24 @@ protected function setUp()
             ->willReturn([
                 $this->attributeMock,
             ]);
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['load', 'getId', 'getConfig', 'getBaseCurrencyCode'])
+            ->getMockForAbstractClass();
+        $this->currencyMock = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['toCurrency'])
+            ->getMock();
+        $this->currencyLocaleMock = $this->getMockBuilder(CurrencyLocale::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCurrency'])
+            ->getMock();
+        
+        $this->eav =$this->getModel();
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->eav,
+            'localeCurrency',
+            $this->currencyLocaleMock
+        );
     }
 
     /**
@@ -255,7 +303,7 @@ protected function createModel()
             'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
             'attributeGroupRepository' => $this->attributeGroupRepositoryMock,
             'sortOrderBuilder' => $this->sortOrderBuilderMock,
-            'attributeRepository' => $this->attributeRepositoryMock
+            'attributeRepository' => $this->attributeRepositoryMock,
         ]);
     }
 
@@ -336,6 +384,19 @@ public function testModifyData()
             ->method('getItems')
             ->willReturn([$this->eavAttributeMock]);
 
-        $this->assertEquals($sourceData, $this->getModel()->modifyData([]));
+        $this->storeMock->expects(($this->once()))
+            ->method('getBaseCurrencyCode')
+            ->willReturn('en_US');
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->currencyMock->expects($this->once())
+            ->method('toCurrency')
+            ->willReturn('19.99');
+        $this->currencyLocaleMock->expects($this->once())
+            ->method('getCurrency')
+            ->willReturn($this->currencyMock);
+
+        $this->assertEquals($sourceData, $this->eav->modifyData([]));
     }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -22,6 +22,7 @@
 use Magento\Ui\Component\Form\Element\ActionDelete;
 use Magento\Ui\Component\Form\Element\DataType\Text;
 use Magento\Ui\Component\Form\Element\DataType\Number;
+use Magento\Framework\Locale\CurrencyInterface;
 
 /**
  * Data provider for "Customizable Options" panel
@@ -111,7 +112,7 @@ class CustomOptions extends AbstractModifier
      * @var UrlInterface
      */
     protected $urlBuilder;
-
+    
     /**
      * @var ArrayManager
      */
@@ -122,6 +123,11 @@ class CustomOptions extends AbstractModifier
      */
     protected $meta = [];
 
+    /**
+     * @var CurrencyInterface
+     */
+    private $localeCurrency;
+
     /**
      * @param LocatorInterface $locator
      * @param StoreManagerInterface $storeManager
@@ -1069,4 +1075,38 @@ protected function getCurrencySymbol()
     {
         return $this->storeManager->getStore()->getBaseCurrency()->getCurrencySymbol();
     }
+
+    /**
+     * The getter function to get the locale currency for real application code
+     *
+     * @return \Magento\Framework\Locale\CurrencyInterface
+     *
+     * @deprecated
+     */
+    private function getLocaleCurrency()
+    {
+        if ($this->localeCurrency === null) {
+            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
+        }
+        return $this->localeCurrency;
+    }
+    
+    /**
+     * Format price according to the locale of the currency
+     *
+     * @param mixed $value
+     * @return string
+     */
+    protected function formatPrice($value)
+    {
+        if (!is_numeric($value)) {
+            return null;
+        }
+
+        $store = $this->storeManager->getStore();
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
+        $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
+
+        return $value;
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -30,6 +30,7 @@
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
 use Magento\Ui\Component\Form\Element\Wysiwyg as WysiwygElement;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
+use Magento\Framework\Locale\CurrencyInterface;
 
 /**
  * Class Eav
@@ -161,6 +162,11 @@ class Eav extends AbstractModifier
      */
     private $prevSetAttributes;
 
+    /**
+     * @var CurrencyInterface
+     */
+    private $localeCurrency;
+
     /**
      * @param LocatorInterface $locator
      * @param CatalogEavValidationRules $catalogEavValidationRules
@@ -867,4 +873,38 @@ private function calculateGroupCode(AttributeGroupInterface $group)
 
         return $attributeGroupCode;
     }
+
+    /**
+     * The getter function to get the locale currency for real application code
+     *
+     * @return \Magento\Framework\Locale\CurrencyInterface
+     *
+     * @deprecated
+     */
+    private function getLocaleCurrency()
+    {
+        if ($this->localeCurrency === null) {
+            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
+        }
+        return $this->localeCurrency;
+    }
+
+    /**
+     * Format price according to the locale of the currency
+     *
+     * @param mixed $value
+     * @return string
+     */
+    protected function formatPrice($value)
+    {
+        if (!is_numeric($value)) {
+            return null;
+        }
+
+        $store = $this->storeManager->getStore();
+        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
+        $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
+
+        return $value;
+    }
 }