Changeset 1479700

Timestamp:

08/20/2016 10:12:27 PM (8 years ago)

Author:

akeda

Message:

Preparing for 1.1.2 release

Location:

woocommerce-gateway-paypal-express-checkout/trunk

Files:

• includes/abstracts/abstract-wc-gateway-ppec-paypal-request-handler.php (added)
• includes/abstracts/abstract-wc-gateway-ppec.php (modified) (2 diffs)
• includes/class-wc-gateway-ppec-checkout-handler.php (modified) (3 diffs)
• includes/class-wc-gateway-ppec-client-credential-certificate.php (modified) (4 diffs)
• includes/class-wc-gateway-ppec-client.php (modified) (3 diffs)
• includes/class-wc-gateway-ppec-ipn-handler.php (added)
• includes/class-wc-gateway-ppec-plugin.php (modified) (3 diffs)
• includes/class-wc-gateway-ppec-settings.php (modified) (3 diffs)
• includes/class-wc-gateway-ppec-with-paypal.php (modified) (1 diff)
• includes/functions.php (modified) (1 diff)
• languages (added)
• languages/woocommerce-gateway-paypal-express-checkout.pot (added)
• readme.txt (modified) (2 diffs)
• woocommerce-gateway-paypal-express-checkout.php (modified) (2 diffs)

woocommerce-gateway-paypal-express-checkout/trunk/includes/abstracts/abstract-wc-gateway-ppec.php

@@ -235 +235 @@
 
             if ( empty( $password ) ) {
-                WC_Admin_Settings::add_error( sprintf( __( 'Error: You must enter a %s API password.' ), __( $settings->get_environment(), 'woocommerce-gateway-paypal-express-checkout' ) ) );
+                WC_Admin_Settings::add_error(  ) );
                 return false;
             }
@@ -456 +456 @@
      */
     public function is_available() {
-        if ( 'yes' !== $this->enabled ) {
-            return false;
-        }
-        return true;
+        return 'yes' === $this->enabled;
     }
 }

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-checkout-handler.php

@@ -407 +407 @@
     }
 
+
+
+
+
+
+
+
     protected function is_success( $response ) {
-        if ( 'Success' == $response['ACK'] || 'SuccessWithWarning' == $response['ACK'] ) {
-            return true;
-        } else {
-            return false;
-        }
+        
+            
+        
+            
+        
     }
 
@@ -550 +557 @@
         $response = wc_gateway_ppec()->client->get_express_checkout_details( $token );
 
