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

Author: balex13

app/code/Magento/Braintree/Gateway/Config/Config.php

@@ -72,9 +72,12 @@ public function __construct(
      */
     public function getCountrySpecificCardTypeConfig()
     {
-        $countriesCardTypes = $this->serializer->unserialize($this->getValue(self::KEY_COUNTRY_CREDIT_CARD));
-
-        return is_array($countriesCardTypes) ? $countriesCardTypes : [];
+        $countryCardTypes = $this->getValue(self::KEY_COUNTRY_CREDIT_CARD);
+        if (!$countryCardTypes) {
+            return [];
+        }
+        $countryCardTypes = $this->serializer->unserialize($countryCardTypes);
+        return is_array($countryCardTypes) ? $countryCardTypes : [];
     }
 
     /**

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -89,10 +89,11 @@ public function beforeSave()
      */
     public function afterLoad()
     {
-        $value = $this->serializer->unserialize($this->getValue());
-        if (is_array($value)) {
-            $value = $this->encodeArrayFieldValue($value);
-            $this->setValue($value);
+        if ($this->getValue()) {
+            $value = $this->serializer->unserialize($this->getValue());
+            if (is_array($value)) {
+                $this->setValue($this->encodeArrayFieldValue($value));
+            }
         }
         return $this;
     }

app/code/Magento/Braintree/Test/Unit/Model/Adminhtml/System/Config/CountryCreditCardTest.php

@@ -150,24 +150,30 @@ public function beforeSaveDataProvider()
     }
 
     /**
-     * @dataProvider afterLoadDataProvider
      * @param string $encodedValue
      * @param array|null $value
      * @param array $hashData
      * @param array|null $expected
+     * @param int $unserializeCalledNum
+     * @dataProvider afterLoadDataProvider
      */
-    public function testAfterLoad($encodedValue, $value, array $hashData, $expected)
-    {
+    public function testAfterLoad(
+        $encodedValue,
+        $value,
+        array $hashData,
+        $expected,
+        $unserializeCalledNum = 1
+    ) {
         $this->model->setValue($encodedValue);
         $index = 0;
         foreach ($hashData as $hash) {
-            $this->mathRandomMock->expects(static::at($index))
+            $this->mathRandomMock->expects($this->at($index))
                 ->method('getUniqueHash')
                 ->willReturn($hash);
             $index++;
         }
 
-        $this->serializerMock->expects($this->once())
+        $this->serializerMock->expects($this->exactly($unserializeCalledNum))
             ->method('unserialize')
             ->with($encodedValue)
             ->willReturn($value);
@@ -178,6 +184,7 @@ public function testAfterLoad($encodedValue, $value, array $hashData, $expected)
 
     /**
      * Get data to test saved credit cards types
+     *
      * @return array
      */
     public function afterLoadDataProvider()
@@ -193,7 +200,8 @@ public function afterLoadDataProvider()
                 'encoded' => '',
                 'value' => null,
                 'randomHash' => [],
-                'expected' => null
+                'expected' => null,
+                0
             ],
             'valid data' => [
                 'encoded' => '{"US":["AE","VI","MA"],"AF":["AE","MA"]}',

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

@@ -36,6 +36,8 @@ define(
                 braintreeDeviceData: null,
                 paymentMethodNonce: null,
                 lastBillingAddress: null,
+                ccCode: null,
+                ccMessageContainer: null,
                 validatorManager: validatorManager,
                 code: 'braintree',
 
@@ -138,9 +140,39 @@ define(
                     return;
                 }
 
+                this.restoreMessageContainer();
+                this.restoreCode();
+
+                /**
+                 * Define onReady callback
+                 */
+                braintree.onReady = function () {};
                 this.initBraintree();
             },
 
+            /**
+             * Restore original message container for cc-form component
+             */
+            restoreMessageContainer: function () {
+                this.messageContainer = this.ccMessageContainer;
+            },
+
+            /**
+             * Restore original code for cc-form component
+             */
+            restoreCode: function () {
+                this.code = this.ccCode;
+            },
+
+            /** @inheritdoc */
+            initChildren: function () {
+                this._super();
+                this.ccMessageContainer = this.messageContainer;
+                this.ccCode = this.code;
+
+                return this;
+            },
+
             /**
              * Init config
              */

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

@@ -52,7 +52,7 @@ define([
             var self = this;
 
             /**
-             * Define already callback
+             * Define onReady callback
              */
             Braintree.onReady = function () {
                 self.getPaymentMethodNonce();
@@ -78,6 +78,7 @@ define([
                         formComponent.setPaymentMethodNonce(response.paymentMethodNonce);
                         formComponent.additionalData['public_hash'] = self.publicHash;
                         formComponent.code = self.code;
+                        formComponent.messageContainer = self.messageContainer;
                         formComponent.placeOrder();
                     });
                 })

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -139,9 +139,12 @@
                 <button class="action primary checkout"
                         type="submit"
                         data-bind="
-                        click: placeOrderClick,
-                        attr: {title: $t('Place Order')}
-                ">
+                            click: placeOrderClick,
+                            attr: {title: $t('Place Order')},
+                            css: {disabled: !isPlaceOrderActionAllowed()},
+                            enable: isActive()
+                        "
+                        disabled>
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>

app/code/Magento/Bundle/Model/Product/Price.php

@@ -166,7 +166,7 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
         $customOption = $product->getCustomOption('bundle_selection_ids');
         if ($customOption) {
             $selectionIds = $this->serializer->unserialize($customOption->getValue());
-            if (!empty($selectionIds) && is_array($selectionIds)) {
+            if (is_array($selectionIds) && !empty($selectionIds)) {
                 return $selectionIds;
             }
         }

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -66,8 +66,8 @@ public function execute($entity, $arguments = [])
             $options = $bundleProductOptions ?: [];
             foreach ($options as $option) {
                 $this->optionRepository->save($entity, $option);
-                $entity->setCopyFromView(false);
             }
+            $entity->setCopyFromView(false);
         }
         return $entity;
     }