Correctly set payment information when using paypal #12401

therool · 2017-11-22T13:15:12Z

Description

Correctly set payment method information when using PayPal Express so the checkout agreements data is correctly added to the request and validated correctly.
Edited the Magento_Paypal /js/action/set-payment-method to use the Magento_Checkout/js/action/set-payment-information so the additional payment/checkout data is correctly added.

Fixed Issues (if relevant)

Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal #11885: Paypal Can't Accept Checkout Agreements Before Routing to PayPal

Manual testing scenarios

Create required terms and conditions
Enable paypal express checkout
Checkout with paypal express in the frontend - does not work because terms and coniditons data is not correctly added to the set payment method information request

Contribution checklist

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

joni-jones · 2017-11-23T11:23:15Z

app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js

@@ -10,42 +10,12 @@ define([
    'mage/storage',
    'Magento_Checkout/js/model/error-processor',


Please, remove unused dependencies

joni-jones · 2017-11-23T11:26:06Z

app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php

        $data = new DataObject(
            [
                PaymentInterface::KEY_ADDITIONAL_DATA => [
                    Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,
                    Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,
-                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue
+                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue,
+                    \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttributeMock


These changes do not cover fixed bug. Please, cover them by the unit test.

…long variable name

ishakhsuvarov · 2017-11-30T10:55:38Z

Hi @therool
Could you please check failing JS Unit so we could proceed with the merge?
Thank you

therool · 2017-11-30T11:52:22Z

@ishakhsuvarov I will, I just will fix the commits, I pushed something unnecessary

therool · 2017-11-30T14:06:07Z

@ishakhsuvarov fixed. I will try to add one more JS unit test later set-payment-information-mixin.js.test under dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.js.test which will test that the agreement ids are added as extension attributes to the payment data when the Magento_Checkout/js/action/set-payment-information is being called.

ishakhsuvarov · 2017-12-01T13:41:26Z

@therool Thanks. Should we wait for the test then?
Please let us know when we can continue with review & testing.

ishakhsuvarov · 2017-12-14T07:56:03Z

Hi @therool
Do you still want to continue work on this PR? Any help needed from us?

therool · 2017-12-14T10:45:38Z

@ishakhsuvarov I will continue to work on this as everything is done I just want to add jasmine test for the checkout agreement mixins whcih is not necessary.

Maybe you know how to correctly test mixins with jasmine and squire.js as for mixins I need the squire to include the logic from https://github.com/magento/magento2/blob/2.2-develop/lib/web/mage/requirejs/mixins.js#L5 but I can't include "mage/requirejs/mixins" in the dependencies as that breaks all others tests. The test would look something like this:

/**
 * Copyright © Magento, Inc. All rights reserved.
 * See COPYING.txt for license details.
 */

define([
    'squire'
], function (Squire) {
    'use strict';

    describe('Magento_CheckoutAgreements/js/model/place-order-mixin', function () {
        var injector = new Squire(),
            mocks = {
                'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreements-assigner'),
		'Magento_Checkout/js/action/place-order': jasmine.createSpy('placeOrder'),
            },
            placeOrderAction;

        beforeAll(function (done) {
            injector.mock(mocks);
            injector.require(['mixins!Magento_Checkout/js/action/place-order'], function (placeOrder) {
                placeOrderAction = placeOrder;
                done();
            });
        });

        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
            var messageContainer = jasmine.createSpy('messageContainer'),
                paymentData = {};
            placeOrderAction(paymentData, messageContainer);
            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner']).toHaveBeenCalled();
            expect(mocks['Magento_Checkout/js/action/place-order']).toHaveBeenCalled();
        });
    });
});

And this is the one I currently have written but It does not work correctly because I can't get the 'mixins': require('mixins') working.

/**
 * Copyright © Magento, Inc. All rights reserved.
 * See COPYING.txt for license details.
 */

define([
    'squire',
    'jquery',
    'mage/requirejs/mixins'
], function (Squire, $) {
    'use strict';

    describe('Magento_CheckoutAgreements/js/model/set-payment-information-mixin', function () {
        var injector = new Squire(),
            mocks = {
                'Magento_Checkout/js/model/quote': jasmine.createSpyObj('quote', ['getQuoteId', 'billingAddress']),
                'Magento_Checkout/js/model/url-builder': jasmine.createSpyObj('urlBuilder', ['createUrl']),
                'mage/storage': jasmine.createSpyObj('storage', ['post']),
                'Magento_Checkout/js/model/error-processor': jasmine.createSpy('errorProcessor'),
                'Magento_Customer/js/model/customer': jasmine.createSpyObj('customer', ['isLoggedIn']),
                'Magento_Checkout/js/action/get-totals': jasmine.createSpy('getTotalsAction'),
                'Magento_Checkout/js/model/full-screen-loader': jasmine.createSpyObj('fullScreenLoader', ['startLoader']),
                'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreements-assigner'),
                'mixins': require('mixins')
            },
            setPaymentInformationAction;

        beforeAll(function (done) {
            window.checkoutConfig = {
                checkoutAgreements: {
                    isEnabled: true
                }
            };
            injector.mock(mocks);
            injector.require(['mixins!Magento_Checkout/js/action/set-payment-information'], function (setPaymentInformation) {
                setPaymentInformationAction = setPaymentInformation;
                done();
            });
        });

        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
            mocks['mage/storage'].post.and.callFake(function () {
                return $.Deferred();
            });
            var messageContainer = jasmine.createSpy('messageContainer'),
                paymentData = {};
            setPaymentInformationAction(messageContainer, paymentData);
            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner']).toHaveBeenCalled();
            expect(mocks['mage/storage'].post).toHaveBeenCalled();
        });
    });
});

