Merge pull request #1300 from magento-south/PRS

Fixed issues:
- MAGETWO-57995 [GITHUB] Simple product videos display the thumbnail image rather than the embedded video player. #6360
- MAGETWO-57070 [GitHub] Locale\Format throws away country part, results in wrong number format #5073
- MAGETWO-69854 Can't set allowed or default currencies using config:set command
- MAGETWO-66627 [GitHub] Default Post Code is applied for all Order's addresses if zip is not required
- MAGETWO-66906 Deprecate setup:store-config:set command
- MAGETWO-67274 Can't set value using config:set on uninstalled instance
- MAGETWO-70294 [GitHub] Mass Actions with Childs don't work in CMS #9854
- MAGETWO-70216 Remove section i18n from shared file (config.php)
- MAGETWO-59514 Hard coded "tax_region_id" in the \Magento\Tax\Setup\InstallData

Author: slavvka

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -118,6 +118,8 @@ public function getGalleryImagesJson()
                 'caption' => $image->getLabel(),
                 'position' => $image->getPosition(),
                 'isMain' => $this->isMainImage($image),
+                'type' => str_replace('external-', '', $image->getMediaType()),
+                'videoUrl' => $image->getVideoUrl(),
             ];
         }
         if (empty($imagesItems)) {
@@ -128,6 +130,8 @@ public function getGalleryImagesJson()
                 'caption' => '',
                 'position' => '0',
                 'isMain' => true,
+                'type' => 'image',
+                'videoUrl' => null,
             ];
         }
         return json_encode($imagesItems);

app/code/Magento/Checkout/view/base/web/js/model/default-post-code-resolver.js

