woocommerce / woocommerce-gateway-stripe

includes/payment-methods/class-wc-gateway-stripe-giropay.php

Spacing +67 added lines, -67 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_giropay';
-		$this->method_title = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe Giropay', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports           = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['giropay'] ) ? $icons['giropay'] : '';
+		$icons_str .= isset($icons['giropay']) ? $icons['giropay'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php');
 	}
 
 	/**
@@ -170,13 +170,13 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -184,11 +184,11 @@ 
 
 		echo '<div
 			id="stripe-giropay-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -202,24 +202,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency              = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->get_order_currency() : $order->get_currency();
-		$order_id              = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+	public function create_source($order) {
+		$currency              = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->get_order_currency() : $order->get_currency();
+		$order_id              = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'giropay';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Giropay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Giropay source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_giropay_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_giropay_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -233,51 +233,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
-				$new_customer_id     = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+			if ($create_account) {
+				$new_customer_id     = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->customer_user : $order->get_customer_id();
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Giropay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Giropay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/payment-methods/class-wc-gateway-stripe-bancontact.php

Spacing +68 added lines, -68 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_bancontact';
-		$this->method_title = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports           = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['bancontact'] ) ? $icons['bancontact'] : '';
+		$icons_str .= isset($icons['bancontact']) ? $icons['bancontact'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php');
 	}
 
 	/**
@@ -170,13 +170,13 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -184,11 +184,11 @@ 
 
 		echo '<div
 			id="stripe-bancontact-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -202,25 +202,25 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency                = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->get_order_currency() : $order->get_currency();
-		$order_id                = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		$return_url              = $this->get_stripe_return_url( $order );
+	public function create_source($order) {
+		$currency                = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->get_order_currency() : $order->get_currency();
+		$order_id                = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		$return_url              = $this->get_stripe_return_url($order);
 		$post_data               = array();
-		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']   = strtolower( $currency );
+		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']   = strtolower($currency);
 		$post_data['type']       = 'bancontact';
-		$post_data['owner']      = $this->get_owner_details( $order );
-		$post_data['redirect']   = array( 'return_url' => $return_url );
-		$post_data['bancontact'] = array( 'preferred_language' => $this->get_locale() );
+		$post_data['owner']      = $this->get_owner_details($order);
+		$post_data['redirect']   = array('return_url' => $return_url);
+		$post_data['bancontact'] = array('preferred_language' => $this->get_locale());
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Bancontact source' );
+		WC_Stripe_Logger::log('Info: Begin creating Bancontact source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_bancontact_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_bancontact_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -234,51 +234,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
-				$new_customer_id     = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+			if ($create_account) {
+				$new_customer_id     = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->customer_user : $order->get_customer_id();
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Bancontact...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Bancontact...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/payment-methods/class-wc-gateway-stripe-sofort.php

Spacing +70 added lines, -70 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_sofort';
-		$this->method_title = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports           = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['sofort'] ) ? $icons['sofort'] : '';
+		$icons_str .= isset($icons['sofort']) ? $icons['sofort'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php');
 	}
 
 	/**
@@ -170,13 +170,13 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -184,11 +184,11 @@ 
 
 		echo '<div
 			id="stripe-sofort-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -202,28 +202,28 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency              = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->get_order_currency() : $order->get_currency();
-		$bank_country          = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_country : $order->get_billing_country();
-		$return_url            = $this->get_stripe_return_url( $order );
+	public function create_source($order) {
+		$currency              = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->get_order_currency() : $order->get_currency();
+		$bank_country          = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_country : $order->get_billing_country();
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'sofort';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 		$post_data['sofort']   = array(
 			'country'            => $bank_country,
 			'preferred_language' => $this->get_locale(),
 		);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating SOFORT source' );
+		WC_Stripe_Logger::log('Info: Begin creating SOFORT source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_sofort_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_sofort_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -237,59 +237,59 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
-				$new_customer_id     = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+			if ($create_account) {
+				$new_customer_id     = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->customer_user : $order->get_customer_id();
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'invalid_sofort_country' === $response->error->code ) {
-					$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('invalid_sofort_country' === $response->error->code) {
+					$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 
-			if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to SOFORT...' );
+			WC_Stripe_Logger::log('Info: Redirecting to SOFORT...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/payment-methods/class-wc-gateway-stripe-eps.php

Spacing +67 added lines, -67 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_eps';
-		$this->method_title = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe EPS', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports           = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['eps'] ) ? $icons['eps'] : '';
+		$icons_str .= isset($icons['eps']) ? $icons['eps'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-eps-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-eps-settings.php');
 	}
 
 	/**
@@ -170,13 +170,13 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -184,11 +184,11 @@ 
 
 		echo '<div
 			id="stripe-eps-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -202,24 +202,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency              = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->get_order_currency() : $order->get_currency();
-		$order_id              = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+	public function create_source($order) {
+		$currency              = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->get_order_currency() : $order->get_currency();
+		$order_id              = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'eps';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating EPS source' );
+		WC_Stripe_Logger::log('Info: Begin creating EPS source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -233,51 +233,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
-				$new_customer_id     = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+			if ($create_account) {
+				$new_customer_id     = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->customer_user : $order->get_customer_id();
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to EPS...' );
+			WC_Stripe_Logger::log('Info: Redirecting to EPS...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +89 added lines, -89 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,11 +23,11 @@ 
 
 		$this->retry_interval = 1;
 
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'cancel_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'cancel_payment' ) );
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
+		add_action('woocommerce_order_status_on-hold_to_processing', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_completed', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'cancel_payment'));
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'cancel_payment'));
 	}
 
 	/**
@@ -51,25 +51,25 @@ 
 	 * @param bool $retry
 	 * @param mix $previous_error Any error message from previous request.
 	 */
-	public function process_redirect_payment( $order_id, $retry = true, $previous_error = false ) {
+	public function process_redirect_payment($order_id, $retry = true, $previous_error = false) {
 		try {
-			$source = wc_clean( $_GET['source'] );
+			$source = wc_clean($_GET['source']);
 
-			if ( empty( $source ) ) {
+			if (empty($source)) {
 				return;
 			}
 
-			if ( empty( $order_id ) ) {
+			if (empty($order_id)) {
 				return;
 			}
 
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( ! is_object( $order ) ) {
+			if ( ! is_object($order)) {
 				return;
 			}
 
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status()) {
 				return;
 			}
 
@@ -77,124 +77,124 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			/**
 			 * First check if the source is chargeable at this time. If not,
 			 * webhook will take care of it later.
 			 */
-			$source_info = WC_Stripe_API::retrieve( 'sources/' . $source );
+			$source_info = WC_Stripe_API::retrieve('sources/' . $source);
 
-			if ( ! empty( $source_info->error ) ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), $source_info->error->message );
+			if ( ! empty($source_info->error)) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), $source_info->error->message);
 			}
 
-			if ( 'failed' === $source_info->status || 'canceled' === $source_info->status ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), __( 'Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe' ) );
+			if ('failed' === $source_info->status || 'canceled' === $source_info->status) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), __('Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe'));
 			}
 
 			// If already consumed, then ignore request.
