Merge remote-tracking branch 'origin/2.0-develop' into MAGETWO-61960

Author: OlgaVasyltsun

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

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

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

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

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "proprietary"
     ],

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

@@ -13,6 +13,7 @@ Cancel,Cancel
 "Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
 "There was an error canceling transactions. Please contact us or try again later.","There was an error canceling transactions. Please contact us or try again later."
 "We couldn't process your order right now. Please try again later.","We couldn'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."
 "amount %1","amount %1"
 failed,failed
 successful,successful

app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php

@@ -108,7 +108,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             );
         }
 
-        if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) {
+        if ($this->checkIsSingleAndIsDefaultStore($websiteModel)) {
             $fieldset->addField(
                 'is_default',
                 'checkbox',
@@ -133,4 +133,12 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             ['name' => 'website[website_id]', 'value' => $websiteModel->getId()]
         );
     }
+
+    private function checkIsSingleAndIsDefaultStore($websiteModel)
+    {
+        $hasOnlyDefaultStore = $websiteModel->getStoresCount() == 1 &&
+            isset($websiteModel->getStoreIds()[\Magento\Store\Model\Store::DEFAULT_STORE_ID]);
+
+        return !$websiteModel->getIsDefault() && $websiteModel->getStoresCount() && !$hasOnlyDefaultStore;
+    }
 }

app/code/Magento/Braintree/Model/PaymentMethod.php

@@ -269,6 +269,7 @@ public function assignData(\Magento\Framework\DataObject $data)
 
         $infoInstance->setAdditionalInformation('cc_last4', $additionalData->getData('cc_last4'));
         $infoInstance->setAdditionalInformation('cc_token', $additionalData->getData('cc_token'));
+        $infoInstance->setAdditionalInformation('store_in_vault', $additionalData->getData('store_in_vault'));
         $infoInstance->setAdditionalInformation(
             'payment_method_nonce',
             $additionalData->getData('payment_method_nonce')

app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php

@@ -276,17 +276,25 @@ public function testAssignData()
             ->with($ccExpYear)
             ->willReturnSelf();
 
-        $this->infoInstanceMock->expects($this->atLeastOnce())
+        $this->infoInstanceMock->expects($this->at(0))
             ->method('setAdditionalInformation')
-            ->willReturnMap(
-                [
-                    ['device_data', $deviceData],
-                    ['cc_last4', $ccLast4],
-                    ['cc_token', $ccToken],
-                    ['payment_method_nonce', $paymentMethodNonce],
-                    ['store_in_vault', $storeInVault]
-                ]
-            );
+            ->with('device_data', $deviceData);
+
+        $this->infoInstanceMock->expects($this->at(1))
+            ->method('setAdditionalInformation')
+            ->with('cc_last4', $ccLast4);
+
+        $this->infoInstanceMock->expects($this->at(2))
+            ->method('setAdditionalInformation')
+            ->with('cc_token', $ccToken);
+
+        $this->infoInstanceMock->expects($this->at(3))
+            ->method('setAdditionalInformation')
+            ->with('store_in_vault', $storeInVault);
+
+        $this->infoInstanceMock->expects($this->at(4))
+            ->method('setAdditionalInformation')
+            ->with('payment_method_nonce', $paymentMethodNonce);
 
         $this->model->assignData($data);
     }

app/code/Magento/Braintree/composer.json

@@ -22,7 +22,7 @@
         "magento/module-checkout-agreements": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.7",
+    "version": "100.0.8",
     "license": [
         "proprietary"
     ],

app/code/Magento/BundleImportExport/composer.json

@@ -11,7 +11,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CacheInvalidate/composer.json

@@ -7,7 +7,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"