Changeset 2817 for trunk/system/libraries/drivers/Payment/Paypal.php

Timestamp:

06/11/2008 08:24:54 AM (5 months ago)

Author:

zombor

Message:

Fixing some bad paypal code.

Files:

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

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

@@ -31 +31 @@
                 'RETURNURL'     => FALSE,
                 'CANCELURL'     => FALSE,
-                'PAYPALURL'     => FALSE,
-
-                'PAYMENTACTION' => FALSE,
 
                 'CURRENCYCODE'  => FALSE, // default is USD - only required if other currency needed
@@ -57 +54 @@
                 'CURRENCYCODE'  => '', // default is USD - only required if other currency needed
                 'MAXAMT'        => '',
-
-                'PAYMENTACTION' => '', // 'Sale', 'Authorization' or 'Order' see: https://www.paypal.com/en_US/ebook/PP_NVPAPI_DeveloperGuide/Appx_fieldreference.html#2557853
 
                 // USERACTION defaults to 'continue'
@@ -132 +127 @@
                 'METHOD'        => 'DoExpressCheckoutPayment',
                 'TOKEN'         => '', // this token is retrieved from the response to the setExpressCheckout call
-                'PAYMENTACTION' => '', // 'Sale', 'Authorization' or 'Order' see: https://www.paypal.com/en_US/ebook/PP_NVPAPI_DeveloperGuide/Appx_fieldreference.html#2557853
                 'PAYERID'       => '',
                 'AMT'           => '', // payment amount - MUST include decimal point followed by two further digits
@@ -218 +212 @@
 
                 $this->test_mode = $config['test_mode'];
+                $this->api_connection_fields['PAYPALURL'] = 'https://www.paypal.com/webscr&cmd=_express-checkout&token=';
 
                 if ($this->test_mode)
@@ -226 +221 @@
 
                         $this->api_connection_fields['ENDPOINT']     = $config['SANDBOX_ENDPOINT'];
-                        $this->api_connection_fields['PAYPALURL']    = $config['SANDBOX_PAYPALURL'];
+                        $this->api_connection_fields['PAYPALURL']    = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=';
                 }
 
@@ -248 +243 @@
                         {
                                 case 'amount':
-                                $key = 'AMT';
-                                break;
+                                        $key = 'AMT';
+                                        break;
                                 default:
                         }