Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use one variable for endpoint in paypal

This commit is contained in:
Mike Jolley 2014-11-18 12:51:29 +00:00
parent 2e9f02932d
commit e68353da63
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
includes/gateways/paypal/class-wc-gateway-paypal.php
View File

@ -26,8 +26,6 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
$this->id = 'paypal';
$this->has_fields = false;
$this->order_button_text = __( 'Proceed to PayPal', 'woocommerce' );
$this->liveurl = 'https://www.paypal.com/cgi-bin/webscr';
$this->testurl = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
$this->method_title = __( 'PayPal', 'woocommerce' );
$this->method_description = __( 'PayPal standard works by sending the user to PayPal to enter their payment information.', 'woocommerce' );
$this->notify_url = WC()->api_request_url( 'WC_Gateway_Paypal' );
@ -57,6 +55,12 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
$this->api_password = $this->get_option( 'api_password' );
$this->api_signature = $this->get_option( 'api_signature' );
if ( 'yes' == $this->testmode ) {
$this->endpoint = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
} else {
$this->endpoint = 'https://www.paypal.com/cgi-bin/webscr';
}
// Actions
add_action( 'valid-paypal-standard-ipn-request', array( $this, 'successful_request' ) );
add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
@ -440,11 +444,10 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
$order = wc_get_order( $order_id );
$paypal_args = $this->get_paypal_args( $order );
$paypal_args = http_build_query( $paypal_args, '', '&' );
$paypal_adr = $this->endpoint . '?';
if ( 'yes' == $this->testmode ) {
$paypal_adr = $this->testurl . '?test_ipn=1&';
} else {
$paypal_adr = $this->liveurl . '?';
$paypal_adr .= 'test_ipn=1&';
}
return array(
@ -525,14 +528,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
* Check PayPal IPN validity
**/
public function check_ipn_request_is_valid( $ipn_response ) {
// Get url
if ( 'yes' == $this->testmode ) {
$paypal_adr = $this->testurl;
} else {
$paypal_adr = $this->liveurl;
}
$this->log( 'Checking IPN response is valid via ' . $paypal_adr . '...' );
$this->log( 'Checking IPN response is valid via ' . $this->endpoint . '...' );
// Get received values from post data
$validate_ipn = array( 'cmd' => '_notify-validate' );
@ -552,7 +548,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
$this->log->add( 'IPN Request: ' . print_r( $params, true ) );
// Post back to get a response
$response = wp_remote_post( $paypal_adr, $params );
$response = wp_remote_post( $this->endpoint, $params );
$this->log( 'IPN Response: ' . print_r( $response, true ) );
@ -777,12 +773,6 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
case 'completed' :
// Validate transaction
if ( 'yes' == $this->testmode ) {
$paypal_adr = $this->testurl;
} else {
$paypal_adr = $this->liveurl;
}
$pdt = array(
'body' => array(
'cmd' => '_notify-synch',
@ -796,7 +786,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
);
// Post back to get a response
$response = wp_remote_post( $paypal_adr, $pdt );
$response = wp_remote_post( $this->endpoint, $pdt );
if ( is_wp_error( $response ) ) {
return false;
@ -889,7 +879,6 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
* @return string
*/
public function get_transaction_url( $order ) {
if ( 'yes' == $this->testmode ) {
$this->view_transaction_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s';
} else {