Merge branch 'develop' of https://github.corp.magento.com/magento-south/magento2ce into develop

Author: Oleksandr Karpenko

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -15,7 +15,7 @@
         <button attr="{disabled: disabled}"
                 class="action-secondary"
                 type="button"
-                click="addChild.bind($data, false, false)">
+                click="processingAddChild.bind($data, false, false, false)">
             <span text="addButtonLabel"/>
         </button>
     </div>
@@ -59,7 +59,7 @@
                     </tr>
                 </thead>
 
-                <tbody data-bind="foreach: elems">
+                <tbody>
                     <tr repeat="foreach: elems, item: '$record'"
                         class="data-row"
                         css="'_odd-row': $index % 2">

app/code/Magento/Braintree/Observer/DataAssignObserver.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserver
@@ -31,13 +32,19 @@ class DataAssignObserver extends AbstractDataAssignObserver
     public function execute(Observer $observer)
     {
         $data = $this->readDataArgument($observer);
+
+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        if (!is_array($additionalData)) {
+            return;
+        }
+
         $paymentInfo = $this->readPaymentModelArgument($observer);
 
         foreach ($this->additionalInformationList as $additionalInformationKey) {
-            if ($data->getDataByKey($additionalInformationKey) !== null) {
+            if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(
                     $additionalInformationKey,
-                    $data->getDataByKey($additionalInformationKey)
+                    $additionalData[$additionalInformationKey]
                 );
             }
         }

app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php

@@ -10,6 +10,7 @@
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserverTest
@@ -30,8 +31,10 @@ public function testExecute()
         $paymentInfoModel = $this->getMock(InfoInterface::class);
         $dataObject = new DataObject(
             [
-                'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
-                'device_data' => self::DEVICE_DATA,
+                PaymentInterface::KEY_ADDITIONAL_DATA => [
+                    'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
+                    'device_data' => self::DEVICE_DATA
+                ]
             ]
         );
         $observerContainer->expects(static::atLeastOnce())

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/StockData.php

@@ -27,7 +27,6 @@ public function __construct(LocatorInterface $locator)
         $this->locator = $locator;
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -60,7 +59,6 @@ public function modifyMeta(array $meta)
                             'is_qty_decimal' => $config,
                             'is_decimal_divided' => $config,
                             'container_backorders' => $config,
-                            'container_deferred_stock_update' => $config,
                             'container_notify_stock_qty' => $config,
                         ],
                     ],

app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php

@@ -6,6 +6,8 @@
 namespace Magento\Captcha\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\App\ObjectManager;
 
 class CheckContactUsFormObserver implements ObserverInterface
 {
@@ -34,6 +36,11 @@ class CheckContactUsFormObserver implements ObserverInterface
      */
     protected $captchaStringResolver;
 
+    /**
+     * @var DataPersistorInterface
+     */
+    private $dataPersistor;
+
     /**
      * @param \Magento\Captcha\Helper\Data $helper
      * @param \Magento\Framework\App\ActionFlag $actionFlag
@@ -70,9 +77,25 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $controller = $observer->getControllerAction();
             if (!$captcha->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
                 $this->messageManager->addError(__('Incorrect CAPTCHA.'));
+                $this->getDataPersistor()->set($formId, $controller->getRequest()->getPostValue());
                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->redirect->redirect($controller->getResponse(), 'contact/index/index');
             }
         }
     }
+
+    /**
+     * Get Data Persistor
+     *
+     * @return DataPersistorInterface
+     */
+    private function getDataPersistor()
+    {
+        if ($this->dataPersistor === null) {
+            $this->dataPersistor = ObjectManager::getInstance()
+                ->get(DataPersistorInterface::class);
+        }
+
+        return $this->dataPersistor;
+    }
 }