Changeset 1409404

Timestamp:

05/03/2016 07:44:07 AM (10 years ago)

Author:

akeda

Message:

Preparing for 1.0.1 release

Location:

woocommerce-gateway-paypal-express-checkout/trunk

Files:

• includes/abstracts/abstract-wc-gateway-ppec-client-credential.php (modified) (2 diffs)
• includes/abstracts/abstract-wc-gateway-ppec.php (modified) (1 diff)
• includes/class-wc-gateway-ppec-cart-handler.php (modified) (15 diffs)
• includes/class-wc-gateway-ppec-client-credential-certificate.php (modified) (1 diff)
• includes/class-wc-gateway-ppec-client.php (modified) (2 diffs)
• includes/class-wc-gateway-ppec-plugin.php (modified) (1 diff)
• includes/pem (added)
• includes/pem/bundle.pem (added)
• readme.txt (modified) (3 diffs)
• woocommerce-gateway-paypal-express-checkout.php (modified) (2 diffs)

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

@@ -96 +96 @@
      *               from this object.
      */
-    protected function get_request_params() {
+    public function get_request_params() {
         $params = array(
             'USER' => $this->_username,
@@ -108 +108 @@
         return $params;
     }
+
+    /**
+     * Allow certificate-based credential to configure cURL, especially
+     * to set CURLOPT_SSLCERT and CURLOPT_SSLCERTPASSWD.
+     *
+     * @throws Exception
+     *
+     * @param resource &$handle The cURL handle returned by curl_init().
+     * @param array    $r       The HTTP request arguments.
+     * @param string   $url     The request URL.
+     *
+     * @return void
+     */
+    public function configure_curl( $handle, $r, $url ) {
+        curl_setopt( $handle, CURLOPT_CAINFO, wc_gateway_ppec()->includes_path . 'pem/bundle.pem' );
+        curl_setopt( $handle, CURLOPT_SSL_CIPHER_LIST, 'TLSv1' );
+    }
 }

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

@@ -226 +226 @@
                 }
 
-                $expires = sprintf( $out, date_i18n( get_option( 'date_format' ), $valid_until ) );
+                $expires = sprintf( $expires, date_i18n( get_option( 'date_format' ), $valid_until ) );
                 $out = sprintf( __( 'Certificate belongs to API username %1$s; %2$s', 'woocommerce-gateway-paypal-express-checkout' ), $certinfo['subject']['CN'], $expires );
             } else {

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

@@ -160 +160 @@
         $discounts = round( WC()->cart->get_cart_discount_total(), $decimals );
         foreach ( WC()->cart->cart_contents as $cart_item_key => $values ) {
-            $amount = round( $values['line_total'] / $values['quantity'] , $decimals );
+            $amount = round( $values['line_subtotal'] / $values['quantity'] , $decimals );
             $item   = array(
                 'name'        => $values['data']->post->post_title,
@@ -173 +173 @@
         }
 
-        $this->orderTax = round( WC()->cart->tax_total, $decimals );
+        $this->orderTax = round( WC()->cart->tax_total + WC()->cart->shipping_tax_total, $decimals );
         $this->shipping = round( WC()->cart->shipping_total, $decimals );
-        if ( WC()->cart->shipping_tax_total != 0 ) {
-            $this->orderTax += round( WC()->cart->shipping_tax_total, $decimals );
-        }
-        $this->totalItemAmount = round( WC()->cart->cart_contents_total, $decimals );
+        $this->totalItemAmount = round( WC()->cart->cart_contents_total, $decimals ) + $discounts;
         $this->orderTotal = $this->totalItemAmount + $this->orderTax + $this->shipping;
 
@@ -201 +198 @@
 
                 $this->items[] = $modifyLineItem;
+                $this->totalItemAmount += $modifyLineItem[ 'amount' ];
+                $this->orderTotal += $modifyLineItem[ 'amount' ];
 
             } elseif ( WC_Gateway_PPEC_Settings::subtotalMismatchBehaviorDropLineItems == $subtotalBehavior ) {
@@ -212 +211 @@
         // enter discount shenanigans. item total cannot be 0 so make modifications accordingly
         if ( $this->totalItemAmount == $discounts ) {
-            $settings = wc_gateway_ppec()->loadSettings();
+            $settings = wc_gateway_ppec()->settings->loadSettings();
             $behavior = $settings->zeroSubtotalBehavior;
 
@@ -223 +222 @@
                     'description' => 'Discount Amount',
                     'quantity'    => 1,
-                    'amount'      => $discounts
+                    'amount'      => -$discounts
                 );
 
-                $this->items[] = $discountLineItme;
+                $this->items[] = $discountLineItem;
 
                 if ( $is_zdp_currency ) {
@@ -242 +241 @@
 
                 $this->items[] = $modifyLineItem;
-                $this->shipDiscountAmount = $discount;
+                $this->shipDiscountAmount = -$discount;
+                $this->totalItemAmount = $this->totalItemAmount - $discounts + $discount;
+                $this->orderTotal -= $discounts;
 
             } elseif ( WC_Gateway_PPEC_Settings::zeroSubtotalBehaviorOmitLineItems == $behavior ) {
@@ -249 +250 @@
                 unset($this->items);
                 $this->shipDiscountAmount = 0;
+                $this->totalItemAmount -= $discounts;
+                $this->orderTotal -= $discounts;
 
             } else {
                 // ...
                 // Increase SHIPDISCAMT by the amount of all the coupons in the cart
-                $this->shipDiscountAmount = round( WC()->cart->get_order_discount_total(), $decimals );
+                $this->shipDiscountAmount = -$discounts;
+                $this->orderTotal -= $discounts;
 
             }
@@ -270 +274 @@
 
             $this->shipDiscountAmount = 0;
+            $this->totalItemAmount -= $discounts;
+            $this->orderTotal -= $discounts;
+        }
+        
+        // If the totals don't line up, adjust the tax to make it work (cause it's probably a tax mismatch).
+        $wooOrderTotal = round( WC()->cart->total, $decimals );
+        if( $wooOrderTotal != $this->orderTotal ) {
+            $this->orderTax += $wooOrderTotal - $this->orderTotal;
+            $this->orderTotal = $wooOrderTotal;
         }
 
@@ -281 +294 @@
         if ( ! is_numeric( $this->shipping ) )
             $this->shipping = 0;
-
+        
     }
 