-			if ( 'consumed' === $source_info->status ) {
+			if ('consumed' === $source_info->status) {
 				return;
 			}
 
 			// If not chargeable, then ignore request.
-			if ( 'chargeable' !== $source_info->status ) {
+			if ('chargeable' !== $source_info->status) {
 				return;
 			}
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_info->id;
 			$source_object->status   = 'chargeable';
 
 			/* If we're doing a retry and source is chargeable, we need to pass
 			 * a different idempotency key and retry for success.
 			 */
-			if ( $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+			if ($this->need_update_idempotency_key($source_object, $previous_error)) {
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 			}
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-						delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-						delete_post_meta( $order_id, '_stripe_customer_id' );
+				if ($this->is_no_such_customer_error($response->error)) {
+					if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+						delete_user_meta($order->customer_user, '_stripe_customer_id');
+						delete_post_meta($order_id, '_stripe_customer_id');
 					} else {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-						$order->delete_meta_data( '_stripe_customer_id' );
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+						$order->delete_meta_data('_stripe_customer_id');
 						$order->save();
 					}
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
-							return $this->process_redirect_payment( $order_id, false, $response->error );
+						if (5 <= $this->retry_interval) {
+							return $this->process_redirect_payment($order_id, false, $response->error);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_redirect_payment( $order_id, true, $response->error );
+						return $this->process_redirect_payment($order_id, true, $response->error);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $message );
+				throw new WC_Stripe_Exception(print_r($response, true), $message);
 			}
 
 			// To prevent double processing the order on WC side.
-			if ( ! $this->is_original_request( $headers ) ) {
+			if ( ! $this->is_original_request($headers)) {
 				return;
 			}
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment_error', $e, $order);
 
 			/* translators: error message */
-			$order->update_status( 'failed', sprintf( __( 'Stripe payment failed: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() ) );
+			$order->update_status('failed', sprintf(__('Stripe payment failed: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage()));
 
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			wp_safe_redirect( wc_get_checkout_url() );
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			wp_safe_redirect(wc_get_checkout_url());
 			exit;
 		}
 	}
@@ -206,13 +206,13 @@ 
 	 * @version 4.0.0
 	 */
 	public function maybe_process_redirect_order() {
-		if ( ! is_order_received_page() || empty( $_GET['client_secret'] ) || empty( $_GET['source'] ) ) {
+		if ( ! is_order_received_page() || empty($_GET['client_secret']) || empty($_GET['source'])) {
 			return;
 		}
 
-		$order_id = wc_clean( $_GET['order_id'] );
+		$order_id = wc_clean($_GET['order_id']);
 
-		$this->process_redirect_payment( $order_id );
+		$this->process_redirect_payment($order_id);
 	}
 
 	/**
@@ -222,59 +222,59 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function capture_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function capture_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge             = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured           = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
+			$charge             = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured           = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 			$is_stripe_captured = false;
 
-			if ( $charge && 'no' === $captured ) {
+			if ($charge && 'no' === $captured) {
 				$order_total = $order->get_total();
 
-				if ( 0 < $order->get_total_refunded() ) {
+				if (0 < $order->get_total_refunded()) {
 					$order_total = $order_total - $order->get_total_refunded();
 				}
 
 				// First retrieve charge to see if it has been captured.
-				$result = WC_Stripe_API::retrieve( 'charges/' . $charge );
+				$result = WC_Stripe_API::retrieve('charges/' . $charge);
 
-				if ( ! empty( $result->error ) ) {
+				if ( ! empty($result->error)) {
 					/* translators: error message */
-					$order->add_order_note( sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
-				} elseif ( false === $result->captured ) {
+					$order->add_order_note(sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
+				} elseif (false === $result->captured) {
 					$result = WC_Stripe_API::request(
 						array(
-							'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+							'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 							'expand[]' => 'balance_transaction',
 						),
 						'charges/' . $charge . '/capture'
 					);
 
-					if ( ! empty( $result->error ) ) {
+					if ( ! empty($result->error)) {
 						/* translators: error message */
-						$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
+						$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
 					} else {
 						$is_stripe_captured = true;
 					}
-				} elseif ( true === $result->captured ) {
+				} elseif (true === $result->captured) {
 					$is_stripe_captured = true;
 				}
 
-				if ( $is_stripe_captured ) {
+				if ($is_stripe_captured) {
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 					// Store other data such as fees
-					WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_transaction_id', $result->id ) : $order->set_transaction_id( $result->id );
+					WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
 
-					$this->update_fees( $order, $result->balance_transaction->id );
+					$this->update_fees($order, $result->balance_transaction->id);
 				}
 
 				// This hook fires when admin manually changes order status to processing or completed.
-				do_action( 'woocommerce_stripe_process_manual_capture', $order, $result );
+				do_action('woocommerce_stripe_process_manual_capture', $order, $result);
 			}
 		}
 	}
@@ -286,14 +286,14 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function cancel_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function cancel_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$this->process_refund( $order_id );
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
+			$this->process_refund($order_id);
 
 			// This hook fires when admin manually changes order status to cancel.
-			do_action( 'woocommerce_stripe_process_manual_cancel', $order );
+			do_action('woocommerce_stripe_process_manual_cancel', $order);
 		}
 	}
 }

uninstall.php

Spacing +28 added lines, -28 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
 // if uninstall not called from WordPress exit
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
@@ -13,31 +13,31 @@ 
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
  * and to ensure only the site owner can perform this action.
  */
-if ( defined( 'WC_REMOVE_ALL_DATA' ) && true === WC_REMOVE_ALL_DATA ) {
+if (defined('WC_REMOVE_ALL_DATA') && true === WC_REMOVE_ALL_DATA) {
 	// Delete options.
-	delete_option( 'woocommerce_stripe_settings' );
-	delete_option( 'wc_stripe_show_styles_notice' );
-	delete_option( 'wc_stripe_show_request_api_notice' );
-	delete_option( 'wc_stripe_show_apple_pay_notice' );
-	delete_option( 'wc_stripe_show_ssl_notice' );
-	delete_option( 'wc_stripe_show_keys_notice' );
-	delete_option( 'wc_stripe_show_alipay_notice' );
-	delete_option( 'wc_stripe_show_bancontact_notice' );
-	delete_option( 'wc_stripe_show_bitcoin_notice' );
-	delete_option( 'wc_stripe_show_eps_notice' );
-	delete_option( 'wc_stripe_show_giropay_notice' );
-	delete_option( 'wc_stripe_show_ideal_notice' );
-	delete_option( 'wc_stripe_show_multibanco_notice' );
-	delete_option( 'wc_stripe_show_p24_notice' );
-	delete_option( 'wc_stripe_show_sepa_notice' );
-	delete_option( 'wc_stripe_show_sofort_notice' );
-	delete_option( 'wc_stripe_version' );
-	delete_option( 'woocommerce_stripe_bancontact_settings' );
-	delete_option( 'woocommerce_stripe_alipay_settings' );
-	delete_option( 'woocommerce_stripe_bitcoin_settings' );
-	delete_option( 'woocommerce_stripe_ideal_settings' );
-	delete_option( 'woocommerce_stripe_p24_settings' );
-	delete_option( 'woocommerce_stripe_giropay_settings' );
-	delete_option( 'woocommerce_stripe_sepa_settings' );
-	delete_option( 'woocommerce_stripe_sofort_settings' );
+	delete_option('woocommerce_stripe_settings');
+	delete_option('wc_stripe_show_styles_notice');
+	delete_option('wc_stripe_show_request_api_notice');
+	delete_option('wc_stripe_show_apple_pay_notice');
+	delete_option('wc_stripe_show_ssl_notice');
+	delete_option('wc_stripe_show_keys_notice');
+	delete_option('wc_stripe_show_alipay_notice');
+	delete_option('wc_stripe_show_bancontact_notice');
+	delete_option('wc_stripe_show_bitcoin_notice');
+	delete_option('wc_stripe_show_eps_notice');
+	delete_option('wc_stripe_show_giropay_notice');
+	delete_option('wc_stripe_show_ideal_notice');
+	delete_option('wc_stripe_show_multibanco_notice');
+	delete_option('wc_stripe_show_p24_notice');
+	delete_option('wc_stripe_show_sepa_notice');
+	delete_option('wc_stripe_show_sofort_notice');
+	delete_option('wc_stripe_version');
+	delete_option('woocommerce_stripe_bancontact_settings');
+	delete_option('woocommerce_stripe_alipay_settings');
+	delete_option('woocommerce_stripe_bitcoin_settings');
+	delete_option('woocommerce_stripe_ideal_settings');
+	delete_option('woocommerce_stripe_p24_settings');
+	delete_option('woocommerce_stripe_giropay_settings');
+	delete_option('woocommerce_stripe_sepa_settings');
+	delete_option('woocommerce_stripe_sofort_settings');
 }

includes/admin/class-wc-stripe-privacy.php

Spacing +113 added lines, -113 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'WC_Abstract_Privacy' ) ) {
+if ( ! class_exists('WC_Abstract_Privacy')) {
 	return;
 }
 
@@ -9,20 +9,20 @@ 
 	 *
 	 */
 	public function __construct() {
-		parent::__construct( __( 'Stripe', 'woocommerce-gateway-stripe' ) );
+		parent::__construct(__('Stripe', 'woocommerce-gateway-stripe'));
 
-		$this->add_exporter( 'woocommerce-gateway-stripe-order-data', __( 'WooCommerce Stripe Order Data', 'woocommerce-gateway-stripe' ), array( $this, 'order_data_exporter' ) );
+		$this->add_exporter('woocommerce-gateway-stripe-order-data', __('WooCommerce Stripe Order Data', 'woocommerce-gateway-stripe'), array($this, 'order_data_exporter'));
 
-		if ( function_exists( 'wcs_get_subscriptions' ) ) {
-			$this->add_exporter( 'woocommerce-gateway-stripe-subscriptions-data', __( 'WooCommerce Stripe Subscriptions Data', 'woocommerce-gateway-stripe' ), array( $this, 'subscriptions_data_exporter' ) );
+		if (function_exists('wcs_get_subscriptions')) {
+			$this->add_exporter('woocommerce-gateway-stripe-subscriptions-data', __('WooCommerce Stripe Subscriptions Data', 'woocommerce-gateway-stripe'), array($this, 'subscriptions_data_exporter'));
 		}
 
-		$this->add_exporter( 'woocommerce-gateway-stripe-customer-data', __( 'WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe' ), array( $this, 'customer_data_exporter' ) );
+		$this->add_exporter('woocommerce-gateway-stripe-customer-data', __('WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe'), array($this, 'customer_data_exporter'));
 
-		$this->add_eraser( 'woocommerce-gateway-stripe-customer-data', __( 'WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe' ), array( $this, 'customer_data_eraser' ) );
-		$this->add_eraser( 'woocommerce-gateway-stripe-order-data', __( 'WooCommerce Stripe Data', 'woocommerce-gateway-stripe' ), array( $this, 'order_data_eraser' ) );
+		$this->add_eraser('woocommerce-gateway-stripe-customer-data', __('WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe'), array($this, 'customer_data_eraser'));
+		$this->add_eraser('woocommerce-gateway-stripe-order-data', __('WooCommerce Stripe Data', 'woocommerce-gateway-stripe'), array($this, 'order_data_eraser'));
 
-		add_filter( 'woocommerce_get_settings_account', array( $this, 'account_settings' ) );
+		add_filter('woocommerce_get_settings_account', array($this, 'account_settings'));
 	}
 
 	/**
@@ -31,14 +31,14 @@ 
 	 * @param array $settings
 	 * @return array $settings Updated
 	 */
-	public function account_settings( $settings ) {
+	public function account_settings($settings) {
 		$insert_setting = array(
 			array(
-				'title'       => __( 'Retain Stripe Data', 'woocommerce-gateway-stripe' ),
-				'desc_tip'    => __( 'Retains any Stripe data such as Stripe customer ID, source ID.', 'woocommerce-gateway-stripe' ),
+				'title'       => __('Retain Stripe Data', 'woocommerce-gateway-stripe'),
+				'desc_tip'    => __('Retains any Stripe data such as Stripe customer ID, source ID.', 'woocommerce-gateway-stripe'),
 				'id'          => 'woocommerce_gateway_stripe_retention',
 				'type'        => 'relative_date_selector',
-				'placeholder' => __( 'N/A', 'woocommerce-gateway-stripe' ),
+				'placeholder' => __('N/A', 'woocommerce-gateway-stripe'),
 				'default'     => '',
 				'autoload'    => false,
 			),
@@ -46,15 +46,15 @@ 
 
 		$index = null;
 
-		foreach ( $settings as $key => $value) {
-			if ( 'sectionend' === $value[ 'type' ] && 'personal_data_retention' === $value[ 'id' ] ) {
+		foreach ($settings as $key => $value) {
+			if ('sectionend' === $value['type'] && 'personal_data_retention' === $value['id']) {
 				$index = $key;
 				break;
 			}
 		}
 
-		if ( ! is_null( $index ) ) {
-			array_splice( $settings, $index, 0, $insert_setting );
+		if ( ! is_null($index)) {
+			array_splice($settings, $index, 0, $insert_setting);
 		}
 
 		return $settings;
@@ -68,22 +68,22 @@ 
 	 *
 	 * @return array WP_Post
 	 */
-	protected function get_stripe_orders( $email_address, $page ) {
-		$user = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+	protected function get_stripe_orders($email_address, $page) {
+		$user = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 
 		$order_query = array(
-			'payment_method' => array( 'stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort' ),
+			'payment_method' => array('stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort'),
 			'limit'          => 10,
 			'page'           => $page,
 		);
 
-		if ( $user instanceof WP_User ) {
+		if ($user instanceof WP_User) {
 			$order_query['customer_id'] = (int) $user->ID;
 		} else {
 			$order_query['billing_email'] = $email_address;
 		}
 
-		return wc_get_orders( $order_query );
+		return wc_get_orders($order_query);
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function get_privacy_message() {
 		/* translators: %s URL to docs */
-		return wpautop( sprintf( __( 'By using this extension, you may be storing personal data or sharing data with an external service. <a href="%s" target="_blank">Learn more about how this works, including what you may want to include in your privacy policy.</a>', 'woocommerce-gateway-stripe' ), 'https://docs.woocommerce.com/document/privacy-payments/#woocommerce-gateway-stripe' ) );
+		return wpautop(sprintf(__('By using this extension, you may be storing personal data or sharing data with an external service. <a href="%s" target="_blank">Learn more about how this works, including what you may want to include in your privacy policy.</a>', 'woocommerce-gateway-stripe'), 'https://docs.woocommerce.com/document/privacy-payments/#woocommerce-gateway-stripe'));
 	}
 
 	/**
@@ -103,34 +103,34 @@ 
 	 *
 	 * @return array
 	 */
-	public function order_data_exporter( $email_address, $page = 1 ) {
+	public function order_data_exporter($email_address, $page = 1) {
 		$done           = false;
 		$data_to_export = array();
 
-		$orders = $this->get_stripe_orders( $email_address, (int) $page );
+		$orders = $this->get_stripe_orders($email_address, (int) $page);
 
 		$done = true;
 
-		if ( 0 < count( $orders ) ) {
-			foreach ( $orders as $order ) {
+		if (0 < count($orders)) {
+			foreach ($orders as $order) {
 				$data_to_export[] = array(
 					'group_id'    => 'woocommerce_orders',
-					'group_label' => __( 'Orders', 'woocommerce-gateway-stripe' ),
+					'group_label' => __('Orders', 'woocommerce-gateway-stripe'),
 					'item_id'     => 'order-' . $order->get_id(),
 					'data'        => array(
 						array(
-							'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $order->get_id(), '_stripe_source_id', true ),
+							'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($order->get_id(), '_stripe_source_id', true),
 						),
 						array(
-							'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $order->get_id(), '_stripe_customer_id', true ),
+							'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($order->get_id(), '_stripe_customer_id', true),
 						),
 					),
 				);
 			}
 
-			$done = 10 > count( $orders );
+			$done = 10 > count($orders);
 		}
 
 		return array(
@@ -147,7 +147,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function subscriptions_data_exporter( $email_address, $page = 1 ) {
+	public function subscriptions_data_exporter($email_address, $page = 1) {
 		$done           = false;
 		$page           = (int) $page;
 		$data_to_export = array();
@@ -156,7 +156,7 @@ 
 			'relation' => 'AND',
 			array(
 				'key'     => '_payment_method',
-				'value'   => array( 'stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort' ),
+				'value'   => array('stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort'),
 				'compare' => 'IN',
 			),
 			array(
@@ -172,30 +172,30 @@ 
 			'meta_query'     => $meta_query,
 		);
 
-		$subscriptions = wcs_get_subscriptions( $subscription_query );
+		$subscriptions = wcs_get_subscriptions($subscription_query);
 
 		$done = true;
 
-		if ( 0 < count( $subscriptions ) ) {
-			foreach ( $subscriptions as $subscription ) {
+		if (0 < count($subscriptions)) {
+			foreach ($subscriptions as $subscription) {
 				$data_to_export[] = array(
 					'group_id'    => 'woocommerce_subscriptions',
-					'group_label' => __( 'Subscriptions', 'woocommerce-gateway-stripe' ),
+					'group_label' => __('Subscriptions', 'woocommerce-gateway-stripe'),
 					'item_id'     => 'subscription-' . $subscription->get_id(),
 					'data'        => array(
 						array(
-							'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $subscription->get_id(), '_stripe_source_id', true ),
+							'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($subscription->get_id(), '_stripe_source_id', true),
 						),
 						array(
-							'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $subscription->get_id(), '_stripe_customer_id', true ),
+							'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($subscription->get_id(), '_stripe_customer_id', true),
 						),
 					),
 				);
 			}
 
-			$done = 10 > count( $subscriptions );
+			$done = 10 > count($subscriptions);
 		}
 
 		return array(
@@ -211,24 +211,24 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function customer_data_exporter( $email_address, $page ) {
-		$user           = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+	public function customer_data_exporter($email_address, $page) {
+		$user           = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 		$data_to_export = array();
 
-		if ( $user instanceof WP_User ) {
-			$stripe_user = new WC_Stripe_Customer( $user->ID );
+		if ($user instanceof WP_User) {
+			$stripe_user = new WC_Stripe_Customer($user->ID);
 
 			$data_to_export[] = array(
 				'group_id'    => 'woocommerce_customer',
-				'group_label' => __( 'Customer Data', 'woocommerce-gateway-stripe' ),
+				'group_label' => __('Customer Data', 'woocommerce-gateway-stripe'),
 				'item_id'     => 'user',
 				'data'        => array(
 					array(
-						'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-						'value' => get_user_meta( $user->ID, '_stripe_source_id', true ),
+						'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+						'value' => get_user_meta($user->ID, '_stripe_source_id', true),
 					),
 					array(
-						'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
+						'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
 						'value' => $stripe_user->get_id(),
 					),
 				),
@@ -248,25 +248,25 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function customer_data_eraser( $email_address, $page ) {
+	public function customer_data_eraser($email_address, $page) {
 		$page               = (int) $page;
-		$user               = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+		$user               = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 		$stripe_customer_id = '';
 		$stripe_source_id   = '';
 
-		if ( $user instanceof WP_User ) {
-			$stripe_customer_id = get_user_meta( $user->ID, '_stripe_customer_id', true );
-			$stripe_source_id   = get_user_meta( $user->ID, '_stripe_source_id', true );
+		if ($user instanceof WP_User) {
+			$stripe_customer_id = get_user_meta($user->ID, '_stripe_customer_id', true);
+			$stripe_source_id   = get_user_meta($user->ID, '_stripe_source_id', true);
 		}
 
 		$items_removed = false;
 		$messages      = array();
 
-		if ( ! empty( $stripe_customer_id ) || ! empty( $stripe_source_id ) ) {
+		if ( ! empty($stripe_customer_id) || ! empty($stripe_source_id)) {
 			$items_removed = true;
-			delete_user_meta( $user->ID, '_stripe_customer_id' );
-			delete_user_meta( $user->ID, '_stripe_source_id' );
-			$messages[] = __( 'Stripe User Data Erased.', 'woocommerce-gateway-stripe' );
+			delete_user_meta($user->ID, '_stripe_customer_id');
+			delete_user_meta($user->ID, '_stripe_source_id');
+			$messages[] = __('Stripe User Data Erased.', 'woocommerce-gateway-stripe');
 		}
 
 		return array(
@@ -284,29 +284,29 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function order_data_eraser( $email_address, $page ) {
-		$orders = $this->get_stripe_orders( $email_address, (int) $page );
+	public function order_data_eraser($email_address, $page) {
+		$orders = $this->get_stripe_orders($email_address, (int) $page);
 
 		$items_removed  = false;
 		$items_retained = false;
 		$messages       = array();
 
-		foreach ( (array) $orders as $order ) {
-			$order = wc_get_order( $order->get_id() );
+		foreach ((array) $orders as $order) {
+			$order = wc_get_order($order->get_id());
 
-			list( $removed, $retained, $msgs ) = $this->maybe_handle_order( $order );
+			list($removed, $retained, $msgs) = $this->maybe_handle_order($order);
 			$items_removed                    |= $removed;
 			$items_retained                   |= $retained;
-			$messages                          = array_merge( $messages, $msgs );
+			$messages                          = array_merge($messages, $msgs);
 
-			list( $removed, $retained, $msgs ) = $this->maybe_handle_subscription( $order );
+			list($removed, $retained, $msgs) = $this->maybe_handle_subscription($order);
 			$items_removed                    |= $removed;
 			$items_retained                   |= $retained;
-			$messages                          = array_merge( $messages, $msgs );
+			$messages                          = array_merge($messages, $msgs);
 		}
 
 		// Tell core if we have more orders to work on still
-		$done = count( $orders ) < 10;
+		$done = count($orders) < 10;
 
 		return array(
 			'items_removed'  => $items_removed,
@@ -322,47 +322,47 @@ 
 	 * @param WC_Order $order
 	 * @return array
 	 */
-	protected function maybe_handle_subscription( $order ) {
-		if ( ! class_exists( 'WC_Subscriptions' ) ) {
-			return array( false, false, array() );
+	protected function maybe_handle_subscription($order) {
+		if ( ! class_exists('WC_Subscriptions')) {
+			return array(false, false, array());
 		}
 
-		if ( ! wcs_order_contains_subscription( $order ) ) {
-			return array( false, false, array() );
+		if ( ! wcs_order_contains_subscription($order)) {
+			return array(false, false, array());
 		}
 
-		$subscription    = current( wcs_get_subscriptions_for_order( $order->get_id() ) );
+		$subscription    = current(wcs_get_subscriptions_for_order($order->get_id()));
 		$subscription_id = $subscription->get_id();
 
-		$stripe_source_id = get_post_meta( $subscription_id, '_stripe_source_id', true );
+		$stripe_source_id = get_post_meta($subscription_id, '_stripe_source_id', true);
 
-		if ( empty( $stripe_source_id ) ) {
-			return array( false, false, array() );
+		if (empty($stripe_source_id)) {
+			return array(false, false, array());
 		}
 
-		if ( ! $this->is_retention_expired( $order->get_date_created()->getTimestamp() ) ) {
+		if ( ! $this->is_retention_expired($order->get_date_created()->getTimestamp())) {
 			/* translators: %d Order ID */
-			return array( false, true, array( sprintf( __( 'Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+			return array(false, true, array(sprintf(__('Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		if ( $subscription->has_status( apply_filters( 'wc_stripe_privacy_eraser_subs_statuses', array( 'on-hold', 'active' ) ) ) ) {
+		if ($subscription->has_status(apply_filters('wc_stripe_privacy_eraser_subs_statuses', array('on-hold', 'active')))) {
 			/* translators: %d Order ID */
-			return array( false, true, array( sprintf( __( 'Order ID %d contains an active Subscription. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+			return array(false, true, array(sprintf(__('Order ID %d contains an active Subscription. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		$renewal_orders = WC_Subscriptions_Renewal_Order::get_renewal_orders( $order->get_id() );
+		$renewal_orders = WC_Subscriptions_Renewal_Order::get_renewal_orders($order->get_id());
 
-		foreach ( $renewal_orders as $renewal_order_id ) {
-			delete_post_meta( $renewal_order_id, '_stripe_source_id' );
-			delete_post_meta( $renewal_order_id, '_stripe_refund_id' );
-			delete_post_meta( $renewal_order_id, '_stripe_customer_id' );
+		foreach ($renewal_orders as $renewal_order_id) {
+			delete_post_meta($renewal_order_id, '_stripe_source_id');
+			delete_post_meta($renewal_order_id, '_stripe_refund_id');
+			delete_post_meta($renewal_order_id, '_stripe_customer_id');
 		}
 
-		delete_post_meta( $subscription_id, '_stripe_source_id' );
-		delete_post_meta( $subscription_id, '_stripe_refund_id' );
-		delete_post_meta( $subscription_id, '_stripe_customer_id' );
+		delete_post_meta($subscription_id, '_stripe_source_id');
+		delete_post_meta($subscription_id, '_stripe_refund_id');
+		delete_post_meta($subscription_id, '_stripe_customer_id');
 
-		return array( true, false, array( __( 'Stripe Subscription Data Erased.', 'woocommerce-gateway-stripe' ) ) );
+		return array(true, false, array(__('Stripe Subscription Data Erased.', 'woocommerce-gateway-stripe')));
 	}
 
 	/**
@@ -371,61 +371,61 @@ 
 	 * @param WC_Order $order
 	 * @return array
 	 */
-	protected function maybe_handle_order( $order ) {
+	protected function maybe_handle_order($order) {
 		$order_id           = $order->get_id();
-		$stripe_source_id   = get_post_meta( $order_id, '_stripe_source_id', true );
-		$stripe_refund_id   = get_post_meta( $order_id, '_stripe_refund_id', true );
-		$stripe_customer_id = get_post_meta( $order_id, '_stripe_customer_id', true );
+		$stripe_source_id   = get_post_meta($order_id, '_stripe_source_id', true);
+		$stripe_refund_id   = get_post_meta($order_id, '_stripe_refund_id', true);
+		$stripe_customer_id = get_post_meta($order_id, '_stripe_customer_id', true);
 
-		if ( ! $this->is_retention_expired( $order->get_date_created()->getTimestamp() ) ) {
+		if ( ! $this->is_retention_expired($order->get_date_created()->getTimestamp())) {
 			/* translators: %d Order ID */
-			return array( false, true, array( sprintf( __( 'Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+			return array(false, true, array(sprintf(__('Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		if ( empty( $stripe_source_id ) && empty( $stripe_refund_id ) && empty( $stripe_customer_id ) ) {
-			return array( false, false, array() );
+		if (empty($stripe_source_id) && empty($stripe_refund_id) && empty($stripe_customer_id)) {
+			return array(false, false, array());
 		}
 
-		delete_post_meta( $order_id, '_stripe_source_id' );
-		delete_post_meta( $order_id, '_stripe_refund_id' );
-		delete_post_meta( $order_id, '_stripe_customer_id' );
+		delete_post_meta($order_id, '_stripe_source_id');
+		delete_post_meta($order_id, '_stripe_refund_id');
+		delete_post_meta($order_id, '_stripe_customer_id');
 
-		return array( true, false, array( __( 'Stripe personal data erased.', 'woocommerce-gateway-stripe' ) ) );
+		return array(true, false, array(__('Stripe personal data erased.', 'woocommerce-gateway-stripe')));
 	}
 
 	/**
 	 * Checks if create date is passed retention duration.
 	 *
 	 */
-	public function is_retention_expired( $created_date ) {
-		$retention  = wc_parse_relative_date_option( get_option( 'woocommerce_gateway_stripe_retention' ) );
+	public function is_retention_expired($created_date) {
+		$retention  = wc_parse_relative_date_option(get_option('woocommerce_gateway_stripe_retention'));
 		$is_expired = false;
-		$time_span  = time() - strtotime( $created_date );
-		if ( empty( $retention ) || empty( $created_date ) ) {
+		$time_span  = time() - strtotime($created_date);
+		if (empty($retention) || empty($created_date)) {
 			return false;
 		}
-		switch ( $retention['unit'] ) {
+		switch ($retention['unit']) {
 			case 'days':
 				$retention = $retention['number'] * DAY_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'weeks':
 				$retention = $retention['number'] * WEEK_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'months':
 				$retention = $retention['number'] * MONTH_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'years':
 				$retention = $retention['number'] * YEAR_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;

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

Spacing +191 added lines, -191 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
 	 */
 	public function __construct() {
 		$this->retry_interval = 2;
-		$stripe_settings      = get_option( 'woocommerce_stripe_settings', array() );
-		$this->testmode       = ( ! empty( $stripe_settings['testmode'] ) && 'yes' === $stripe_settings['testmode'] ) ? true : false;
-		add_action( 'woocommerce_api_wc_stripe', array( $this, 'check_for_webhook' ) );
+		$stripe_settings      = get_option('woocommerce_stripe_settings', array());
+		$this->testmode       = ( ! empty($stripe_settings['testmode']) && 'yes' === $stripe_settings['testmode']) ? true : false;
+		add_action('woocommerce_api_wc_stripe', array($this, 'check_for_webhook'));
 	}
 
 	/**
@@ -44,24 +44,24 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_for_webhook() {
-		if ( ( 'POST' !== $_SERVER['REQUEST_METHOD'] )
-			|| ! isset( $_GET['wc-api'] )
-			|| ( 'wc_stripe' !== $_GET['wc-api'] )
+		if (('POST' !== $_SERVER['REQUEST_METHOD'])
+			|| ! isset($_GET['wc-api'])
+			|| ('wc_stripe' !== $_GET['wc-api'])
 		) {
 			return;
 		}
 
-		$request_body    = file_get_contents( 'php://input' );
-		$request_headers = array_change_key_case( $this->get_request_headers(), CASE_UPPER );
+		$request_body    = file_get_contents('php://input');
+		$request_headers = array_change_key_case($this->get_request_headers(), CASE_UPPER);
 
 		// Validate it to make sure it is legit.
-		if ( $this->is_valid_request( $request_headers, $request_body ) ) {
-			$this->process_webhook( $request_body );
-			status_header( 200 );
+		if ($this->is_valid_request($request_headers, $request_body)) {
+			$this->process_webhook($request_body);
+			status_header(200);
 			exit;
 		} else {
-			WC_Stripe_Logger::log( 'Incoming webhook failed validation: ' . print_r( $request_body, true ) );
-			status_header( 400 );
+			WC_Stripe_Logger::log('Incoming webhook failed validation: ' . print_r($request_body, true));
+			status_header(400);
 			exit;
 		}
 	}
@@ -76,12 +76,12 @@ 
 	 * @param string $request_body The request body from Stripe.
 	 * @return bool
 	 */
-	public function is_valid_request( $request_headers = null, $request_body = null ) {
-		if ( null === $request_headers || null === $request_body ) {
+	public function is_valid_request($request_headers = null, $request_body = null) {
+		if (null === $request_headers || null === $request_body) {
 			return false;
 		}
 
-		if ( ! empty( $request_headers['USER-AGENT'] ) && ! preg_match( '/Stripe/', $request_headers['USER-AGENT'] ) ) {
+		if ( ! empty($request_headers['USER-AGENT']) && ! preg_match('/Stripe/', $request_headers['USER-AGENT'])) {
 			return false;
 		}
 
@@ -97,12 +97,12 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_request_headers() {
-		if ( ! function_exists( 'getallheaders' ) ) {
+		if ( ! function_exists('getallheaders')) {
 			$headers = array();
 
-			foreach ( $_SERVER as $name => $value ) {
-				if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-					$headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			foreach ($_SERVER as $name => $value) {
+				if ('HTTP_' === substr($name, 0, 5)) {
+					$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 				}
 			}
 
@@ -121,30 +121,30 @@ 
 	 * @param object $notification
 	 * @param bool $retry
 	 */
-	public function process_webhook_payment( $notification, $retry = true ) {
+	public function process_webhook_payment($notification, $retry = true) {
 		// The following 3 payment methods are synchronous so does not need to be handle via webhook.
-		if ( 'card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type || 'three_d_secure' === $notification->data->object->type ) {
+		if ('card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type || 'three_d_secure' === $notification->data->object->type) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_source_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_source_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via source ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via source ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order_id  = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
+		$order_id  = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
 		$source_id = $notification->data->object->id;
 
-		$is_pending_receiver = ( 'receiver' === $notification->data->object->flow );
+		$is_pending_receiver = ('receiver' === $notification->data->object->flow);
 
 		try {
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status()) {
 				return;
 			}
 
-			if ( 'on-hold' === $order->get_status() && ! $is_pending_receiver ) {
+			if ('on-hold' === $order->get_status() && ! $is_pending_receiver) {
 				return;
 			}
 
@@ -152,94 +152,94 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_id;
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
-						delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-						delete_post_meta( $order_id, '_stripe_customer_id' );
+				if ($this->is_no_such_customer_error($response->error)) {
+					if (WC_Stripe_Helper::is_wc_lt('3.0')) {
+						delete_user_meta($order->customer_user, '_stripe_customer_id');
+						delete_post_meta($order_id, '_stripe_customer_id');
 					} else {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-						$order->delete_meta_data( '_stripe_customer_id' );
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+						$order->delete_meta_data('_stripe_customer_id');
 						$order->save();
 					}
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
+						if (5 <= $this->retry_interval) {
 
-							return $this->process_webhook_payment( $notification, false );
+							return $this->process_webhook_payment($notification, false);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_webhook_payment( $notification, true );
+						return $this->process_webhook_payment($notification, true);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				$order->add_order_note( $localized_message );
+				$order->add_order_note($localized_message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 
 			// To prevent double processing the order on WC side.
-			if ( ! $this->is_original_request( $headers ) ) {
+			if ( ! $this->is_original_request($headers)) {
 				return;
 			}
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_webhook_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification, $e );
+			do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification, $e);
 
-			$statuses = array( 'pending', 'failed' );
+			$statuses = array('pending', 'failed');
 
-			if ( $order->has_status( $statuses ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status($statuses)) {
+				$this->send_failed_order_email($order_id);
 			}
 		}
 	}
@@ -252,21 +252,21 @@ 
 	 * @since 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_dispute( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_webhook_dispute($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The URL to the order. */
-		$order->update_status( 'on-hold', sprintf( __( 'A dispute was created for this order. Response is needed. Please go to your <a href="%s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review this dispute.', 'woocommerce-gateway-stripe' ), $this->get_transaction_url( $order ) ) );
+		$order->update_status('on-hold', sprintf(__('A dispute was created for this order. Response is needed. Please go to your <a href="%s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review this dispute.', 'woocommerce-gateway-stripe'), $this->get_transaction_url($order)));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		$this->send_failed_order_email( $order_id );
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		$this->send_failed_order_email($order_id);
 	}
 
 	/**
@@ -277,44 +277,44 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_capture( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_capture($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
-				WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+			if ($charge && 'no' === $captured) {
+				WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 				// Store other data such as fees
-				WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+				WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-				if ( isset( $notification->data->object->balance_transaction ) ) {
-					$this->update_fees( $order, $notification->data->object->balance_transaction );
+				if (isset($notification->data->object->balance_transaction)) {
+					$this->update_fees($order, $notification->data->object->balance_transaction);
 				}
 
 				// Check and see if capture is partial.
-				if ( $this->is_partial_capture( $notification ) ) {
-					$partial_amount = $this->get_partial_amount_to_charge( $notification );
-					$order->set_total( $partial_amount );
+				if ($this->is_partial_capture($notification)) {
+					$partial_amount = $this->get_partial_amount_to_charge($notification);
+					$order->set_total($partial_amount);
 					/* translators: partial captured amount */
-					$order->add_order_note( sprintf( __( 'This charge was partially captured via Stripe Dashboard in the amount of: %s', 'woocommerce-gateway-stripe' ), $partial_amount ) );
+					$order->add_order_note(sprintf(__('This charge was partially captured via Stripe Dashboard in the amount of: %s', 'woocommerce-gateway-stripe'), $partial_amount));
 				} else {
-					$order->payment_complete( $notification->data->object->id );
+					$order->payment_complete($notification->data->object->id);
 
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 				}
 
-				if ( is_callable( array( $order, 'save' ) ) ) {
+				if (is_callable(array($order, 'save'))) {
 					$order->save();
 				}
 			}
@@ -329,38 +329,38 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_succeeded( $notification ) {
+	public function process_webhook_charge_succeeded($notification) {
 		// The following payment methods are synchronous so does not need to be handle via webhook.
-		if ( ( isset( $notification->data->object->source->type ) && 'card' === $notification->data->object->source->type ) || ( isset( $notification->data->object->source->type ) && 'three_d_secure' === $notification->data->object->source->type ) ) {
+		if ((isset($notification->data->object->source->type) && 'card' === $notification->data->object->source->type) || (isset($notification->data->object->source->type) && 'three_d_secure' === $notification->data->object->source->type)) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status()) {
 			return;
 		}
 
 		// Store other data such as fees
-		WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+		WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-		if ( isset( $notification->data->object->balance_transaction ) ) {
-			$this->update_fees( $order, $notification->data->object->balance_transaction );
+		if (isset($notification->data->object->balance_transaction)) {
+			$this->update_fees($order, $notification->data->object->balance_transaction);
 		}
 
-		$order->payment_complete( $notification->data->object->id );
+		$order->payment_complete($notification->data->object->id);
 
 		/* translators: transaction id */
-		$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+		$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 	}
@@ -372,24 +372,24 @@ 
 	 * @since 4.1.5 Can handle any fail payments from any methods.
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_failed( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_charge_failed($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
 
 		// If order status is already in failed status don't continue.
-		if ( 'failed' === $order->get_status() ) {
+		if ('failed' === $order->get_status()) {
 			return;
 		}
 
-		$order->update_status( 'failed', __( 'This payment failed to clear.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('failed', __('This payment failed to clear.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -400,30 +400,30 @@ 
 	 * @since 4.1.15 Add check to make sure order is processed by Stripe.
 	 * @param object $notification
 	 */
-	public function process_webhook_source_canceled( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_source_canceled($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
 		// If can't find order by charge ID, try source ID.
-		if ( ! $order ) {
-			$order = WC_Stripe_Helper::get_order_by_source_id( $notification->data->object->id );
+		if ( ! $order) {
+			$order = WC_Stripe_Helper::get_order_by_source_id($notification->data->object->id);
 
-			if ( ! $order ) {
-				WC_Stripe_Logger::log( 'Could not find order via charge/source ID: ' . $notification->data->object->id );
+			if ( ! $order) {
+				WC_Stripe_Logger::log('Could not find order via charge/source ID: ' . $notification->data->object->id);
 				return;
 			}
 		}
 
 		// 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() );
+		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' ) );
+		if ('cancelled' !== $order->get_status()) {
+			$order->update_status('cancelled', __('This payment has cancelled.', 'woocommerce-gateway-stripe'));
 		}
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -433,59 +433,59 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_refund( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_refund($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge    = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured  = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
-			$refund_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_stripe_refund_id', true ) : $order->get_meta( '_stripe_refund_id', true );
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
+			$charge    = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured  = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
+			$refund_id = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_stripe_refund_id', true) : $order->get_meta('_stripe_refund_id', true);
 
 			// If the refund ID matches, don't continue to prevent double refunding.
-			if ( $notification->data->object->refunds->data[0]->id === $refund_id ) {
+			if ($notification->data->object->refunds->data[0]->id === $refund_id) {
 				return;
 			}
 
 			// Only refund captured charge.
-			if ( $charge ) {
-				$reason = ( isset( $captured ) && 'yes' === $captured ) ? __( 'Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe' ) : __( 'Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe' );
+			if ($charge) {
+				$reason = (isset($captured) && 'yes' === $captured) ? __('Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe') : __('Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe');
 
 				// Create the refund.
 				$refund = wc_create_refund(
 					array(
 						'order_id' => $order_id,
-						'amount'   => $this->get_refund_amount( $notification ),
+						'amount'   => $this->get_refund_amount($notification),
 						'reason'   => $reason,
 					)
 				);
 
-				if ( is_wp_error( $refund ) ) {
-					WC_Stripe_Logger::log( $refund->get_error_message() );
+				if (is_wp_error($refund)) {
+					WC_Stripe_Logger::log($refund->get_error_message());
 				}
 
-				WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_stripe_refund_id', $notification->data->object->refunds->data[0]->id ) : $order->update_meta_data( '_stripe_refund_id', $notification->data->object->refunds->data[0]->id );
+				WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_stripe_refund_id', $notification->data->object->refunds->data[0]->id) : $order->update_meta_data('_stripe_refund_id', $notification->data->object->refunds->data[0]->id);
 
-				$amount = wc_price( $notification->data->object->refunds->data[0]->amount / 100 );
+				$amount = wc_price($notification->data->object->refunds->data[0]->amount / 100);
 
-				if ( in_array( strtolower( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->get_order_currency() : $order->get_currency() ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-					$amount = wc_price( $notification->data->object->refunds->data[0]->amount );
+				if (in_array(strtolower(WC_Stripe_Helper::is_wc_lt('3.0') ? $order->get_order_currency() : $order->get_currency()), WC_Stripe_Helper::no_decimal_currencies())) {
+					$amount = wc_price($notification->data->object->refunds->data[0]->amount);
 				}
 
-				if ( isset( $notification->data->object->refunds->data[0]->balance_transaction ) ) {
-					$this->update_fees( $order, $notification->data->object->refunds->data[0]->balance_transaction );
+				if (isset($notification->data->object->refunds->data[0]->balance_transaction)) {
+					$this->update_fees($order, $notification->data->object->refunds->data[0]->balance_transaction);
 				}
 
 				/* translators: 1) dollar amount 2) transaction id 3) refund message */
-				$refund_message = ( isset( $captured ) && 'yes' === $captured ) ? sprintf( __( 'Refunded %1$s - Refund ID: %2$s - %3$s', 'woocommerce-gateway-stripe' ), $amount, $notification->data->object->refunds->data[0]->id, $reason ) : __( 'Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe' );
+				$refund_message = (isset($captured) && 'yes' === $captured) ? sprintf(__('Refunded %1$s - Refund ID: %2$s - %3$s', 'woocommerce-gateway-stripe'), $amount, $notification->data->object->refunds->data[0]->id, $reason) : __('Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe');
 
-				$order->add_order_note( $refund_message );
+				$order->add_order_note($refund_message);
 			}
 		}
 	}
@@ -496,21 +496,21 @@ 
 	 * @since 4.0.6
 	 * @param object $notification
 	 */
-	public function process_review_opened( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_review_opened($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The URL to the order. 2) The reason type. */
-		$message = sprintf( __( 'A review has been opened for this order. Action is needed. Please go to your <a href="%1$s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review the issue. Reason: (%2$s)', 'woocommerce-gateway-stripe' ), $this->get_transaction_url( $order ), $notification->data->object->reason );
+		$message = sprintf(__('A review has been opened for this order. Action is needed. Please go to your <a href="%1$s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review the issue. Reason: (%2$s)', 'woocommerce-gateway-stripe'), $this->get_transaction_url($order), $notification->data->object->reason);
 
-		if ( apply_filters( 'wc_stripe_webhook_review_change_order_status', true, $order, $notification ) ) {
-			$order->update_status( 'on-hold', $message );
+		if (apply_filters('wc_stripe_webhook_review_change_order_status', true, $order, $notification)) {
+			$order->update_status('on-hold', $message);
 		} else {
-			$order->add_order_note( $message );
+			$order->add_order_note($message);
 		}
 	}
 
@@ -520,25 +520,25 @@ 
 	 * @since 4.0.6
 	 * @param object $notification
 	 */
-	public function process_review_closed( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_review_closed($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The reason type. */
-		$message = sprintf( __( 'The opened review for this order is now closed. Reason: (%s)', 'woocommerce-gateway-stripe' ), $notification->data->object->reason );
+		$message = sprintf(__('The opened review for this order is now closed. Reason: (%s)', 'woocommerce-gateway-stripe'), $notification->data->object->reason);
 
-		if ( 'on-hold' === $order->get_status() ) {
-			if ( apply_filters( 'wc_stripe_webhook_review_change_order_status', true, $order, $notification ) ) {
-				$order->update_status( 'processing', $message );
+		if ('on-hold' === $order->get_status()) {
+			if (apply_filters('wc_stripe_webhook_review_change_order_status', true, $order, $notification)) {
+				$order->update_status('processing', $message);
 			} else {
-				$order->add_order_note( $message );
+				$order->add_order_note($message);
 			}
 		} else {
-			$order->add_order_note( $message );
+			$order->add_order_note($message);
 		}
 	}
 
@@ -549,7 +549,7 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function is_partial_capture( $notification ) {
+	public function is_partial_capture($notification) {
 		return 0 < $notification->data->object->amount_refunded;
 	}
 
@@ -560,11 +560,11 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_refund_amount( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
+	public function get_refund_amount($notification) {
+		if ($this->is_partial_capture($notification)) {
 			$amount = $notification->data->object->refunds->data[0]->amount / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
 				$amount = $notification->data->object->refunds->data[0]->amount;
 			}
 
@@ -581,12 +581,12 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_partial_amount_to_charge( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
-			$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded ) / 100;
+	public function get_partial_amount_to_charge($notification) {
+		if ($this->is_partial_capture($notification)) {
+			$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded) / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-				$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded );
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
+				$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded);
 			}
 
 			return $amount;
@@ -602,44 +602,44 @@ 
 	 * @version 4.0.0
 	 * @param string $request_body
 	 */
-	public function process_webhook( $request_body ) {
-		$notification = json_decode( $request_body );
+	public function process_webhook($request_body) {
+		$notification = json_decode($request_body);
 
-		switch ( $notification->type ) {
+		switch ($notification->type) {
 			case 'source.chargeable':
-				$this->process_webhook_payment( $notification );
+				$this->process_webhook_payment($notification);
 				break;
 
 			case 'source.canceled':
-				$this->process_webhook_source_canceled( $notification );
+				$this->process_webhook_source_canceled($notification);
 				break;
 
 			case 'charge.succeeded':
-				$this->process_webhook_charge_succeeded( $notification );
+				$this->process_webhook_charge_succeeded($notification);
 				break;
 
 			case 'charge.failed':
-				$this->process_webhook_charge_failed( $notification );
+				$this->process_webhook_charge_failed($notification);
 				break;
 
 			case 'charge.captured':
-				$this->process_webhook_capture( $notification );
+				$this->process_webhook_capture($notification);
 				break;
 
 			case 'charge.dispute.created':
-				$this->process_webhook_dispute( $notification );
+				$this->process_webhook_dispute($notification);
 				break;
 
 			case 'charge.refunded':
-				$this->process_webhook_refund( $notification );
+				$this->process_webhook_refund($notification);
 				break;
 
 			case 'review.opened':
-				$this->process_review_opened( $notification );
+				$this->process_review_opened($notification);
 				break;
 
 			case 'review.closed':
-				$this->process_review_closed( $notification );
+				$this->process_review_closed($notification);
 				break;
 
 		}

includes/admin/stripe-settings.php

Spacing +62 added lines, -62 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,176 +7,176 @@ 
 	'wc_stripe_settings',
 	array(
 		'enabled'                       => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'                         => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Credit Card (Stripe)', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Credit Card (Stripe)', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description'                   => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'                       => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),
 		),
 		'testmode'                      => array(
-			'title'       => __( 'Test mode', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Test Mode', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test mode', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Test Mode', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'test_publishable_key'          => array(
-			'title'       => __( 'Test Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'test_secret_key'               => array(
-			'title'       => __( 'Test Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'publishable_key'               => array(
-			'title'       => __( 'Live Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'secret_key'                    => array(
-			'title'       => __( 'Live Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'inline_cc_form'                => array(
-			'title'       => __( 'Inline Credit Card Form', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Inline Credit Card Form', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'statement_descriptor'          => array(
-			'title'       => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Statement Descriptor', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'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' ),
+			'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,
 		),
 		'capture'                       => array(
-			'title'       => __( 'Capture', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Capture charge immediately', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Capture', 'woocommerce-gateway-stripe'),
+			'label'       => __('Capture charge immediately', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'three_d_secure'                => array(
-			'title'       => __( '3D Secure', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Require 3D Secure when applicable', 'woocommerce-gateway-stripe' ),
+			'title'       => __('3D Secure', 'woocommerce-gateway-stripe'),
+			'label'       => __('Require 3D Secure when applicable', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Some payment methods have 3D Secure feature. This is an extra security layer for your store. Choose how to handle payments when 3D Secure is recommended. Enabling would require customers to use 3D Secure when recommended.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Some payment methods have 3D Secure feature. This is an extra security layer for your store. Choose how to handle payments when 3D Secure is recommended. Enabling would require customers to use 3D Secure when recommended.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout'               => array(
-			'title'       => __( 'Stripe Modal Checkout', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Checkout', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Modal Checkout', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe Checkout', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page. We recommend you leave this disabled and use the embedded form as that is the preferred method.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page. We recommend you leave this disabled and use the embedded form as that is the preferred method.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout_image'         => array(
-			'title'       => __( 'Stripe Checkout Image', 'woocommerce-gateway-stripe' ),
-			'description' => __( 'Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Checkout Image', 'woocommerce-gateway-stripe'),
+			'description' => __('Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout_description'   => array(
-			'title'       => __( 'Stripe Checkout Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Checkout Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Shows a description of your store on Stripe Modal Checkout.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Shows a description of your store on Stripe Modal Checkout.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'payment_request'               => array(
-			'title'       => __( 'Payment Request Buttons', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Buttons', 'woocommerce-gateway-stripe'),
 			/* translators: 1) br tag 2) opening anchor tag 3) closing anchor tag */
-			'label'       => sprintf( __( 'Enable Payment Request Buttons. (Apple Pay/Chrome Payment Request API) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', 'woocommerce-gateway-stripe' ), '<br />', '<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>', '<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>' ),
+			'label'       => sprintf(__('Enable Payment Request Buttons. (Apple Pay/Chrome Payment Request API) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', 'woocommerce-gateway-stripe'), '<br />', '<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>', '<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'payment_request_button_type'   => array(
-			'title'       => __( 'Payment Request Button Type', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Type', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Type', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Type', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button type you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button type you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'buy',
 			'desc_tip'    => true,
 			'options'     => array(
-				'default' => __( 'Default', 'woocommerce-gateway-stripe' ),
-				'buy'     => __( 'Buy', 'woocommerce-gateway-stripe' ),
-				'donate'  => __( 'Donate', 'woocommerce-gateway-stripe' ),
+				'default' => __('Default', 'woocommerce-gateway-stripe'),
+				'buy'     => __('Buy', 'woocommerce-gateway-stripe'),
+				'donate'  => __('Donate', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_theme'  => array(
-			'title'       => __( 'Payment Request Button Theme', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Theme', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Theme', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Theme', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button theme you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button theme you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'dark',
 			'desc_tip'    => true,
 			'options'     => array(
-				'dark'          => __( 'Dark', 'woocommerce-gateway-stripe' ),
-				'light'         => __( 'Light', 'woocommerce-gateway-stripe' ),
-				'light-outline' => __( 'Light-Outline', 'woocommerce-gateway-stripe' ),
+				'dark'          => __('Dark', 'woocommerce-gateway-stripe'),
+				'light'         => __('Light', 'woocommerce-gateway-stripe'),
+				'light-outline' => __('Light-Outline', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_height' => array(
-			'title'       => __( 'Payment Request Button Height', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Height', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Height', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Height', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe'),
 			'default'     => '44',
 			'desc_tip'    => true,
 		),
 		'saved_cards'                   => array(
-			'title'       => __( 'Saved Cards', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Payment via Saved Cards', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Saved Cards', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Payment via Saved Cards', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'logging'                       => array(
-			'title'       => __( 'Logging', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Log debug messages', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Logging', 'woocommerce-gateway-stripe'),
+			'label'       => __('Log debug messages', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),