omiroshnichenko · 2017-12-18T18:18:09Z

Hi, @therool. Here is a sample how you can test mixin:

define(['squire'], function (Squire) {
    'use strict';

    var injector1 = new Squire(),
        injector2 = new Squire(),
        mixin, paymentInformation, mock1, mock2;

    beforeEach(function (done) {
        mock1 = {
        };
        mock2 = {
            'Magento_Checkout/js/model/quote': jasmine.createSpyObj(
                'quote',
                ['totals', 'getQuoteId', 'billingAddress']
            ),
            'Magento_Checkout/js/action/get-totals': jasmine.createSpy()
        };
        window.checkoutConfig = {
            checkoutAgreements: {
                isEnabled: 1
            }
        };
        injector1.mock(mock1);
        injector2.mock(mock2);
        injector1.require(['Magento_CheckoutAgreements/js/model/set-payment-information-mixin'], function (Mixin) {
            mixin = Mixin;
            injector2.require(['Magento_Checkout/js/action/set-payment-information'], function (PaymentInformation) {
                paymentInformation = PaymentInformation;
                done();
            });
        });
    });

    describe('Magento_CheckoutAgreements/js/model/agreement-validator', function () {
        describe('"validate" method', function () {
            it('Check with non existing checkboxes', function () {
                mixin(paymentInformation)('', {});
                expect(true).toBe(true);
            });
        });
    });
});

therool · 2017-12-18T21:50:53Z

Hi @omiroshnichenko, thanks for the sample, I added mixin tests so everything should be fine now.

…2401

@therool

Applied pull request patch https://github.com/magento/magento2/pull/12401.patch (created by @therool) based on commit(s): 1. ba0472f 2. 48923e1 3. 774cb4c 4. 12145bc 5. 7bdb921 6. 70f5e38 7. 92f620f 8. 1c7123f 9. 9d5fa49 10. a35b468 Fixed GitHub Issues in 2.3-develop branch: - magento#11885: Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal (reported by @Silarn)

magento/magento2#11885 magento/magento2#12401

AppSimone · 2018-06-22T13:16:36Z

any news about dank00 patch, I've tried to install but it fails.

Applying patches for magento/module-paypal (1)
~ space48/magento2-patches: patches/Magento_Paypal/paypal-express-checkout-agreements.patch [NEW]
Fix Paypal Checkout Agreements Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal #11885

therool added 2 commits November 22, 2017 15:05

Correctly set payment information when using paypal

ba0472f

Added missing new line at the end of the file

48923e1

magento-engcom-team added Reproduced on 2.2.x The issue has been reproduced on latest 2.2 release Reproduced on 2.3.x The issue has been reproduced on latest 2.3 release labels Nov 22, 2017

joni-jones self-requested a review November 22, 2017 16:09

