Merge branch 'FearlessKiwis-MAGETWO-39280-Set-Total-amount-in-checkout-flow-order' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Robert He · Robert He · commit d46c71434ad6 · 2015-06-29T11:34:54.000-05:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js b/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js
@@ -80,9 +80,10 @@ define(
                         });
                         if (proceed) {
                             quote.setPaymentMethod(methodData.method);
+                            //set the totals before setting PaymentData
+                            quote.setTotals(response);
                             service.setSelectedPaymentData(methodData);
                             service.setSelectedPaymentInfo(methodInfo);
-                            quote.setTotals(response);
                             navigator.setCurrent('paymentMethod').goNext();
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,10 @@ define(`
`80`	`80`	`});`
`81`	`81`	`if (proceed) {`
`82`	`82`	`quote.setPaymentMethod(methodData.method);`
	`83`	`+ //set the totals before setting PaymentData`
	`84`	`+ quote.setTotals(response);`
`83`	`85`	`service.setSelectedPaymentData(methodData);`
`84`	`86`	`service.setSelectedPaymentInfo(methodInfo);`
`85`		`- quote.setTotals(response);`
`86`	`87`	`navigator.setCurrent('paymentMethod').goNext();`
`87`	`88`	`}`
`88`	`89`	`}`