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

Conflicts: app/code/Magento/Checkout/composer.json
magento · Jan 26, 2015 · 8763e1b · 8763e1b
2 parents 5e59d46 + bbe0268
commit 8763e1b
Show file tree

Hide file tree

Showing 191 changed files with 6,039 additions and 9,462 deletions.
diff --git a/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php b/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
@@ -23,7 +23,7 @@ public function aroundConvert(
         \Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
         Closure $proceed,
         \Magento\Quote\Model\Quote\Item\AbstractItem $item,
-        $additional
+        $additional = []
     ) {
         /** @var $orderItem \Magento\Sales\Model\Order\Item */
         $orderItem = $proceed($item, $additional);

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -47,7 +47,8 @@
 <script>
 require([
     "jquery",
-    "mage/mage"
+    "mage/mage",
+    "Magento_Catalog/product/view/validation"
 ], function($){
     $('#product_addtocart_form').mage('validation', {
         radioCheckboxClosest: '.nested'

diff --git a/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js b/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
@@ -17,7 +17,7 @@
 
     $.widget("mage.validation", $.mage.validation, {
         options: {
-            radioCheckboxClosest: 'ul',
+            radioCheckboxClosest: 'ul, ol',
             errorPlacement: function (error, element) {
                 if (element.attr('data-validate-message-box')) {
                     var messageBox = $(element.attr('data-validate-message-box'));

diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -106,7 +106,6 @@ public function execute()
             $result['error'] = true;
             $result['error_messages'] = __('Something went wrong processing your order. Please try again later.');
         }
-        $this->quoteRepository->save($this->getOnepage()->getQuote());
         /**
          * when there is redirect to third party, we don't want to save order yet.
          * we will save the order in return action.

diff --git a/app/code/Magento/Checkout/Service/V1/Address/Billing/ReadService.php b/app/code/Magento/Checkout/Service/V1/Address/Billing/ReadService.php
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Billing/ReadServiceInterface.php b/app/code/Magento/Checkout/Service/V1/Address/Billing/ReadServiceInterface.php
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php b/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteServiceInterface.php b/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteServiceInterface.php
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Converter.php b/app/code/Magento/Checkout/Service/V1/Address/Converter.php