Merge remote-tracking branch 'origin/2.2.10-develop' into 2.2.10-develop-pr111

Author: zakdma

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -23,7 +23,7 @@
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-        <form id="co-transparent-form-braintree" class="form" data-bind="" method="post" action="#" novalidate="novalidate">
+        <form id="co-transparent-form-braintree" class="form" data-bind="afterRender: initHostedFields" method="post" action="#" novalidate="novalidate">
             <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
                 <legend class="legend">
                     <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
@@ -87,7 +87,7 @@
                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                     </label>
                     <div class="control _with-tooltip">
-                        <div data-bind="afterRender: initHostedFields, attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
                         <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
 
                         <div class="field-tooltip toggle">

app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js

@@ -12,10 +12,11 @@ define([
     'use strict';
 
     return function (paymentMethod) {
-        paymentMethod.__disableTmpl = {
-            title: true
-        };
-
+        if (paymentMethod) {
+            paymentMethod.__disableTmpl = {
+                title: true
+            };
+        }
         quote.paymentMethod(paymentMethod);
     };
 });

app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js

@@ -13,14 +13,33 @@ define([
     'Magento_Checkout/js/model/error-processor',
     'Magento_Customer/js/model/customer',
     'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/model/full-screen-loader',
+    'underscore'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader, _) {
     'use strict';
 
+    /**
+     * Filter template data.
+     *
+     * @param {Object|Array} data
+     */
+    var filterTemplateData = function (data) {
+        return _.each(data, function (value, key, list) {
+            if (_.isArray(value) || _.isObject(value)) {
+                list[key] = filterTemplateData(value);
+            }
+
+            if (key === '__disableTmpl') {
+                delete list[key];
+            }
+        });
+    };
+
     return function (messageContainer, paymentData, skipBilling) {
         var serviceUrl,
             payload;
 
+        paymentData = filterTemplateData(paymentData);
         skipBilling = skipBilling || false;
         payload = {
             cartId: quote.getQuoteId(),

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js

@@ -0,0 +1,85 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire',
+    'jquery'
+], function (Squire, $) {
+    'use strict';
+
+    var injector = new Squire(),
+        setPaymentInformation,
+        serviceUrl = 'http://url',
+        mocks = {
+            'Magento_Checkout/js/model/quote': {
+                getQuoteId: jasmine.createSpy().and.returnValue(1),
+                billingAddress: jasmine.createSpy().and.returnValue(null)
+            },
+            'Magento_Checkout/js/model/url-builder': {
+                createUrl: jasmine.createSpy().and.returnValue(serviceUrl)
+            },
+            'mage/storage': {
+                post: function () {} // jscs:ignore jsDoc
+            },
+            'Magento_Customer/js/model/customer': {
+                isLoggedIn: jasmine.createSpy().and.returnValue(false)
+            },
+            'Magento_Checkout/js/model/full-screen-loader': {
+                startLoader: jasmine.createSpy(),
+                stopLoader: jasmine.createSpy()
+            },
+            'Magento_Checkout/js/action/get-totals': jasmine.createSpy('getTotalsAction'),
+            'Magento_Checkout/js/model/error-processor': jasmine.createSpy('errorProcessor')
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(
+            ['Magento_Checkout/js/action/set-payment-information-extended'],
+            function (action) {
+                setPaymentInformation = action;
+                done();
+            });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {
+        }
+    });
+
+    describe('Magento/Checkout/js/action/set-payment-information-extended', function () {
+        it('Checks that paymentData consist correct data value.', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                deferral = new $.Deferred(),
+                paymentData = {
+                    method: 'checkmo',
+                    additionalData: null,
+                    __disableTmpl: {
+                        title: true
+                    }
+                },
+                payload = {
+                    cartId: 1,
+                    paymentMethod: {
+                        method: 'checkmo',
+                        additionalData: null
+                    },
+                    billingAddress: null
+                };
+
+            spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
+                return deferral.resolve({});
+            });
+
+            setPaymentInformation(messageContainer, paymentData, false);
+            expect(mocks['Magento_Checkout/js/model/full-screen-loader'].startLoader).toHaveBeenCalled();
+            expect(mocks['mage/storage'].post).toHaveBeenCalledWith(serviceUrl, JSON.stringify(payload));
+            expect(mocks['Magento_Checkout/js/model/full-screen-loader'].stopLoader).toHaveBeenCalled();
+        });
+    });
+});