From df1d04545b439b753d1e54187ffc51671d3980c7 Mon Sep 17 00:00:00 2001 From: pavel Date: Sat, 8 Sep 2018 17:26:12 +0300 Subject: [PATCH 1/3] Implemented 17964: Backend Order creation Authorizenet: If invalid credit card number is entered the loader keeps spinning forever without any error message --- .../Sales/view/adminhtml/web/order/create/scripts.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index e653ed2a955ec..bfeb70ee1ea16 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -1171,8 +1171,10 @@ define([ submit : function() { - jQuery('#edit_form').trigger('processStart'); - jQuery('#edit_form').trigger('submitOrder'); + if(jQuery('#edit_form').valid()) { + jQuery('#edit_form').trigger('processStart'); + jQuery('#edit_form').trigger('submitOrder'); + } }, _realSubmit: function () { From ba431d60828e6c82614aadc1104beff6a4472a44 Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 20 Sep 2018 18:39:54 +0300 Subject: [PATCH 2/3] Refactored Implemented 17964: Backend Order creation Authorizenet: If invalid credit card number is entered the loader keeps spinning forever without any error message --- .../Sales/view/adminhtml/web/order/create/scripts.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index bfeb70ee1ea16..233fccab4fd27 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -1171,9 +1171,10 @@ define([ submit : function() { - if(jQuery('#edit_form').valid()) { - jQuery('#edit_form').trigger('processStart'); - jQuery('#edit_form').trigger('submitOrder'); + var $editForm = jQuery('#edit_form'); + if ($editForm.valid()) { + $editForm.trigger('processStart'); + $editForm.trigger('submitOrder'); } }, From 124da1635d535797b81163d7f44b04f8ccbff867 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 4 Oct 2018 12:05:41 +0300 Subject: [PATCH 3/3] Fixed code style issue --- .../Magento/Sales/view/adminhtml/web/order/create/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index 233fccab4fd27..259ca2165e647 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -1172,6 +1172,7 @@ define([ submit : function() { var $editForm = jQuery('#edit_form'); + if ($editForm.valid()) { $editForm.trigger('processStart'); $editForm.trigger('submitOrder');