@@ -302 +315 @@
         $discounts = round( $order->get_total_discount(), $decimals );
         foreach ( $order->get_items() as $cart_item_key => $values ) {
-            $amount = round( $values['line_total'] / $values['qty'] , $decimals );
+            $amount = round( $values['line_subtotal'] / $values['qty'] , $decimals );
             $item   = array(
                 'name'     => $values['name'],
@@ -310 +323 @@
 
             $this->items[] = $item;
-
+            
             $roundedPayPalTotal += round( $amount * $values['qty'], $decimals );
         }
@@ -364 +377 @@
                     'description' => 'Discount Amount',
                     'quantity'    => 1,
-                    'amount'      => $discounts
+                    'amount'      => -$discounts
                 );
 
-                $this->items[] = $discountLineItme;
+                $this->items[] = $discountLineItem;
 
                 if ( $is_zdp_currency ) {
@@ -383 +396 @@
 
                 $this->items[] = $modifyLineItem;
-                $this->shipDiscountAmount = $discount;
+                $this->shipDiscountAmount = -$discount;
+                $this->totalItemAmount = $this->totalItemAmount - $discounts + $discount;
+                $this->orderTotal -= $discounts;
 
             } elseif ( WC_Gateway_PPEC_Settings::zeroSubtotalBehaviorOmitLineItems == $behavior ) {
@@ -390 +405 @@
                 unset($this->items);
                 $this->shipDiscountAmount = 0;
+                $this->totalItemAmount -= $discounts;
+                $this->orderTotal -= $discounts;
 
             } else {
                 // ...
                 // Increase SHIPDISCAMT by the amount of all the coupons in the cart
-                $this->shipDiscountAmount = round( WC()->cart->get_order_discount_total(), $decimals );
-
+                $this->shipDiscountAmount = -$discounts;
+                $this->orderTotal -= $discounts;
             }
         } else {
@@ -408 +425 @@
 
                 $this->items[] = $discLineItem;
+                $this->totalItemAmount -= $discounts;
+                $this->orderTotal -= $discounts;
             }
 
             $this->shipDiscountAmount = 0;
+        }
+        
+        // If the totals don't line up, adjust the tax to make it work (cause it's probably a tax mismatch).
+        $wooOrderTotal = round( $order->get_total(), $decimals );
+        if( $wooOrderTotal != $this->orderTotal ) {
+            $this->orderTax += $wooOrderTotal - $this->orderTotal;
+            $this->orderTotal = $wooOrderTotal;
         }
 

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

@@ -44 +44 @@
         return $this->_certificate;
     }