@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([], function () {
+    'use strict';
+
+    /**
+     * Define necessity of using default post code value
+     */
+    var useDefaultPostCode;
+
+    return {
+        /**
+         * Resolve default post code
+         *
+         * @returns {String|null}
+         */
+        resolve: function () {
+            return useDefaultPostCode ?  window.checkoutConfig.defaultPostcode : null;
+        },
+
+        /**
+         * Set state to useDefaultPostCode variable
+         *
+         * @param {Boolean} shouldUseDefaultPostCode
+         * @returns {underscore}
+         */
+        setUseDefaultPostCode: function (shouldUseDefaultPostCode) {
+            useDefaultPostCode = shouldUseDefaultPostCode;
+
+            return this;
+        }
+    };
+});

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -6,8 +6,9 @@
  * @api
  */
 define([
-    'underscore'
-], function (_) {
+    'underscore',
+    'Magento_Checkout/js/model/default-post-code-resolver'
+], function (_, DefaultPostCodeResolver) {
     'use strict';
 
     /**
@@ -35,7 +36,7 @@ define([
             company: addressData.company,
             telephone: addressData.telephone,
             fax: addressData.fax,
-            postcode: addressData.postcode ? addressData.postcode : window.checkoutConfig.defaultPostcode || undefined,
+            postcode: addressData.postcode ? addressData.postcode : DefaultPostCodeResolver.resolve(),
             city: addressData.city,
             firstname: addressData.firstname,
             lastname: addressData.lastname,

app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php

@@ -20,7 +20,7 @@ interface ConfigSetProcessorInterface
     /**
      * Processes config:set command.
      *
-     * @param string $path The configuration path in format section/group/field_name
+     * @param string $path The configuration path in format group/section/field_name
      * @param string $value The configuration value
      * @param string $scope The configuration scope (default, website, or store)
      * @param string $scopeCode The scope code

app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php

@@ -66,16 +66,6 @@ public function __construct(
      */
     public function process($path, $value, $scope, $scopeCode)
     {
-        if (!$this->deploymentConfig->isAvailable()) {
-            throw new CouldNotSaveException(
-                __(
-                    'We can\'t save this option because Magento is not installed. '
-                    . 'To lock this value, enter the command again using the --%1 option.',
-                    ConfigSetCommand::OPTION_LOCK
-                )
-            );
-        }
-
         if ($this->isLocked($path, $scope, $scopeCode)) {
             throw new CouldNotSaveException(
                 __(

app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php

@@ -6,6 +6,7 @@
 namespace Magento\Config\Console\Command\ConfigSet;
 
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Config\Model\Config\PathValidator;
 use Magento\Framework\Exception\LocalizedException;
@@ -14,6 +15,7 @@
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Deploy\Model\DeploymentConfig\Hash;
 use Magento\Config\App\Config\Type\System;
+use Magento\Framework\App\Config;
 
 /**
  * Processor facade for config:set command.
@@ -57,22 +59,32 @@ class ProcessorFacade
      */
     private $hash;
 
+    /**
+     * The application config storage.
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param ValidatorInterface $scopeValidator The scope validator
      * @param PathValidator $pathValidator The path validator
      * @param ConfigSetProcessorFactory $configSetProcessorFactory The factory for config:set processors
      * @param Hash $hash The hash manager
+     * @param ScopeConfigInterface $scopeConfig The application config storage
      */
     public function __construct(
         ValidatorInterface $scopeValidator,
         PathValidator $pathValidator,
         ConfigSetProcessorFactory $configSetProcessorFactory,
-        Hash $hash
+        Hash $hash,
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->scopeValidator = $scopeValidator;
         $this->pathValidator = $pathValidator;
         $this->configSetProcessorFactory = $configSetProcessorFactory;
         $this->hash = $hash;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -109,6 +121,10 @@ public function process($path, $value, $scope, $scopeCode, $lock)
 
         $this->hash->regenerate(System::CONFIG_TYPE);
 
+        if ($this->scopeConfig instanceof Config) {
+            $this->scopeConfig->clean();
+        }
+
         return $message;
     }
 }

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -8,6 +8,7 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
@@ -55,19 +56,29 @@ class ConfigSetCommand extends Command
      */
     private $processorFacadeFactory;
 
+    /**
+     * Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor Emulator adminhtml area for CLI command
      * @param ChangeDetector $changeDetector The config change detector
      * @param ProcessorFacadeFactory $processorFacadeFactory The factory for processor facade
+     * @param DeploymentConfig $deploymentConfig Application deployment configuration
      */
     public function __construct(
         EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor,
         ChangeDetector $changeDetector,
-        ProcessorFacadeFactory $processorFacadeFactory
+        ProcessorFacadeFactory $processorFacadeFactory,
+        DeploymentConfig $deploymentConfig
     ) {
         $this->emulatedAreaProcessor = $emulatedAreaProcessor;
         $this->changeDetector = $changeDetector;
         $this->processorFacadeFactory = $processorFacadeFactory;
+        $this->deploymentConfig = $deploymentConfig;
 
         parent::__construct();
     }
@@ -117,6 +128,12 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!$this->deploymentConfig->isAvailable()) {
+            $output->writeln(
+                '<error>You cannot run this command because the Magento application is not installed.</error>'
+            );
+            return Cli::RETURN_FAILURE;
+        }
         if ($this->changeDetector->hasChanges(System::CONFIG_TYPE)) {
             $output->writeln(
                 '<error>'

app/code/Magento/Config/Console/CommandList.php

@@ -25,7 +25,7 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
      */
     protected function _getAllowedCurrencies()
     {
-        if ($this->getData('groups/options/fields/allow/inherit')) {
+        if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
             return explode(
                 ',',
                 (string)$this->_config->getValue(
@@ -62,7 +62,8 @@ protected function _getInstalledCurrencies()
      */
     protected function _getCurrencyBase()
     {
-        if (!($value = $this->getData('groups/options/fields/base/value'))) {
+        $value = $this->getData('groups/options/fields/base/value');
+        if (!$this->isFormData() || !$value) {
             $value = $this->_config->getValue(
                 \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
                 $this->getScope(),
@@ -79,7 +80,7 @@ protected function _getCurrencyBase()
      */
     protected function _getCurrencyDefault()
     {
-        if (!($value = $this->getData('groups/options/fields/default/value'))) {
+        if (!$this->isFormData() || !($value = $this->getData('groups/options/fields/default/value'))) {
             $value = $this->_config->getValue(
                 \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
                 $this->getScope(),
@@ -88,4 +89,14 @@ protected function _getCurrencyDefault()
         }
         return strval($value);
     }
+
+    /**
+     * Check whether field saved from Admin form with other currency data or as single field, e.g. from CLI command
+     *
+     * @return bool True in case when field was saved from Admin form
+     */
+    private function isFormData()
+    {
+        return $this->getData('groups/options/fields') !== null;
+    }
 }

app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php

@@ -54,7 +54,8 @@ public function __construct(
     public function afterSave()
     {
         $exceptions = [];
-        foreach ($this->_getAllowedCurrencies() as $currencyCode) {
+        $allowedCurrencies = $this->_getAllowedCurrencies();
+        foreach ($allowedCurrencies as $currencyCode) {
             if (!in_array($currencyCode, $this->_getInstalledCurrencies())) {
                 $exceptions[] = __(
                     'Selected allowed currency "%1" is not available in installed currencies.',
@@ -63,7 +64,7 @@ public function afterSave()
             }
         }
 
-        if (!in_array($this->_getCurrencyDefault(), $this->_getAllowedCurrencies())) {
+        if (!in_array($this->_getCurrencyDefault(), $allowedCurrencies)) {
             $exceptions[] = __(
                 'Default display currency "%1" is not available in allowed currencies.',
                 $this->_localeCurrency->getCurrency($this->_getCurrencyDefault())->getName()
@@ -76,4 +77,22 @@ public function afterSave()
 
         return parent::afterSave();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _getAllowedCurrencies()
+    {
+        $value = $this->getValue();
+        $isFormData = $this->getData('groups/options/fields') !== null;
+        if ($isFormData && $this->getData('groups/options/fields/allow/inherit')) {
+            $value = (string)$this->_config->getValue(
+                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
+                $this->getScope(),
+                $this->getScopeId()
+            );
+        }
+
+        return explode(',', $value);
+    }
 }