Merge remote-tracking branch 'mpi/MC-35692' into MPI-2020-09-14

Author: bubasuma

app/code/Magento/Payment/view/adminhtml/web/js/transparent.js

@@ -52,28 +52,29 @@ define([
          * @param {String} method
          */
         _setPlaceOrderHandler: function (event, method) {
+            var $editForm = $(this.options.editFormSelector);
+
+            $editForm.off('beforeSubmitOrder.' + this.options.gateway);
+
             if (method === this.options.gateway) {
-                $(this.options.editFormSelector)
-                    .off('submitOrder')
-                    .on('submitOrder.' +  this.options.gateway, this._placeOrderHandler.bind(this));
-            } else {
-                $(this.options.editFormSelector)
-                    .off('submitOrder.' + this.options.gateway);
+                $editForm.on('beforeSubmitOrder.' +  this.options.gateway, this._placeOrderHandler.bind(this));
             }
         },
 
         /**
          * Handler for form submit to call gateway for credit card validation.
          *
+         * @param {Event} event
          * @return {Boolean}
          * @private
          */
-        _placeOrderHandler: function () {
+        _placeOrderHandler: function (event) {
             if ($(this.options.editFormSelector).valid()) {
                 this._orderSave();
             } else {
                 $('body').trigger('processStop');
             }
+            event.stopImmediatePropagation();
 
             return false;
         },

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -481,6 +481,13 @@ define([
         },
 
         switchPaymentMethod: function(method){
+            if (this.paymentMethod !== method) {
+                jQuery('#edit_form')
+                    .off('submitOrder')
+                    .on('submitOrder', function(){
+                        jQuery(this).trigger('realOrder');
+                    });
+            }
             jQuery('#edit_form').trigger('changePaymentMethod', [method]);
             this.setPaymentMethod(method);
             var data = {};
@@ -1308,11 +1315,16 @@ define([
         },
 
         submit: function () {
-            var $editForm = jQuery('#edit_form');
+            var $editForm = jQuery('#edit_form'),
+                beforeSubmitOrderEvent;
 
             if ($editForm.valid()) {
                 $editForm.trigger('processStart');
-                $editForm.trigger('submitOrder');
+                beforeSubmitOrderEvent = jQuery.Event('beforeSubmitOrder');
+                $editForm.trigger(beforeSubmitOrderEvent);
+                if (beforeSubmitOrderEvent.result !== false) {
+                    $editForm.trigger('submitOrder');
+                }
             }
         },
 

dev/tests/js/jasmine/tests/app/code/Magento/Payment/adminhtml/web/js/transparent.test.js

@@ -0,0 +1,84 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*eslint-disable max-nested-callbacks*/
+/*jscs:disable jsDoc*/
+define([
+    'jquery',
+    'jquery/validate',
+    'Magento_Payment/js/transparent'
+], function ($) {
+    'use strict';
+
+    var containerEl,
+        formEl,
+        jQueryAjax;
+
+    function init(config) {
+        var defaultConfig = {
+            orderSaveUrl: '/',
+            gateway: 'payflowpro',
+            editFormSelector: '#' + formEl.id
+        };
+
+        $(formEl).find(':radio[value="payflowpro"]').prop('checked', 'checked');
+        $(formEl).transparent($.extend({}, defaultConfig, config || {}));
+    }
+
+    beforeEach(function () {
+        if (!window.FORM_KEY) {
+            window.FORM_KEY = '61d0c9da0aa473d214f61913967cc0ea';
+        }
+        $('<div id="admin_edit_order_form_container">' +
+            '<form id="admin_edit_order_form" action="/">' +
+                '<input type="radio" name="payment[method]" value="payflowpro"/>' +
+                '<input type="radio" name="payment[method]" value="money_order"/>' +
+            '</form>' +
+            '</div>'
+        ).appendTo(document.body);
+        containerEl = document.getElementById('admin_edit_order_form_container');
+        formEl = document.getElementById('admin_edit_order_form');
+        jQueryAjax = $.ajax;
+    });
+
+    afterEach(function () {
+        $(containerEl).remove();
+        formEl = undefined;
+        containerEl = undefined;
+        $.ajax = jQueryAjax;
+        jQueryAjax = undefined;
+    });
+
+    describe('Magento_Payment/js/transparent', function () {
+        describe('beforeSubmitOrder handler', function () {
+            it('is registered when selected payment method requires transparent', function () {
+                init();
+                expect(($._data(formEl, 'events') || {}).beforeSubmitOrder[0].type).toBe('beforeSubmitOrder');
+                expect(($._data(formEl, 'events') || {}).beforeSubmitOrder[0].namespace).toBe('payflowpro');
+            });
+            it('is not registered when selected payment method does not require transparent', function () {
+                init();
+                $(formEl).find(':radio[value="money_order"]').prop('checked', 'checked');
+                $(formEl).trigger('changePaymentMethod', ['money_order']);
+                expect(($._data(formEl, 'events') || {}).beforeSubmitOrder).toBeUndefined();
+            });
+            it('returns false to prevent normal order creation', function () {
+                var beforeSubmitOrderEvent;
+
+                $.ajax = jasmine.createSpy();
+                init({
+                    orderSaveUrl: '/admin/paypal/transparent/requestSecureToken'
+                });
+                beforeSubmitOrderEvent = $.Event('beforeSubmitOrder');
+                $(formEl).trigger(beforeSubmitOrderEvent);
+                expect($.ajax).toHaveBeenCalledWith(jasmine.objectContaining({
+                    url: '/admin/paypal/transparent/requestSecureToken',
+                    type: 'post'
+                }));
+                expect(beforeSubmitOrderEvent.result).toBe(false);
+                expect(beforeSubmitOrderEvent.isImmediatePropagationStopped()).toBe(true);
+            });
+        });
+    });
+});