-        if ( 'Success' == $response['ACK'] || 'SuccessWithWarning' == $response['ACK'] ) {
+        if (  ) {
             $checkout_details = new PayPal_Checkout_Details();
             $checkout_details->loadFromGetECResponse( $response );
@@ -575 +582 @@
         // Generate params to send to paypal, then do request
         $response = wc_gateway_ppec()->client->do_express_checkout_payment( array_merge(
-            $settings->get_do_express_checkout_params(),
             $this->getDoExpressCheckoutParameters( $token, $payerID ),
-            array(
-                'PAYMENTREQUEST_0_INVNUM' => $settings->invoice_prefix . $order->get_order_number(),
-            )
+            $settings->get_do_express_checkout_params( $order )
         ) );
 

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-client-credential-certificate.php

@@ -64 +64 @@
 
         if ( false === curl_setopt( $handle, CURLOPT_SSLCERT, $certificate_file ) ) {
-            throw new Exception( __( 'Unable to accept certificate during cURL configuration', 'woocommerce-gateway-ppec' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( __( 'Unable to accept certificate during cURL configuration', 'woocommerce-gateway-p' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
 
         if ( $this->_use_secure_transport() && false === curl_setopt( $handle, CURLOPT_SSLCERTPASSWD, $password ) ) {
-            throw new Exception( __( 'Unable to accept certificate password during cURL configuration', 'woocommerce-gateway-ppec' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( __( 'Unable to accept certificate password during cURL configuration', 'woocommerce-gateway-p' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
     }
@@ -85 +85 @@
         $temp_file = tempnam( sys_get_temp_dir(), 'pptmp_' );
         if ( ! $temp_file ) {
-            throw new Exception( sprintf( __( 'Unable to write certificate file %s during cURL configuration', 'woocommerce-gateway-ppec' ), $temp_file ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( sprintf( __( 'Unable to write certificate file %s during cURL configuration', 'woocommerce-gateway-p' ), $temp_file ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
 
@@ -111 +111 @@
 
         if ( false === $private_key ) {
-            throw new Exception( __( 'Failed to retrieve private key during cURL configuration', 'woocommerce-gateway-ppec' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( __( 'Failed to retrieve private key during cURL configuration', 'woocommerce-gateway-p' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
 
         if ( ! openssl_pkcs12_export_to_file( $this->_certificate, $temp_file, $private_key, $password ) ) {
-            throw new Exception( __( 'Failed to export PKCS12 file during cURL configuration', 'woocommerce-gateway-ppec' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( __( 'Failed to export PKCS12 file during cURL configuration', 'woocommerce-gateway-p' ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
     }
@@ -131 +131 @@
     protected function _maybe_create_non_secure_certificate_file( $temp_file ) {
         if ( false === file_put_contents( $temp_file, $this->_certificate ) ) {
-            throw new Exception( sprintf( __( 'Unable to write certificate file %s during cURL configuration', 'woocommerce-gateway-ppec' ), $temp_file ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
+            throw new Exception( sprintf( __( 'Unable to write certificate file %s during cURL configuration', 'woocommerce-gateway-p' ), $temp_file ), WC_Gateway_PPEC_Client::INVALID_ENVIRONMENT_ERROR );
         }
     }

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-client.php

@@ -119 +119 @@
             // Make sure $_credential and $_environment have been configured.
             if ( ! $this->_credential ) {
-                throw new Exception( __( 'Missing credential', 'woocommerce-gateway-ppec' ), self::INVALID_CREDENTIAL_ERROR );
+                throw new Exception( __( 'Missing credential', 'woocommerce-gateway-p' ), self::INVALID_CREDENTIAL_ERROR );
             }
 
             if ( ! is_a( $this->_credential, 'WC_Gateway_PPEC_Client_Credential' ) ) {
-                throw new Exception( __( 'Invalid credential object', 'woocommerce-gateway-ppec' ), self::INVALID_CREDENTIAL_ERROR );
+                throw new Exception( __( 'Invalid credential object', 'woocommerce-gateway-p' ), self::INVALID_CREDENTIAL_ERROR );
             }
 
             if ( ! in_array( $this->_environment, array( 'live', 'sandbox' ) ) ) {
-                throw new Exception( __( 'Invalid environment', 'woocommerce-gateway-ppec' ), self::INVALID_ENVIRONMENT_ERROR );
+                throw new Exception( __( 'Invalid environment', 'woocommerce-gateway-p' ), self::INVALID_ENVIRONMENT_ERROR );
             }
 
@@ -150 +150 @@
 
             if ( is_wp_error( $resp ) ) {
-                throw new Exception( sprintf( __( 'An error occurred while trying to connect to PayPal: %s', 'woocommerce-gateway-ppec' ), $resp->get_error_message() ), self::REQUEST_ERROR );
+                throw new Exception( sprintf( __( 'An error occurred while trying to connect to PayPal: %s', 'woocommerce-gateway-p' ), $resp->get_error_message() ), self::REQUEST_ERROR );
             }
 
@@ -156 +156 @@
 
             if ( ! array_key_exists( 'ACK', $result ) ) {
-                throw new Exception( __( 'Malformed response received from PayPal', 'woocommerce-gateway-ppec' ), self::REQUEST_ERROR );
+                throw new Exception( __( 'Malformed response received from PayPal', 'woocommerce-gateway-p' ), self::REQUEST_ERROR );
             }
 

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-plugin.php

@@ -145 +145 @@
         add_action( 'plugins_loaded', array( $this, 'bootstrap' ) );
         add_filter( 'allowed_redirect_hosts' , array( $this, 'whitelist_paypal_domains_for_redirect' ) );
+
     }
 
@@ -287 +288 @@
         require_once( $this->includes_path . 'class-wc-gateway-ppec-cart-handler.php' );
         require_once( $this->includes_path . 'class-wc-gateway-ppec-ips-handler.php' );
+
+
 
         $this->settings       = new WC_Gateway_PPEC_Settings();
@@ -337 +340 @@
         return $domains;
     }
+
+
+
+
+
+
+
+
+
 }

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-settings.php

@@ -115 +115 @@
         }
 
-        if ( false === apply_filters( 'woocommerce_paypal_express_checkout_allow_guests', true ) ) {
+        if ( apply_filters( 'woocommerce_paypal_express_checkout_allow_guests', true ) ) {
             $params['SOLUTIONTYPE'] = 'Sole';
         }
@@ -175 +175 @@
         return $params;
     }
-    public function get_do_express_checkout_params( $buckets = 1 ) {
+
+    /**
+     * Get base parameters, based on settings instance, for DoExpressCheckoutCheckout NVP call.
+     *
+     * @see https://developer.paypal.com/docs/classic/api/merchant/DoExpressCheckoutPayment_API_Operation_NVP/
+     *
+     * @param WC_Order  $order   Order object
+     * @param int|array $buckets Number of buckets or list of bucket
+     *
+     * @return array DoExpressCheckoutPayment parameters
+     */
+    public function get_do_express_checkout_params( WC_Order $order, $buckets = 1 ) {
         $params = array();
         if ( ! is_array( $buckets ) ) {
@@ -186 +197 @@
 
         foreach ( $buckets as $bucketNum ) {
+
             $params[ 'PAYMENTREQUEST_' . $bucketNum . '_PAYMENTACTION' ] = $this->get_paymentaction();
+
+
         }
 

woocommerce-gateway-paypal-express-checkout/trunk/includes/class-wc-gateway-ppec-with-paypal.php

@@ -9 +9 @@
         $this->id = 'ppec_paypal';
         parent::__construct();
+
+
+
+
+
     }
 }

woocommerce-gateway-paypal-express-checkout/trunk/includes/functions.php

@@ -64 +64 @@
 
     $wc_ppec_logger->add( 'wc_gateway_ppec', $message );
+
+
+
+
 }

woocommerce-gateway-paypal-express-checkout/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.4
 Tested up to: 4.4
-Stable tag: 1.1.1
+Stable tag: 1.1.
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -86 +86 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.1.1 =
 * Fixed fatal error prior to PHP 5.5 caused by passing empty() a non-variables.

woocommerce-gateway-paypal-express-checkout/trunk/woocommerce-gateway-paypal-express-checkout.php

@@ -4 +4 @@
  * Plugin URI: https://www.woothemes.com/products/woocommerce-gateway-paypal-express-checkout/
  * Description: A payment gateway for PayPal Express Checkout (https://www.paypal.com/us/webapps/mpp/express-checkout).
- * Version: 1.1.1
+ * Version: 1.1.
  * Author: Automattic
  * Author URI: https://woocommerce.com
@@ -37 +37 @@
         require_once( 'includes/class-wc-gateway-ppec-plugin.php' );
 
-        $plugin = new WC_Gateway_PPEC_Plugin( __FILE__, '1.1.1' );
+        $plugin = new WC_Gateway_PPEC_Plugin( __FILE__, '1.1.' );
     }