Merge remote-tracking branch 'mpi/MAGETWO-51768' into pr-mpi-200416

Author: oshmyheliuk

app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml

@@ -6,44 +6,45 @@
 
 // @codingStandardsIgnoreFile
 
-?>
-<?php
 /**
  * @var $block \Magento\CheckoutAgreements\Block\Agreements
  */
-?>
-<?php if (!$block->getAgreements()) {
+if (!$block->getAgreements()) {
     return;
-} ?>
-<ol id="checkout-agreements" class="agreements checkout items">
-    <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement): ?>
-        <li class="item">
-            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
-                <?php if ($agreement->getIsHtml()):?>
-                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
-                <?php else:?>
-                    <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
-                <?php endif; ?>
-            </div>
-            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
-                <input type="checkbox"
-                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
-                       value="1"
-                       title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
-                       class="checkbox"
-                       data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
-                    <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-                </label>
-            </div>
-            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree">
-                <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-            </div>
-            <?php endif; ?>
-        </li>
-    <?php endforeach ?>
-</ol>
+}
+
+/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $argeementsCollection */
+$argeementsCollection = $block->getAgreements();
+$agreementMappedArray = [];
+/** @var \Magento\CheckoutAgreements\Model\Agreement $agreement */
+foreach ($argeementsCollection as $agreement) {
+    if ($agreement->getIsActive()) {
+        $agreementMappedArray[] = [
+            'mode' => $agreement->getMode(),
+            'agreementId' => $agreement->getAgreementId(),
+            'checkboxText' => $agreement->getCheckboxText(),
+            'content' => $agreement->getContent()
+        ];
+    }
+}
+$agreementJson = json_encode($agreementMappedArray);
+?>
+
+<div data-bind="scope: 'checkout-agreements-component-scope'" class="checkout-agreements-block">
+    <!-- ko template: getTemplate() --><!-- /ko -->
+</div>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "checkout-agreements-component-scope": {
+                        "component": "Magento_CheckoutAgreements/js/view/checkout-agreements",
+                        "agreements": <?php /* @noEscape */ echo $agreementJson; ?>,
+                        "isVisible": true
+                    }
+                }
+            }
+        }
+    }
+</script>

app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js

@@ -11,7 +11,9 @@ define(
     ],
     function ($) {
         'use strict';
-        var agreementsConfig = window.checkoutConfig.checkoutAgreements;
+        var checkoutConfig = window.checkoutConfig,
+            agreementsConfig = checkoutConfig ? checkoutConfig.checkoutAgreements : {};
+
         return {
             /**
              * Validate checkout agreements

app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js

@@ -11,8 +11,9 @@ define(
     ],
     function (ko, $, Component, agreementsModal) {
         'use strict';
-        var agreementsConfig = window.checkoutConfig.checkoutAgreements,
-            agreementManualMode = 1;
+        var checkoutConfig = window.checkoutConfig,
+            agreementManualMode = 1,
+            agreementsConfig = checkoutConfig ? checkoutConfig.checkoutAgreements : {};
 
         return Component.extend({
             defaults: {

app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<form data-role="checkout-agreements" method="post">
+<div data-role="checkout-agreements">
     <div class="checkout-agreements" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
@@ -15,8 +15,7 @@
                                     'name': 'agreement[' + agreementId + ']',
                                     'value': agreementId
                                     }"
-                       data-validate="{required:true}"
-                        >
+                       data-validate="{required:true}" />
                 <label data-bind="attr: {'for': 'agreement_' + agreementId}">
                     <button type="button"
                             class="action action-show"
@@ -40,4 +39,4 @@
             <div class="checkout-agreements-item-content" data-bind="html: modalContent"></div>
         </div>
     </div>
-</form>
+</div>

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

@@ -24,6 +24,7 @@ define([
             updateContainerSelector: '#details-reload',
             waitLoadingContainer: '#review-please-wait',
             shippingMethodContainer: '#shipping-method-container',
+            agreementSelector: 'div.checkout-agreements input',
             isAjax: false,
             updateShippingMethodSubmitSelector: "#update-shipping-method-submit",
             reviewSubmitSelector: "#review-submit",
@@ -162,6 +163,11 @@ define([
          * Validate Order form
          */
         _validateForm: function () {
+            this.element.find(this.options.agreementSelector).off('change').on('change', $.proxy(function (e) {
+                var isValid = this._validateForm();
+                this._updateOrderSubmit(!isValid);
+            }, this));
+
             if (this.element.data('mageValidation')) {
                 return this.element.validation().valid();
             }
@@ -235,9 +241,11 @@ define([
                 callBackResponseHandler = null,
                 shippingMethod = $.trim($(this.options.shippingSelector).val());
             this._shippingTobilling();
+
             if (url && resultId && shippingMethod) {
                 this._updateOrderSubmit(true);
                 this._toggleButton(this.options.updateOrderSelector, true);
+
                 // form data and callBack updated based on the shippping Form element
                 if (this.isShippingSubmitForm) {
                     formData = $(this.options.shippingSubmitFormSelector).serialize() + "&isAjax=true";
@@ -299,4 +307,4 @@ define([
     });
 
     return $.mage.orderReview;
-});
+});