Merge branch 'plenty_dev'

* plenty_dev: ADD additional payment data to preparePayment request FIX disable atriga user confirmation by default
plentymarkets · Mar 4, 2016 · c6fb04c · c6fb04c
2 parents 89a3945 + efcbd0a
commit c6fb04c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/dist/plentymarketsCMStools-1.0.6.js b/dist/plentymarketsCMStools-1.0.6.js
diff --git a/dist/plentymarketsCMStools-1.0.6.js.map b/dist/plentymarketsCMStools-1.0.6.js.map
diff --git a/dist/plentymarketsCMStools-1.0.6.min.js b/dist/plentymarketsCMStools-1.0.6.min.js
diff --git a/dist/plentymarketsCMStools-1.0.6.min.js.map b/dist/plentymarketsCMStools-1.0.6.min.js.map
diff --git a/src/services/CheckoutService.js b/src/services/CheckoutService.js
@@ -287,7 +287,9 @@
          */
         function preparePayment()
         {
-            return API.post( "/rest/checkout/preparepayment/", null, true )
+            var paymentID = Checkout.getCheckout().CheckoutMethodOfPaymentID;
+            var paymentData = $('input[type="radio"][name="MethodOfPaymentID"][value="' + paymentID + '"]').parent().getFormValues();
+            return API.post( "/rest/checkout/preparepayment/", paymentData, true )
                 .done( function( response )
                 {
                     if ( response.data.CheckoutMethodOfPaymentRedirectURL != '' )
@@ -384,6 +386,12 @@
             }
             */
             Checkout.getCheckout().CheckoutMethodOfPaymentID = paymentID;
+
+            if( !pm.getGlobal('Checkout.AtrigaRequireUserConfirmation') )
+            {
+                Checkout.getCheckout().CheckoutAtrigapaymaxChecked = true;
+            }
+
             delete Checkout.getCheckout().CheckoutCustomerShippingAddressID;
             delete Checkout.getCheckout().CheckoutShippingProfileID;
 

diff --git a/tools/scripts.json b/tools/scripts.json
@@ -9,7 +9,7 @@
       "libs/jquery.touchSwipe.min.js",
       "libs/jquery.ui.touch-punch.min.js",
       "plenty/plenty-2.js",
-      "plenty/plentymarketsCMStools-1.0.5.js"
+      "plenty/plentymarketsCMStools-1.0.6.js"
     ]
   },
   "PageDesignContent": {