Merge branch 'MAGETWO-32078-CheckoutAgreements' of github.corp.ebay.com:magento-folks/magento2ce into develop

Author: Ievgen Shakhsuvarov

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);

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

@@ -45,7 +45,8 @@
 <script>
 require([
     "jquery",
-    "mage/mage"
+    "mage/mage",
+    "Magento_Catalog/product/view/validation"
 ], function($){
     $('#product_addtocart_form').mage('validation', {
         radioCheckboxClosest: '.nested'

app/code/Magento/Checkout/view/frontend/web/js/opc-order-review.js

@@ -37,8 +37,7 @@ define([
             var isAgreementValid = true;
             agreementFormsGroup.find('form').each(
                 function(){
-                    $(this).validation();
-                    isAgreementValid = isAgreementValid && $(this).validation && $(this).validation('isValid');
+                    isAgreementValid = $(this).validation() && $(this).validation('isValid') && isAgreementValid;
                 }
             );
 

app/code/Magento/Checkout/view/frontend/web/js/overview.js

@@ -11,13 +11,12 @@ define([
     "mage/translate"
 ], function($){
     "use strict";
-    
+
     $.widget('mage.orderOverview', {
         options: {
             opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
             pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
-            placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
-            agreements: '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions
+            placeOrderSubmit: 'button[type="submit"]' // The 'Place Order' button.
         },
 
         /**
@@ -29,21 +28,19 @@ define([
         },
 
         /**
-         * Verify that all agreements and terms/conditions are checked. Show the Ajax loader. Disable
-         * the submit button (i.e. Place Order).
+         * Show the Ajax loader. Disable the submit button (i.e. Place Order).
          * @return {Boolean}
          * @private
          */
         _showLoader: function() {
-            if ($(this.options.agreements).find('input[type="checkbox"]:not(:checked)').length > 0) {
-                alert($.mage.__('Please agree to all Terms and Conditions before placing the orders.'));
+            if (!this.element.validation('isValid')) {
                 return false;
             }
             this.element.find(this.options.pleaseWaitLoader).show().end()
                 .find(this.options.placeOrderSubmit).prop('disabled', true).css('opacity', this.options.opacity);
             return true;
         }
     });
-    
+
     return $.mage.orderOverview;
 });

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -604,10 +604,10 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
         if ($address->getAddressType() == 'billing') {
             $order->setIsVirtual(1);
         } else {
-            $order->setShippingAddress($this->quoteAddressToOrderAddress->addressToOrderAddress($address));
+            $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
         }
 
-        $order->setPayment($this->quotePaymentToOrderPayment->paymentToOrderPayment($quote->getPayment()));
+        $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment()));
         if ($this->priceCurrency->round($address->getGrandTotal()) == 0) {
             $order->getPayment()->setMethod('free');
         }
@@ -622,7 +622,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             )->setProductOptions(
                 $_quoteItem->getProduct()->getTypeInstance()->getOrderOptions($_quoteItem->getProduct())
             );
-            $orderItem = $this->quoteItemToOrderItem->itemToOrderItem($item);
+            $orderItem = $this->quoteItemToOrderItem->convert($_quoteItem);
             if ($item->getParentItem()) {
                 $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
             }

app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}}' class="form multicheckout order-review">
+<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{}}' class="form multicheckout order-review">
     <?php echo $this->getBlockHtml('formkey'); ?>
     <div class="block block-billing">
         <div class="block-title"><strong><?php echo __('Billing Information') ?></strong></div>

app/code/Magento/Tax/Model/Quote/ToOrderConverter.php

@@ -22,7 +22,7 @@ class ToOrderConverter
      * @param array $additional
      * @return array
      */
-    public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $address, $additional)
+    public function beforeConvert(QuoteAddressToOrder $subject, QuoteAddress $address, $additional = [])
     {
         $this->quoteAddress = $address;
         return [$address, $additional];

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php

@@ -19,6 +19,7 @@ class CustomerInjectable extends AbstractRepository
      * @param array $defaultData
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function __construct(array $defaultConfig = [], array $defaultData = [])
     {
@@ -116,5 +117,15 @@ public function __construct(array $defaultConfig = [], array $defaultData = [])
             'password_confirmation' => '123123q',
             'address' => ['presets' => 'US_address_TX'],
         ];
+
+        $this->_data['johndoe_with_multiple_addresses'] = [
+            'firstname' => 'John',
+            'lastname' => 'Doe',
+            'group_id' => ['dataSet' => 'General'],
+            'email' => 'JohnDoe_%isolation%@example.com',
+            'password' => '123123q',
+            'password_confirmation' => '123123q',
+            'address' => ['presets' => 'US_address_NY, US_address'],
+        ];
     }
 }