Changeset 1978

Timestamp:

02/06/2008 09:40:02 PM (10 months ago)

Author:

zombor

Message:

Fixing a bug where Paypal cares about the order of variables it receives.

Files:

• trunk/system/libraries/drivers/Payment/Paypal.php (modified) (5 diffs)

trunk/system/libraries/drivers/Payment/Paypal.php

@@ -35 +35 @@
                 'API_Signature' => '',
                 'API_Endpoint'  => 'https://api-3t.paypal.com/nvp',
-                'version'       => '3.0',
+                'version'       => '3.2',
                 'Amt'           => 0,
                 'PAYMENTACTION' => 'Sale',
@@ -59 +59 @@
                 $this->paypal_values['ReturnUrl']     = $config['ReturnUrl'];
                 $this->paypal_values['CANCELURL']     = $config['CANCELURL'];
+                $this->paypal_values['error_url']     = $config['CANCELURL'];
                 $this->paypal_values['CURRENCYCODE']  = $config['CURRENCYCODE'];
                 $this->paypal_values['API_Endpoint']  = ($config['test_mode']) ? 'https://api.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
@@ -158 +159 @@
         protected function paypal_login()
         {
-                $data = '&Amt='.$this->paypal_values['Amt'].
-                        '&PAYMENTACTION='.$this->paypal_values['PAYMENTACTION'].
-                        '&ReturnURL='.$this->paypal_values['ReturnUrl'].
-                        '&CancelURL='.$this->paypal_values['CANCELURL'];
+                $data = '&AMT='.urlencode($this->paypal_values['Amt']).
+                        //'&PAYMENTACTION='.$this->paypal_values['PAYMENTACTION'].
+                        '&RETURNURL='.urlencode($this->paypal_values['ReturnUrl']).
+                        '&CANCELURL='.urlencode($this->paypal_values['CANCELURL']);
 
                 $reply = $this->contact_paypal('SetExpressCheckout', $data);
@@ -195 +196 @@
         protected function contact_paypal($method, $data)
         {
-                $final_data = 'METHOD='.urlencode($method).
+                $final_data = 'USER='.urlencode($this->paypal_values['API_UserName']).
+                              '&PWD='.urlencode($this->paypal_values['API_Password']).
+                              '&SIGNATURE='.urlencode($this->paypal_values['API_Signature']).
                               '&VERSION='.urlencode($this->paypal_values['version']).
-                              '&PWD='.urlencode($this->paypal_values['API_Password']).
-                              '&USER='.urlencode($this->paypal_values['API_UserName']).
-                              'SIGNATURE='.urlencode($this->paypal_values['API_Signature']).$data;
+                              '&METHOD='.urlencode($method).$data;
 
                 Log::add('debug', 'Connecting to '.$this->paypal_values['API_Endpoint']);
@@ -218 +219 @@
                         // Moving to error page to display curl errors
                         $this->session->set_flash(array('curl_error_no' => curl_errno($ch), 'curl_error_msg' => curl_error($ch)));
-                        url::redirect($this->error_url);
+                        url::redirect($this->paypal_values['error_url']);
                 }
                 else