Merge remote-tracking branch 'mainline/develop' into PR_Branch

Author: ark99

app/code/Magento/AdminNotification/composer.json

@@ -10,7 +10,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -7,7 +7,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "proprietary"
     ],

app/code/Magento/Backend/Model/Session/Quote.php

@@ -155,8 +155,9 @@ public function getQuote()
             if ($this->getStoreId()) {
                 if (!$this->getQuoteId()) {
                     $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
+                    $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
-
+                    
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -343,6 +343,7 @@ public function testGetQuoteWithoutQuoteId()
             '',
             false
         );
+
         $this->quoteRepositoryMock->expects($this->once())->method('get')->willReturn($quoteMock);
         $cartInterfaceMock->expects($this->once())
             ->method('setCustomerGroupId')
@@ -357,7 +358,6 @@ public function testGetQuoteWithoutQuoteId()
         $quoteMock->expects($this->once())
             ->method('setIsSuperMode')
             ->with(true);
-
         $this->assertEquals($quoteMock, $this->quote->getQuote());
     }
 

app/code/Magento/Backend/composer.json

@@ -22,7 +22,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -51,6 +51,7 @@ require([
             showHour: false,
             showMinute: false,
             serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
+            serverTimezoneOffset: <?php echo (int) $block->getTimezoneOffsetSeconds(); ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

app/code/Magento/Backup/composer.json

@@ -9,7 +9,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc1",
+    "version": "100.1.0-rc2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Braintree/Controller/Paypal/Review.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Review
@@ -21,6 +22,11 @@ class Review extends AbstractAction
      */
     private $quoteUpdater;
 
+    /**
+     * @var string
+     */
+    private static $paymentMethodNonce = 'payment_method_nonce';
+
     /**
      * Constructor
      *
@@ -52,13 +58,16 @@ public function execute()
 
         try {
             $this->validateQuote($quote);
-            $this->validateRequestData($requestData);
 
-            $this->quoteUpdater->execute(
-                $requestData['nonce'],
-                $requestData['details'],
-                $quote
-            );
+            if ($this->validateRequestData($requestData)) {
+                $this->quoteUpdater->execute(
+                    $requestData['nonce'],
+                    $requestData['details'],
+                    $quote
+                );
+            } elseif (!$quote->getPayment()->getAdditionalInformation(self::$paymentMethodNonce)) {
+                throw new LocalizedException(__('We can\'t initialize checkout.'));
+            }
 
             /** @var \Magento\Framework\View\Result\Page $resultPage */
             $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
@@ -82,13 +91,10 @@ public function execute()
 
     /**
      * @param array $requestData
-     * @return void
-     * @throws \InvalidArgumentException
+     * @return boolean
      */
     private function validateRequestData(array $requestData)
     {
-        if (empty($requestData['nonce']) || empty($requestData['details'])) {
-            throw new \InvalidArgumentException('Data of request cannot be empty.');
-        }
+        return !empty($requestData['nonce']) && !empty($requestData['details']);
     }
 }