refactored SetExpressCheckout API call

srmklive · Jun 28, 2016 · b072c5d · b072c5d
1 parent b1797ad
commit b072c5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/Services/ExpressCheckout.php b/src/Services/ExpressCheckout.php
@@ -65,6 +65,11 @@ public function setExpressCheckout($data, $subscription = false)
 
         $response = $this->doPayPalRequest('SetExpressCheckout', $post);
 
+        if (!empty($response['TOKEN'])) {
+            $response['paypal_link'] = $this->config['gateway_url'] .
+                '/webscr?cmd=_express-checkout&token=' . $response['TOKEN'];
+        }
+
         return $response;
     }
 

diff --git a/src/Traits/PayPalRequest.php b/src/Traits/PayPalRequest.php
@@ -156,18 +156,6 @@ private function doPayPalRequest($method, $params)
             $response = $request->getBody(true);
             $response = $this->retrieveData($response);
 
-            if ($method == 'SetExpressCheckout') {
-                if (!empty($response['TOKEN'])) {
-                    $response['paypal_link'] = $this->config['gateway_url'] .
-                        '/webscr?cmd=_express-checkout&token=' . $response['TOKEN'];
-                } else {
-                    return [
-                        'type'      => 'error',
-                        'message'   => trans('paypal::error.paypal_connection_error')
-                    ];
-                }
-            }
-
             return $response;
 
         } catch (ClientException $e) {