Merge remote-tracking branch 'origin/MAGETWO-50902' into MPI-BUGFIXES

Viktor Tymchynskyi · Viktor Tymchynskyi · commit 890d726c20d2 · 2016-04-05T15:50:06.000+03:00
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
@@ -21,7 +21,6 @@ class Start extends GetToken
     public function execute()
     {
         try {
-
             $token = $this->getToken();
             if ($token === null) {
 
diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php
@@ -53,8 +53,9 @@ public function execute()
             if ($token === null) {
                 $token = false;
             }
+            $url = $this->_checkout->getRedirectUrl();
             $this->_initToken($token);
-            $controllerResult->setData(['token' => $token]);
+            $controllerResult->setData(['url' => $url]);
         } catch (LocalizedException $exception) {
             $this->messageManager->addExceptionMessage(
                 $exception,
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout.js
@@ -42,8 +42,8 @@ define(
                             }
                         ).done(
                             function (response) {
-                                if (response && response.token) {
-                                    paypalExpressCheckout.checkout.startFlow(response.token);
+                                if (response && response.url) {
+                                    paypalExpressCheckout.checkout.startFlow(response.url);
 
                                     return;
                                 }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -52,8 +52,8 @@ define(
                                         }
                                     ).done(
                                         function (response) {
-                                            if (response && response.token) {
-                                                paypalExpressCheckout.checkout.startFlow(response.token);
+                                            if (response && response.url) {
+                                                paypalExpressCheckout.checkout.startFlow(response.url);
 
                                                 return;
                                             }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ class Start extends GetToken`
`21`	`21`	`public function execute()`
`22`	`22`	`{`
`23`	`23`	`try {`
`24`		`-`
`25`	`24`	`$token = $this->getToken();`
`26`	`25`	`if ($token === null) {`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ define(`
`42`	`42`	`}`
`43`	`43`	`).done(`
`44`	`44`	`function (response) {`
`45`		`- if (response && response.token) {`
`46`		`- paypalExpressCheckout.checkout.startFlow(response.token);`
	`45`	`+ if (response && response.url) {`
	`46`	`+ paypalExpressCheckout.checkout.startFlow(response.url);`
`47`	`47`
`48`	`48`	`return;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ define(`
`52`	`52`	`}`
`53`	`53`	`).done(`
`54`	`54`	`function (response) {`
`55`		`- if (response && response.token) {`
`56`		`- paypalExpressCheckout.checkout.startFlow(response.token);`
	`55`	`+ if (response && response.url) {`
	`56`	`+ paypalExpressCheckout.checkout.startFlow(response.url);`
`57`	`57`
`58`	`58`	`return;`
`59`	`59`	`}`