Update PayPal API version and allow Incontext and Shortcut at the sam…

…e time (#2190)
wp-e-commerce · Dec 1, 2016 · 3699633 · 3699633
1 parent cdacf3b
commit 3699633
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/wpsc-components/merchant-core-v3/gateways/paypal-express-checkout.php b/wpsc-components/merchant-core-v3/gateways/paypal-express-checkout.php
@@ -44,11 +44,11 @@ public function __construct( $options, $child = false ) {
 			) );
 
 			// Express Checkout Button
-			if ( (bool) $this->setting->get( 'shortcut' ) && ! (bool) $this->setting->get( 'incontext' ) ) {
+			if ( (bool) $this->setting->get( 'shortcut' ) ) {
 				add_action( 'wpsc_cart_item_table_form_actions_left', array( $this, 'add_ecs_button' ), 2, 2 );
 			}
 			// Incontext Checkout Scripts
-			if ( (bool) $this->setting->get( 'incontext' ) && ! (bool) $this->setting->get( 'shortcut' ) ) {
+			if ( (bool) $this->setting->get( 'incontext' ) ) {
 				add_action( 'wp_enqueue_scripts', array( $this, 'incontext_load_scripts' ) );
 			}
 		}

diff --git a/wpsc-components/merchant-core-v3/gateways/php-merchant/gateways/paypal-pro.php b/wpsc-components/merchant-core-v3/gateways/php-merchant/gateways/paypal-pro.php
@@ -4,7 +4,7 @@
 
 class PHP_Merchant_Paypal_Pro extends PHP_Merchant_Paypal
 {
-	const API_VERSION = '117.0';
+	const API_VERSION = '204';
 	const SANDBOX_URL = 'https://api-3t.sandbox.paypal.com/nvp';
 	const LIVE_URL = 'https://api-3t.paypal.com/nvp';
 

diff --git a/wpsc-components/merchant-core-v3/gateways/php-merchant/gateways/paypal.php b/wpsc-components/merchant-core-v3/gateways/php-merchant/gateways/paypal.php
@@ -31,7 +31,7 @@ abstract class PHP_Merchant_Paypal extends PHP_Merchant
 		'USD',
 	);
 
-	const API_VERSION = '114.0';
+	const API_VERSION = '204';
 	const SANDBOX_URL = 'https://api-3t.sandbox.paypal.com/nvp';
 	const LIVE_URL = 'https://api-3t.paypal.com/nvp';