Merge branch 'master' into fix/settings-array-placement

changelog.txt

@@ -1,5 +1,9 @@
 *** Changelog ***
 
+= 4.1.15 - 2019-03-12 =
+* Fix - Prevent canceled webhook from processing non Stripe payments.
+* Tweak - Stripe API version updated to support 2019-02-19.
+
 = 4.1.14 - 2019-01-10 =
 * Remove - Stripe specific styling to allow themes to style accordingly.
 * Tweak  - Handle error if product is not found in payment request.

includes/admin/stripe-settings.php

@@ -79,7 +79,7 @@
 		'statement_descriptor'          => array(
 			'title'       => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ),
 			'type'        => 'text',
-			'description' => __( 'This may be up to 22 characters. The statement description must contain at least one letter, may not include ><"\' characters, and will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe' ),
+			'description' => __( 'Statement descriptors are limited to 22 characters, cannot use the special characters >, <, ", \, \', *, and must not consist solely of numbers. This will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe' ),
 			'default'     => '',
 			'desc_tip'    => true,
 		),

includes/class-wc-stripe-api.php

@@ -14,7 +14,7 @@ class WC_Stripe_API {
 	 * Stripe API Endpoint
 	 */
 	const ENDPOINT           = 'https://api.stripe.com/v1/';
-	const STRIPE_API_VERSION = '2018-09-24';
+	const STRIPE_API_VERSION = '2019-02-19';
 
 	/**
 	 * Secret API Key.

includes/class-wc-stripe-webhook-handler.php

@@ -397,7 +397,7 @@ public function process_webhook_charge_failed( $notification ) {
 	 * that redirects and awaits payments from customer.
 	 *
 	 * @since 4.0.0
-	 * @version 4.0.0
+	 * @since 4.1.15 Add check to make sure order is processed by Stripe.
 	 * @param object $notification
 	 */
 	public function process_webhook_source_canceled( $notification ) {
@@ -413,6 +413,12 @@ public function process_webhook_source_canceled( $notification ) {
 			}
 		}
 
+		// Don't proceed if payment method isn't Stripe.
+		if ( 'stripe' !== $order->get_payment_method() ) {
+			WC_Stripe_Logger::log( 'Canceled webhook abort: Order was not processed by Stripe: ' . $order->get_id() );
+			return;
+		}
+
 		if ( 'cancelled' !== $order->get_status() ) {
 			$order->update_status( 'cancelled', __( 'This payment has cancelled.', 'woocommerce-gateway-stripe' ) );
 		}

readme.txt

@@ -101,12 +101,10 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 4.1.15 - 2019-03-10 =
+= 4.1.15 - 2019-03-12 =
+* Fix - Prevent canceled webhook from processing non Stripe payments.
 * Fix - "Retain Stripe Data" setting placement on WooCommerce settings page.
-
-= 4.1.14 - 2019-01-10 =
-* Remove - Stripe specific styling to allow themes to style accordingly.
-* Tweak  - Handle error if product is not found in payment request.
+* Tweak - Stripe API version updated to support 2019-02-19.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woothemes/woocommerce-gateway-stripe/master/changelog.txt).
 

woocommerce-gateway-stripe.php

@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 4.1.14
+ * Version: 4.1.15
  * Requires at least: 4.4
  * Tested up to: 5.0
  * WC requires at least: 2.6
@@ -46,7 +46,7 @@ function woocommerce_gateway_stripe_init() {
 		/**
 		 * Required minimums and constants
 		 */
-		define( 'WC_STRIPE_VERSION', '4.1.14' );
+		define( 'WC_STRIPE_VERSION', '4.1.15' );
 		define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
 		define( 'WC_STRIPE_MIN_WC_VER', '2.6.0' );
 		define( 'WC_STRIPE_MAIN_FILE', __FILE__ );