Merge branch 'MAGETWO-42099' into sprint70_mb

magento · Sep 2, 2015 · 5386fa0 · 5386fa0
2 parents ce23d68 + e317d07
commit 5386fa0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/transparent.js
@@ -6,10 +6,9 @@
 define([
     "jquery",
     "mage/template",
-    "Magento_Checkout/js/action/set-payment-information",
     "jquery/ui",
     "Magento_Payment/js/model/credit-card-validation/validator"
-], function($, mageTemplate, setPaymentInformationAction){
+], function($, mageTemplate){
     'use strict';
 
     $.widget('mage.transparent', {
@@ -74,7 +73,6 @@ define([
          * @private
          */
         _orderSave: function() {
-            setPaymentInformationAction();
             var postData = $(this.options.paymentFormSelector).serialize();
             if ($(this.options.reviewAgreementForm).length) {
                 postData += '&' + $(this.options.reviewAgreementForm).serialize();

diff --git a/...ode/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js b/...ode/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
@@ -5,9 +5,11 @@
 /*global define*/
 define(
     [
-        'Magento_Payment/js/view/payment/iframe'
+        'jquery',
+        'Magento_Payment/js/view/payment/iframe',
+        'Magento_Checkout/js/action/set-payment-information'
     ],
-    function (Component) {
+    function ($, Component, setPaymentInformationAction) {
         'use strict';
 
         return Component.extend({
@@ -42,8 +44,14 @@ define(
             },
 
             placeOrder: function() {
+                var self = this;
                 if (this.validateHandler()) {
-                    this.placeOrderHandler();
+                    this.isPlaceOrderActionAllowed(false);
+                    $.when(setPaymentInformationAction()).done(function() {
+                        self.placeOrderHandler();
+                    }).fail(function() {
+                        self.isPlaceOrderActionAllowed(true);
+                    });
                 }
             }
         });