joni-jones suggested changes Nov 23, 2017

View reviewed changes

ishakhsuvarov added the Progress: needs update label Nov 24, 2017

ishakhsuvarov assigned ishakhsuvarov and joni-jones Nov 24, 2017

ishakhsuvarov added this to the November 2017 milestone Nov 28, 2017

ishakhsuvarov added the Release Line: 2.2 label Nov 28, 2017

Remove unnecessary dependencies and fixed unit test case excessively …

774cb4c

…long variable name

magento-team removed the Progress: needs update label Nov 28, 2017

therool added 2 commits November 28, 2017 19:58

Updated paypal jasmine tests

12145bc

Corrected typo in jasmine test

7bdb921

magento-team added the Progress: needs update label Nov 29, 2017

therool force-pushed the feature-fix-paypal branch from ccf8ade to 23f448e Compare November 30, 2017 12:16

Fixed JS Unit test

70f5e38

therool force-pushed the feature-fix-paypal branch from 23f448e to 70f5e38 Compare November 30, 2017 12:28

okorshenko modified the milestones: November 2017, December 2017 Dec 1, 2017

Prime-Host mentioned this pull request Dec 7, 2017

Could not find package copex/module-paypalfix CopeX/PaypalFix#1

Closed

roman204 mentioned this pull request Dec 12, 2017

Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal #11885

Closed

therool added 3 commits December 18, 2017 22:54

Checkout agreements mixin tests

92f620f

Test that the mixins are correctly defined and applied

1c7123f

Add newline after var declarations

9d5fa49

Fix too many nested callbacks in jasmine tests

a35b468

therool force-pushed the feature-fix-paypal branch from ce9849a to a35b468 Compare December 19, 2017 14:02

magento-team added Progress: accept and removed Progress: needs update labels Jan 3, 2018

magento-team pushed a commit that referenced this pull request Jan 3, 2018

MAGETWO-84639: Correctly set payment information when using paypal #1…

e5efbd4

…2401

magento-team merged commit a35b468 into magento:2.2-develop Jan 3, 2018

magento-engcom-team added the Fixed in 2.2.x The issue has been fixed in 2.2 release line label Jan 3, 2018

yanncharlou mentioned this pull request Apr 19, 2018

Can't Accept Checkout Agreements using inShop integration PaylineByMonext/payline-magento-2#6

Open

dangron pushed a commit to Space48/magento2-patches that referenced this pull request Jun 13, 2018

Add patch for paypal not handling checkout agreements

a3b8fb0

magento/magento2#11885 magento/magento2#12401

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Correctly set payment information when using paypal #12401

Correctly set payment information when using paypal #12401

therool commented Nov 22, 2017 •

edited

Loading

joni-jones Nov 23, 2017

joni-jones Nov 23, 2017 •

edited

Loading

ishakhsuvarov commented Nov 30, 2017

therool commented Nov 30, 2017

therool commented Nov 30, 2017

ishakhsuvarov commented Dec 1, 2017

ishakhsuvarov commented Dec 14, 2017

therool commented Dec 14, 2017

omiroshnichenko commented Dec 18, 2017

therool commented Dec 18, 2017

AppSimone commented Jun 22, 2018

		@@ -10,42 +10,12 @@ define([
		'mage/storage',
		'Magento_Checkout/js/model/error-processor',

Correctly set payment information when using paypal #12401

Correctly set payment information when using paypal #12401

Conversation

therool commented Nov 22, 2017 • edited Loading

Description

Fixed Issues (if relevant)

Manual testing scenarios

Contribution checklist

joni-jones Nov 23, 2017

Choose a reason for hiding this comment

joni-jones Nov 23, 2017 • edited Loading

Choose a reason for hiding this comment

ishakhsuvarov commented Nov 30, 2017

therool commented Nov 30, 2017

therool commented Nov 30, 2017

ishakhsuvarov commented Dec 1, 2017

ishakhsuvarov commented Dec 14, 2017

therool commented Dec 14, 2017

omiroshnichenko commented Dec 18, 2017

therool commented Dec 18, 2017

AppSimone commented Jun 22, 2018

therool commented Nov 22, 2017 •

edited

Loading

joni-jones Nov 23, 2017 •

edited

Loading