Merge pull request #29 from bibich/button-source

Added button source for Thelia
thelia-modules · Oct 4, 2016 · ad0034d · ad0034d
2 parents f4fb1e8 + c44d494
commit ad0034d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/Classes/API/PaypalApiManager.php b/Classes/API/PaypalApiManager.php
@@ -39,6 +39,9 @@ class PaypalApiManager
     /** SandBox API */
     const DEFAULT_NVP_3T_API_URL_SANDBOX = 'https://api-3t.sandbox.paypal.com/nvp';
 
+    /** Button Source - Identification code for third-party applications */
+    const BUTTON_SOURCE = 'Thelia_Cart';
+
     /** API Version */
     const API_VERSION = '108.0';
 

diff --git a/Classes/NVP/Operations/PaypalNvpOperationsDoExpressCheckoutPayment.php b/Classes/NVP/Operations/PaypalNvpOperationsDoExpressCheckoutPayment.php
@@ -51,8 +51,9 @@ class PaypalNvpOperationsDoExpressCheckoutPayment extends PaypalNvpOperationsBas
 
     /** @var string URL IPN listener */
     protected $ipnListenerUrl = null;
-    /** @var string Thelia_Cart_ECM|Thelia_Cart_ECS */
-    //protected $buttonSource;
+
+    /** @var string Button Source for Thelia_Cart */
+    protected $buttonSource;
 
     /**
      * Constructor
@@ -73,8 +74,8 @@ public function __construct(
         $payerId,
         $paymentAction,
         $token,
-        $ipnListenerUrl
-        //$buttonSource
+        $ipnListenerUrl,
+        $buttonSource = null
     ) {
         $this->operationName  = 'DoExpressCheckoutPayment';
         $this->token          = $token;
@@ -84,7 +85,7 @@ public function __construct(
         $this->currencyId     = $currencyId;
         $this->paymentAction  = $paymentAction;
         $this->ipnListenerUrl = $ipnListenerUrl;
-        //$this->buttonSource = $buttonSource;
+        $this->buttonSource   = $buttonSource;
     }
 
     /**
@@ -98,8 +99,10 @@ public function getRequest()
         $request .= '&PAYMENTREQUEST_0_AMT=' . $this->amount;
         $request .= '&PAYMENTREQUEST_0_CURRENCYCODE=' . $this->currencyId;
         $request .= '&PAYMENTREQUEST_0_PAYMENTACTION=' . $this->paymentAction;
+        if (null !== $this->buttonSource) {
+            $request .='&BUTTONSOURCE=' . $this->buttonSource;
+        }
 
-        //$request .='&BUTTONSOURCE=' . $this->buttonSource;
         return $request;
     }
 }
diff --git a/Config/module.xml b/Config/module.xml
@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <author>
         <name>Thelia</name>
         <email>info@thelia.net</email>

diff --git a/Controller/PaypalResponse.php b/Controller/PaypalResponse.php
@@ -105,7 +105,8 @@ public function ok($order_id)
                         $payerid,
                         PaypalApiManager::PAYMENT_TYPE_SALE,
                         $token,
-                        URL::getInstance()->absoluteUrl("/module/paypal/listen")
+                        URL::getInstance()->absoluteUrl("/module/paypal/listen"),
+                        PaypalApiManager::BUTTON_SOURCE
                     );
 
                     $request  = new PaypalNvpMessageSender($doExpressCheckout, $token);
@@ -116,7 +117,7 @@ public function ok($order_id)
                     // In case of pending status, log the reason to get usefull information (multi-currency problem, ...)
                     if (isset($response['ACK']) && $response['ACK'] === "Success" &&
                         isset($response['PAYMENTINFO_0_PAYMENTSTATUS']) && $response['PAYMENTINFO_0_PAYMENTSTATUS'] === "Pending") {
-                        $this->getTranslator()->trans(
+                        $message = $this->getTranslator()->trans(
                             "Paypal transaction is pending. Reason: %reason",
                             [ 'reason' => $response['PAYMENTINFO_0_PENDINGREASON'] ],
                             Paypal::DOMAIN
@@ -148,6 +149,8 @@ public function ok($order_id)
             } else {
                 $message = $this->getTranslator()->trans("Failed to find PayerID", [], Paypal::DOMAIN);
             }
+
+            $this->logger->getLogger()->info("Order [" . $order_id . "] : " . $message);
         } catch (RedirectException $ex) {
             throw $ex;
         } catch (\Exception $ex) {