+
+    /**
+     * Allow certificate-based credential to configure cURL, especially
+     * to set CURLOPT_SSLCERT and CURLOPT_SSLCERTPASSWD.
+     *
+     * @throws Exception
+     *
+     * @param resource &$handle The cURL handle returned by curl_init().
+     * @param array    $r       The HTTP request arguments.
+     * @param string   $url     The request URL.
+     *
+     * @return void
+     */
+    public function configure_curl( $handle, $r, $url ) {
+        parent::configure_curl( $handle, $r, $url );
+
+        $password         = uniqid();
+        $certificate_file = $this->_maybe_create_certificate_file( $password );
+
+        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 );
+        }
+
+        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 );
+        }
+    }
+
+    /**
+     * Dump the certificate out to a temporary file, because cURL can't accept
+     * it any other way.
+     *
+     * @throws Exception
+     *
+     * @param string $password Password for certificate when using secure transport
+     *
+     * @return string Filepath of certificate file
+     */
+    protected function _maybe_create_certificate_file( $password ) {
+        $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 );
+        }
+
+        if ( $this->_use_secure_transport() ) {
+            $this->_maybe_create_secure_certificate_file( $temp_file, $password );
+        } else {
+            $this->_maybe_create_non_secure_certificate_file( $temp_file );
+        }
+
+        return $temp_file;
+    }
+
+    /**
+     * If we're using SecureTransport, we have to translate the certificate to
+     * PKCS12 before passing it to cURL.
+     *
+     * @throws Exception
+     *
+     * @param string $temp_file Filepath to temporary certificate file
+     *
+     * @return void
+     */
+    protected function _maybe_create_secure_certificate_file( $temp_file, $password ) {
+        $private_key = openssl_pkey_get_private( $this->_certificate );
+
+        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 );
+        }
+
+        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 );
+        }
+    }
+
+    /**
+     * Create non-password certificate file. Basically just dump the certificate
+     * string to temporary file.
+     *
+     * @throws Exception
+     *
+     * @param string $temp_file Filepath to temporary certificate file
+     *
+     * @return void
+     */
+    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 );
+        }
+    }
+
+    /**
+     * Returns true if secure transport is available in current cURL.
+     *
+     * @return bool
+     */
+    protected function _use_secure_transport() {
+        $curl_version = curl_version();
+        return false !== strpos( $curl_version['ssl_version'], 'SecureTransport' );
+    }
 }

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

@@ -116 +116 @@
             );
 
+            // For cURL transport.
+            add_action( 'http_api_curl', array( $this->_credential, 'configure_curl' ), 10, 3 );
+
             wc_gateway_ppec_log( sprintf( '%s: remote request to %s with args: %s', __METHOD__, $this->get_endpoint(), print_r( $args, true ) ) );
 
@@ -134 +137 @@
             wc_gateway_ppec_log( sprintf( '%s: acknowleged response body: %s', __METHOD__, print_r( $result, true ) ) );
 
+            remove_action( 'http_api_curl', array( $this->_credential, 'configure_curl' ), 10 );
+
             // Let the caller deals with the response.
             return $result;
 
         } catch ( Exception $e ) {
+
+            remove_action( 'http_api_curl', array( $this->_credential, 'configure_curl' ), 10 );
 
             // TODO: Maybe returns WP_Error ?

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

@@ -129 +129 @@
             throw new Exception( __( 'WooCommerce Gateway PayPal Express Checkout requires WooCommerce version 2.5 or greater', 'woocommerce-gateway-paypal-express-checkout' ) );
         }
+
+        if ( ! function_exists( 'curl_init' ) ) {
+            throw new Exception( __( 'WooCommerce Gateway PayPal Express Checkout requires cURL to be installed on your server', 'woocommerce-gateway-paypal-express-checkout' ) );
+        }
+
+        $openssl_warning = __( 'WooCommerce Gateway PayPal Express Checkout requires OpenSSL >= 1.0.1 to be installed on your server', 'woocommerce-gateway-paypal-express-checkout' );
+        if ( ! defined( 'OPENSSL_VERSION_TEXT' ) ) {
+            throw new Exception( $openssl_warning );
+        }
+
+        preg_match( '/^OpenSSL ([\d.]+)/', OPENSSL_VERSION_TEXT, $matches );
+        if ( empty( $matches[1] ) ) {
+            throw new Exception( $openssl_warning );
+        }
+
+
+        if ( ! version_compare( $matches[1], '1.0.1', '>=' ) ) {
+            throw new Exception( $openssl_warning );
+        }
     }
 

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

@@ -1 +1 @@
 === WooCommerce PayPal Express Checkout Payment Gateway ===
-Contributors: automattic, woothemes, akeda, dwainm, royho, allendav, slash1andy, woosteve, spraveenitpro, mikedmoore, fernashes, shellbeezy
+Contributors: automattic, woothemes, akeda, dwainm, royho, allendav, slash1andy, woosteve, spraveenitpro, mikedmoore, fernashes, shellbeezy, danieldudzic, mikaey
 Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, sales, sell, shop, shopping, cart, checkout, configurable, paypal
 Requires at least: 4.4
 Tested up to: 4.4
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -57 +57 @@
 = Where can I find documentation? =
 
-For help setting up and configuring, please refer to our [user guide](http://docs.woothemes.com/document/woocommerce-gateway-paypal-express-checkout/)
+For help setting up and configuring, please refer to our [user guide](https://www.woothemes.com/products/woocommerce-gateway-paypal-express-checkout/)
 
 = Where can I get support or talk to other users? =
@@ -81 +81 @@
 == Changelog ==
 
+= 1.0.1
+* Fix - Make sure OpenSSL is installed with 1.0.1 as the minium required version, otherwise display warning
+* Fix - Make sure cURL transport is available for WP HTTP API, otherwise display warning
+* Fix - Unhandled certificate-style API credential
+* Fix - Fixed calculated tax and coupons data that sent over to PayPal
+* Fix - Fixed calculated shipping discount data that sent over to PayPal
+
 = 1.0.0 =
 * Initial stable release

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

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