MAGETWO-55620: Merge branch '2.1' of github.com:magento/magento2ce into MAGETWO-55620

Author: ishakhsuvarov

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.1.1
+=============
+To get detailed information about changes in Magento 2.1.1, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.1CE.html "Magento Community Edition (CE) Release Notes")
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -127,7 +127,10 @@ protected function placeCheckoutOrder()
             );
         } catch (\Exception $exception) {
             $result->setData('error', true);
-            $result->setData('error_messages', __('Unable to place order. Please try again later.'));
+            $result->setData(
+                'error_messages',
+                __('An error occurred on the server. Please try to place the order again.')
+            );
         }
         if ($response instanceof Http) {
             $response->representJson($this->jsonHelper->jsonEncode($result));

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -280,7 +280,10 @@ public function textExecuteFailedPlaceOrderDataProvider()
     {
         $objectFailed = new \Magento\Framework\DataObject();
         $objectFailed->setData('error', true);
-        $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));
+        $objectFailed->setData(
+            'error_messages',
+            __('An error occurred on the server. Please try to place the order again.')
+        );
 
         return [
             [

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

@@ -2,7 +2,7 @@
 "Order saving error: %1","Order saving error: %1"
 "Please choose a payment method.","Please choose a payment method."
 "We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later."
-"Unable to place order. Please try again later.","Unable to place order. Please try again later."
+"An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "Credit Card: xxxx-%1","Credit Card: xxxx-%1"
 "amount %1","amount %1"
 failed.,failed.

app/code/Magento/Braintree/Model/Ui/ConfigProvider.php

@@ -79,7 +79,6 @@ public function getConfig()
             'payment' => [
                 self::CODE => [
                     'isActive' => $this->config->isActive(),
-                    'isSingleUse' => !$isPayPalActive,
                     'clientToken' => $this->getClientToken(),
                     'ccTypesMapper' => $this->config->getCctypesMapper(),
                     'sdkUrl' => $this->config->getSdkUrl(),

app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php

@@ -154,7 +154,6 @@ public function getConfigDataProvider()
                     'payment' => [
                         ConfigProvider::CODE => [
                             'isActive' => true,
-                            'isSingleUse' => false,
                             'clientToken' => self::CLIENT_TOKEN,
                             'ccTypesMapper' => ['visa' => 'VI', 'american-express' => 'AE'],
                             'sdkUrl' => self::SDK_URL,

app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js

@@ -7,26 +7,19 @@
 define(
     [
         'uiComponent',
-        'uiRegistry',
-        'Magento_Braintree/js/view/payment/adapter',
         'Magento_Checkout/js/model/payment/renderer-list'
     ],
     function (
         Component,
-        Registry,
-        Braintree,
         rendererList
     ) {
         'use strict';
 
         var config = window.checkoutConfig.payment,
             braintreeType = 'braintree',
-            payPalType = 'braintree_paypal',
-            path = 'checkout.steps.billing-step.payment.payments-list.',
-            components = [];
+            payPalType = 'braintree_paypal';
 
         if (config[braintreeType].isActive) {
-            components.push(path + braintreeType);
             rendererList.push(
                 {
                     type: braintreeType,
@@ -44,13 +37,6 @@ define(
             );
         }
 
-        // setup Braintree SDK with merged configuration from all related components
-        if (components.length) {
-            Registry.get(components, function () {
-                Braintree.setup();
-            });
-        }
-
         /** Add view logic here if needed */
         return Component.extend({});
     }

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -61,11 +61,22 @@ define(
                         this.beforePlaceOrder(response);
                     },
 
+                    /**
+                     * Device data initialization
+                     *
+                     * @param {Object} checkout
+                     */
+                    onReady: function (checkout) {
+                        braintree.checkout = checkout;
+                    },
+
                     /**
                      * Triggers on any Braintree error
+                     * @param {Object} response
                      */
-                    onError: function () {
-                        this.paymentMethodNonce = null;
+                    onError: function (response) {
+                        braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
+                        throw response.message;
                     },
 
                     /**
@@ -90,7 +101,7 @@ define(
                 this._super()
                     .observe(['active']);
                 this.validatorManager.initialize();
-                this.initBraintree();
+                this.initClientConfig();
 
                 return this;
             },
@@ -122,11 +133,11 @@ define(
              * @param {Boolean} isActive
              */
             onActiveChange: function (isActive) {
-                if (!isActive || this.isSingleUse()) {
+                if (!isActive) {
                     return;
                 }
 
-                this.reInitBraintree();
+                this.initBraintree();
             },
 
             /**
@@ -146,17 +157,9 @@ define(
             },
 
             /**
-             * Create Braintree configuration
+             * Init Braintree configuration
              */
             initBraintree: function () {
-                this.initClientConfig();
-                braintree.config = _.extend(braintree.config, this.clientConfig);
-            },
-
-            /**
-             * Re-init Braintree configuration
-             */
-            reInitBraintree: function () {
                 var intervalId = setInterval(function () {
                     // stop loader when frame will be loaded
                     if ($('#braintree-hosted-field-number').length) {
@@ -165,6 +168,12 @@ define(
                     }
                 }, 500);
 
+                if (braintree.checkout) {
+                    braintree.checkout.teardown(function () {
+                        braintree.checkout = null;
+                    });
+                }
+
                 fullScreenLoader.startLoader();
                 braintree.setConfig(this.clientConfig);
                 braintree.setup();
@@ -309,14 +318,6 @@ define(
                 });
 
                 return false;
-            },
-
-            /**
-             * Check if Braintree configured without PayPal
-             * @returns {Boolean}
-             */
-            isSingleUse: function () {
-                return window.checkoutConfig.payment[this.getCode()].isSingleUse;
             }
         });
     }

app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Model\Product\Gallery;
 
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+use Magento\Catalog\Model\Product;
 
 /**
  * Read handler for catalog product gallery.
@@ -40,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * @param object $entity
+     * @param Product $entity
      * @param array $arguments
      * @return object
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -50,29 +51,57 @@ public function execute($entity, $arguments = [])
         $value = [];
         $value['images'] = [];
 
-        $localAttributes = ['label', 'position', 'disabled'];
-
         $mediaEntries = $this->resourceModel->loadProductGalleryByAttributeId(
             $entity,
             $this->getAttribute()->getAttributeId()
         );
 
-        foreach ($mediaEntries as $mediaEntry) {
-            foreach ($localAttributes as $localAttribute) {
-                if ($mediaEntry[$localAttribute] === null) {
-                    $mediaEntry[$localAttribute] = $this->findDefaultValue($localAttribute, $mediaEntry);
-                }
-            }
+        $this->addMediaDataToProduct(
+            $entity,
+            $mediaEntries
+        );
+        
+        return $entity;
+    }
+
+    /**
+     * @param Product $product
+     * @param array $mediaEntries
+     * @return void
+     */
+    public function addMediaDataToProduct(Product $product, array $mediaEntries)
+    {
+        $attrCode = $this->getAttribute()->getAttributeCode();
+        $value = [];
+        $value['images'] = [];
+        $value['values'] = [];
 
-            $value['images'][$mediaEntry['value_id']] = $mediaEntry;
+        foreach ($mediaEntries as $mediaEntry) {
+            $mediaEntry = $this->substituteNullsWithDefaultValues($mediaEntry);
+            $value['images'][] = $mediaEntry;
         }
+        $product->setData($attrCode, $value);
+    }
 
-        $entity->setData(
-            $this->getAttribute()->getAttributeCode(),
-            $value
-        );
+    /**
+     * @param array $rawData
+     * @return array
+     */
+    private function substituteNullsWithDefaultValues(array $rawData)
+    {
+        $processedData = [];
+        foreach ($rawData as $key => $rawValue) {
+            if (null !== $rawValue) {
+                $processedValue = $rawValue;
+            } elseif (isset($rawData[$key . '_default'])) {
+                $processedValue = $rawData[$key . '_default'];
+            } else {
+                $processedValue = null;
+            }
+            $processedData[$key] = $processedValue;
+        }
 
-        return $entity;
+        return $processedData;
     }
 
     /**
@@ -93,6 +122,7 @@ public function getAttribute()
      * @param string $key
      * @param string[] &$image
      * @return string
+     * @deprecated
      */
     protected function findDefaultValue($key, &$image)
     {

app/code/Magento/Catalog/Model/Product/Link.php

@@ -57,6 +57,7 @@ class Link extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\CatalogInventory\Helper\Stock
+     * @deprecated
      */
     protected $stockHelper;