woocommerce / woocommerce-gateway-stripe

tests/phpunit/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -1,28 +1,28 @@
 <?php
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
 require_once $_tests_dir . '/includes/functions.php';
 
 function _manually_load_plugin() {
-	$plugin_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/';
+	$plugin_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
 	require $plugin_dir . 'woocommerce-gateway-stripe/woocommerce-gateway-stripe.php';
 	require $plugin_dir . 'woocommerce/woocommerce.php';
 }
 
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 require $_tests_dir . '/includes/bootstrap.php';
 
-$wc_tests_framework_base_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/woocommerce/tests/framework/';
-require_once( $wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php' );
-require_once( $wc_tests_framework_base_dir . 'class-wc-unit-test-case.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php' );
+$wc_tests_framework_base_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/woocommerce/tests/framework/';
+require_once($wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php');
+require_once($wc_tests_framework_base_dir . 'class-wc-unit-test-case.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php');

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

Spacing +171 added lines, -171 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,12 +23,12 @@ 
 
 		$this->retry_interval = 2;
 
-		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( 'wc_ajax_wc_stripe_validate_checkout', array( $this, 'validate_checkout' ) );
+		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('wc_ajax_wc_stripe_validate_checkout', array($this, 'validate_checkout'));
 	}
 
 	/**
@@ -49,25 +49,25 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function process_redirect_payment( $order_id, $retry = true ) {
+	public function process_redirect_payment($order_id, $retry = true) {
 		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;
 			}
 
@@ -75,127 +75,127 @@ 
 			$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;
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ) );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object));
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// If it is an API error such connection or server, let's retry.
-				if ( 'api_connection_error' === $response->error->type || 'api_error' === $response->error->type ) {
-					if ( $retry ) {
-						sleep( 5 );
-						return $this->process_redirect_payment( $order_id, false );
+				if ('api_connection_error' === $response->error->type || 'api_error' === $response->error->type) {
+					if ($retry) {
+						sleep(5);
+						return $this->process_redirect_payment($order_id, false);
 					} else {
-						$localized_message = __( 'API connection error and retries exhausted.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('API connection error and retries exhausted.', '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 );
+						if (5 <= $this->retry_interval) {
+							return $this->process_redirect_payment($order_id, false);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_redirect_payment( $order_id, true );
+						return $this->process_redirect_payment($order_id, true);
 					} else {
-						$localized_message = __( 'On going requests error and retries exhausted.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('On going requests error and retries exhausted.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( preg_match( '/No such customer/i', $response->error->message ) && $retry ) {
-					if ( WC_Stripe_Helper::is_pre_30() ) {
-						delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-						delete_post_meta( $order_id, '_stripe_customer_id' );
+				if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+					if (WC_Stripe_Helper::is_pre_30()) {
+						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();
 					}
 
-					return $this->process_redirect_payment( $order_id, false );
+					return $this->process_redirect_payment($order_id, false);
 
-				} elseif ( preg_match( '/No such token/i', $response->error->message ) && $source_object->token_id ) {
+				} elseif (preg_match('/No such token/i', $response->error->message) && $source_object->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( $source_object->token_id );
+					$wc_token = WC_Payment_Tokens::get($source_object->token_id);
 					$wc_token->delete();
-					$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $message );
+					$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($message);
+					throw new WC_Stripe_Exception(print_r($response, true), $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);
 			}
 
-			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()));
 
-			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);
 			}
 
-			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;
 		}
 	}
@@ -207,13 +207,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);
 	}
 
 	/**
@@ -223,52 +223,52 @@ 
 	 * @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_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			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();
 				}
 
-				$result = WC_Stripe_API::request( array(
-					'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+				$result = WC_Stripe_API::request(array(
+					'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 					'expand[]' => 'balance_transaction',
-				), 'charges/' . $charge . '/capture' );
+				), '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 {
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					WC_Stripe_Helper::is_pre_30() ? 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_pre_30() ? 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_pre_30() ? update_post_meta( $order_id, '_transaction_id', $result->id ) : $order->set_transaction_id( $result->id );
+					WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
 
-					if ( isset( $result->balance_transaction ) && isset( $result->balance_transaction->fee ) ) {
+					if (isset($result->balance_transaction) && isset($result->balance_transaction->fee)) {
 						// Fees and Net needs to both come from Stripe to be accurate as the returned
 						// values are in the local currency of the Stripe account, not from WC.
-						$fee = ! empty( $result->balance_transaction->fee ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'fee' ) : 0;
-						$net = ! empty( $result->balance_transaction->net ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'net' ) : 0;
-						WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, parent::META_NAME_FEE, $fee ) : $order->update_meta_data( parent::META_NAME_FEE, $fee );
-						WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, parent::META_NAME_NET, $net ) : $order->update_meta_data( parent::META_NAME_NET, $net );
+						$fee = ! empty($result->balance_transaction->fee) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'fee') : 0;
+						$net = ! empty($result->balance_transaction->net) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'net') : 0;
+						WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, parent::META_NAME_FEE, $fee) : $order->update_meta_data(parent::META_NAME_FEE, $fee);
+						WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, parent::META_NAME_NET, $net) : $order->update_meta_data(parent::META_NAME_NET, $net);
 					}
 
-					if ( is_callable( array( $order, 'save' ) ) ) {
+					if (is_callable(array($order, 'save'))) {
 						$order->save();
 					}
 				}
 
 				// 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);
 			}
 		}
 	}
@@ -280,14 +280,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_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$this->process_refund( $order_id );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $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);
 		}
 	}
 
@@ -299,21 +299,21 @@ 
 	 * @param string $field
 	 * @return string $error_field
 	 */
-	public function normalize_field( $field ) {
+	public function normalize_field($field) {
 		$checkout_fields = WC()->checkout->get_checkout_fields();
 		$org_str         = array();
 		$replace_str     = array();
 
-		if ( array_key_exists( $field, $checkout_fields['billing'] ) ) {
-			$error_field = __( 'Billing', 'woocommerce-gateway-stripe' ) . ' ' . $checkout_fields['billing'][ $field ]['label'];
-		} elseif ( array_key_exists( $field, $checkout_fields['shipping'] ) ) {
-			$error_field = __( 'Shipping', 'woocommerce-gateway-stripe' ) . ' ' . $checkout_fields['shipping'][ $field ]['label'];
-		} elseif ( array_key_exists( $field, $checkout_fields['order'] ) ) {
-			$error_field = $checkout_fields['order'][ $field ]['label'];
-		} elseif ( array_key_exists( $field, $checkout_fields['account'] ) ) {
-			$error_field = $checkout_fields['account'][ $field ]['label'];
+		if (array_key_exists($field, $checkout_fields['billing'])) {
+			$error_field = __('Billing', 'woocommerce-gateway-stripe') . ' ' . $checkout_fields['billing'][$field]['label'];
+		} elseif (array_key_exists($field, $checkout_fields['shipping'])) {
+			$error_field = __('Shipping', 'woocommerce-gateway-stripe') . ' ' . $checkout_fields['shipping'][$field]['label'];
+		} elseif (array_key_exists($field, $checkout_fields['order'])) {
+			$error_field = $checkout_fields['order'][$field]['label'];
+		} elseif (array_key_exists($field, $checkout_fields['account'])) {
+			$error_field = $checkout_fields['account'][$field]['label'];
 		} else {
-			$error_field = str_replace( '_', ' ', $field );
+			$error_field = str_replace('_', ' ', $field);
 
 			$org_str[]     = 'stripe';
 			$replace_str[] = '';
@@ -328,9 +328,9 @@ 
 			$replace_str[] = 'SOFORT';
 
 			$org_str[]     = 'owner';
-			$replace_str[] = __( 'Owner', 'woocommerce-gateway-stripe' );
+			$replace_str[] = __('Owner', 'woocommerce-gateway-stripe');
 
-			$error_field   = str_replace( $org_str, $replace_str, $error_field );
+			$error_field   = str_replace($org_str, $replace_str, $error_field);
 		}
 
 		return $error_field;
@@ -343,135 +343,135 @@ 
 	 * @version 4.0.0
 	 */
 	public function validate_checkout() {
-		if ( ! wp_verify_nonce( $_POST['nonce'], '_wc_stripe_nonce' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+		if ( ! wp_verify_nonce($_POST['nonce'], '_wc_stripe_nonce')) {
+			wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 		}
 
-		parse_str( $_POST['required_fields'], $required_fields );
-		parse_str( $_POST['all_fields'], $all_fields );
+		parse_str($_POST['required_fields'], $required_fields);
+		parse_str($_POST['all_fields'], $all_fields);
 		$validate_shipping_fields = false;
 		$create_account           = false;
 		$errors                   = new WP_Error();
-		$all_fields               = apply_filters( 'wc_stripe_validate_checkout_all_fields', $all_fields );
-		$required_fields          = apply_filters( 'wc_stripe_validate_checkout_required_fields', $required_fields );
+		$all_fields               = apply_filters('wc_stripe_validate_checkout_all_fields', $all_fields);
+		$required_fields          = apply_filters('wc_stripe_validate_checkout_required_fields', $required_fields);
 
-		array_walk_recursive( $required_fields, 'wc_clean' );
-		array_walk_recursive( $all_fields, 'wc_clean' );
+		array_walk_recursive($required_fields, 'wc_clean');
+		array_walk_recursive($all_fields, 'wc_clean');
 
 		/**
 		 * If ship to different address checkbox is checked then we need
 		 * to validate shipping fields too.
 		 */
-		if ( isset( $all_fields['ship_to_different_address'] ) ) {
+		if (isset($all_fields['ship_to_different_address'])) {
 			$validate_shipping_fields = true;
 		}
 
 		// Check if createaccount is checked.
-		if ( isset( $all_fields['createaccount'] ) ) {
+		if (isset($all_fields['createaccount'])) {
 			$create_account = true;
 		}
 
 		// Check if required fields are empty.
-		foreach ( $required_fields as $field => $field_value ) {
+		foreach ($required_fields as $field => $field_value) {
 			// Check for shipping field.
-			if ( preg_match( '/^shipping_/', $field ) && ! $validate_shipping_fields ) {
+			if (preg_match('/^shipping_/', $field) && ! $validate_shipping_fields) {
 				continue;
 			}
 
 			// Check create account name.
-			if ( 'account_username' === $field && ! $create_account ) {
+			if ('account_username' === $field && ! $create_account) {
 				continue;
 			}
 
 			// Check create account password.
-			if ( 'account_password' === $field && ! $create_account ) {
+			if ('account_password' === $field && ! $create_account) {
 				continue;
 			}
 
-			if ( empty( $field_value ) || '-1' === $field_value ) {
-				$error_field = $this->normalize_field( $field );
+			if (empty($field_value) || '-1' === $field_value) {
+				$error_field = $this->normalize_field($field);
 				/* translators: error field name */
-				$errors->add( 'validation', sprintf( __( '<strong>%s</strong> cannot be empty', 'woocommerce-gateway-stripe' ), $error_field ) );
+				$errors->add('validation', sprintf(__('<strong>%s</strong> cannot be empty', 'woocommerce-gateway-stripe'), $error_field));
 			}
 		}
 
 		// Check if email is valid format.
-		if ( ! empty( $required_fields['billing_email'] ) && ! is_email( $required_fields['billing_email'] ) ) {
-			$errors->add( 'validation', __( '<strong>Billing Email</strong> is not valid', 'woocommerce-gateway-stripe' ) );
+		if ( ! empty($required_fields['billing_email']) && ! is_email($required_fields['billing_email'])) {
+			$errors->add('validation', __('<strong>Billing Email</strong> is not valid', 'woocommerce-gateway-stripe'));
 		}
 
 		// Check if phone number is valid format.
-		if ( ! empty( $required_fields['billing_phone'] ) ) {
-			$phone = wc_format_phone_number( $required_fields['billing_phone'] );
+		if ( ! empty($required_fields['billing_phone'])) {
+			$phone = wc_format_phone_number($required_fields['billing_phone']);
 
-			if ( '' !== $phone && ! WC_Validation::is_phone( $phone ) ) {
+			if ('' !== $phone && ! WC_Validation::is_phone($phone)) {
 				/* translators: %s: phone number */
-				$errors->add( 'validation', __( 'Please enter a valid phone number.', 'woocommerce-gateway-stripe' ) );
+				$errors->add('validation', __('Please enter a valid phone number.', 'woocommerce-gateway-stripe'));
 			}
 		}
 
 		// Check if postal code is valid format.
-		if ( ! empty( $required_fields['billing_postcode'] ) ) {
-			$country = isset( $required_fields['billing_country'] ) ? $required_fields['billing_country'] : WC()->customer->get_billing_country();
-			$postcode = wc_format_postcode( $required_fields['billing_postcode'], $country );
+		if ( ! empty($required_fields['billing_postcode'])) {
+			$country = isset($required_fields['billing_country']) ? $required_fields['billing_country'] : WC()->customer->get_billing_country();
+			$postcode = wc_format_postcode($required_fields['billing_postcode'], $country);
 
-			if ( '' !== $required_fields['billing_postcode'] && ! WC_Validation::is_postcode( $postcode, $country ) ) {
-				$errors->add( 'validation', __( 'Please enter a valid billing postcode / ZIP.', 'woocommerce-gateway-stripe' ) );
+			if ('' !== $required_fields['billing_postcode'] && ! WC_Validation::is_postcode($postcode, $country)) {
+				$errors->add('validation', __('Please enter a valid billing postcode / ZIP.', 'woocommerce-gateway-stripe'));
 			}
 		}
 
-		if ( WC()->cart->needs_shipping() && $validate_shipping_fields ) {
+		if (WC()->cart->needs_shipping() && $validate_shipping_fields) {
 			// Check if postal code is valid format.
-			if ( ! empty( $required_fields['shipping_postcode'] ) ) {
-				$country = isset( $required_fields['shipping_country'] ) ? $required_fields['shipping_country'] : WC()->customer->get_shipping_country();
-				$postcode = wc_format_postcode( $required_fields['shipping_postcode'], $country );
+			if ( ! empty($required_fields['shipping_postcode'])) {
+				$country = isset($required_fields['shipping_country']) ? $required_fields['shipping_country'] : WC()->customer->get_shipping_country();
+				$postcode = wc_format_postcode($required_fields['shipping_postcode'], $country);
 
-				if ( '' !== $required_fields['shipping_postcode'] && ! WC_Validation::is_postcode( $postcode, $country ) ) {
-					$errors->add( 'validation', __( 'Please enter a valid shipping postcode / ZIP.', 'woocommerce-gateway-stripe' ) );
+				if ('' !== $required_fields['shipping_postcode'] && ! WC_Validation::is_postcode($postcode, $country)) {
+					$errors->add('validation', __('Please enter a valid shipping postcode / ZIP.', 'woocommerce-gateway-stripe'));
 				}
 			}
 		}
 
-		if ( WC()->cart->needs_shipping() ) {
+		if (WC()->cart->needs_shipping()) {
 			$shipping_country = WC()->customer->get_shipping_country();
 
-			if ( empty( $shipping_country ) ) {
-				$errors->add( 'shipping', __( 'Please enter an address to continue.', 'woocommerce-gateway-stripe' ) );
-			} elseif ( ! in_array( WC()->customer->get_shipping_country(), array_keys( WC()->countries->get_shipping_countries() ) ) ) {
+			if (empty($shipping_country)) {
+				$errors->add('shipping', __('Please enter an address to continue.', 'woocommerce-gateway-stripe'));
+			} elseif ( ! in_array(WC()->customer->get_shipping_country(), array_keys(WC()->countries->get_shipping_countries()))) {
 				/* translators: country name */
-				$errors->add( 'shipping', sprintf( __( 'Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce-gateway-stripe' ), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country() ) );
+				$errors->add('shipping', sprintf(__('Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce-gateway-stripe'), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country()));
 			} else {
-				$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+				$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
 
-				foreach ( WC()->shipping->get_packages() as $i => $package ) {
-					if ( ! isset( $chosen_shipping_methods[ $i ], $package['rates'][ $chosen_shipping_methods[ $i ] ] ) ) {
-						$errors->add( 'shipping', __( 'No shipping method has been selected. Please double check your address, or contact us if you need any help.', 'woocommerce-gateway-stripe' ) );
+				foreach (WC()->shipping->get_packages() as $i => $package) {
+					if ( ! isset($chosen_shipping_methods[$i], $package['rates'][$chosen_shipping_methods[$i]])) {
+						$errors->add('shipping', __('No shipping method has been selected. Please double check your address, or contact us if you need any help.', 'woocommerce-gateway-stripe'));
 					}
 				}
 			}
 		}
 
-		if ( WC()->cart->needs_payment() ) {
+		if (WC()->cart->needs_payment()) {
 			$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-			if ( ! isset( $available_gateways[ $all_fields['payment_method'] ] ) ) {
-				$errors->add( 'payment', __( 'Invalid payment method.', 'woocommerce-gateway-stripe' ) );
+			if ( ! isset($available_gateways[$all_fields['payment_method']])) {
+				$errors->add('payment', __('Invalid payment method.', 'woocommerce-gateway-stripe'));
 			} else {
-				$available_gateways[ $all_fields['payment_method'] ]->validate_fields();
+				$available_gateways[$all_fields['payment_method']]->validate_fields();
 			}
 		}
 
-		if ( empty( $all_fields['woocommerce_checkout_update_totals'] ) && empty( $all_fields['terms'] ) && apply_filters( 'woocommerce_checkout_show_terms', wc_get_page_id( 'terms' ) > 0 ) ) {
-			$errors->add( 'terms', __( 'You must accept our Terms &amp; Conditions.', 'woocommerce-gateway-stripe' ) );
+		if (empty($all_fields['woocommerce_checkout_update_totals']) && empty($all_fields['terms']) && apply_filters('woocommerce_checkout_show_terms', wc_get_page_id('terms') > 0)) {
+			$errors->add('terms', __('You must accept our Terms &amp; Conditions.', 'woocommerce-gateway-stripe'));
 		}
 
-		do_action( 'wc_stripe_validate_checkout', $required_fields, $all_fields, $errors );
+		do_action('wc_stripe_validate_checkout', $required_fields, $all_fields, $errors);
 
-		if ( 0 === count( $errors->errors ) ) {
-			wp_send_json( 'success' );
+		if (0 === count($errors->errors)) {
+			wp_send_json('success');
 		} else {
-			foreach ( $errors->get_error_messages() as $message ) {
-				wc_add_notice( $message, 'error' );
+			foreach ($errors->get_error_messages() as $message) {
+				wc_add_notice($message, 'error');
 			}
 
 			$this->send_ajax_failure_response();
@@ -485,9 +485,9 @@ 
 	 * @version 4.0.0
 	 */
 	public function send_ajax_failure_response() {
-		if ( is_ajax() ) {
+		if (is_ajax()) {
 			// only print notices if not reloading the checkout, otherwise they're lost in the page reload.
-			if ( ! isset( WC()->session->reload_checkout ) ) {
+			if ( ! isset(WC()->session->reload_checkout)) {
 				ob_start();
 				wc_print_notices();
 				$messages = ob_get_clean();
@@ -495,14 +495,14 @@ 
 
 			$response = array(
 				'result'   => 'failure',
-				'messages' => isset( $messages ) ? $messages : '',
-				'refresh'  => isset( WC()->session->refresh_totals ),
-				'reload'   => isset( WC()->session->reload_checkout ),
+				'messages' => isset($messages) ? $messages : '',
+				'refresh'  => isset(WC()->session->refresh_totals),
+				'reload'   => isset(WC()->session->reload_checkout),
 			);
 
-			unset( WC()->session->refresh_totals, WC()->session->reload_checkout );
+			unset(WC()->session->refresh_totals, WC()->session->reload_checkout);
 
-			wp_send_json( $response );
+			wp_send_json($response);
 		}
 	}
 }

includes/payment-methods/class-wc-stripe-payment-request.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * Get this instance.
 	 *
 	 * @since 4.0.6
-	 * @return class
+	 * @return WC_Stripe_Payment_Request
 	 */
 	public static function instance() {
 		return self::$_this;

Spacing +279 added lines, -279 removed lines

@@ -6,7 +6,7 @@ 
  * @since   4.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -64,39 +64,39 @@ 
 	 */
 	public function __construct() {
 		self::$_this                   = $this;
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
-		$this->testmode                = ( ! empty( $this->stripe_settings['testmode'] ) && 'yes' === $this->stripe_settings['testmode'] ) ? true : false;
-		$this->publishable_key         = ! empty( $this->stripe_settings['publishable_key'] ) ? $this->stripe_settings['publishable_key'] : '';
-		$this->stripe_checkout_enabled = isset( $this->stripe_settings['stripe_checkout'] ) && 'yes' === $this->stripe_settings['stripe_checkout'];
-		$this->total_label             = ! empty( $this->stripe_settings['statement_descriptor'] ) ? WC_Stripe_Helper::clean_statement_descriptor( $this->stripe_settings['statement_descriptor'] ) : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $this->stripe_settings['test_publishable_key'] ) ? $this->stripe_settings['test_publishable_key'] : '';
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
+		$this->testmode                = ( ! empty($this->stripe_settings['testmode']) && 'yes' === $this->stripe_settings['testmode']) ? true : false;
+		$this->publishable_key         = ! empty($this->stripe_settings['publishable_key']) ? $this->stripe_settings['publishable_key'] : '';
+		$this->stripe_checkout_enabled = isset($this->stripe_settings['stripe_checkout']) && 'yes' === $this->stripe_settings['stripe_checkout'];
+		$this->total_label             = ! empty($this->stripe_settings['statement_descriptor']) ? WC_Stripe_Helper::clean_statement_descriptor($this->stripe_settings['statement_descriptor']) : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($this->stripe_settings['test_publishable_key']) ? $this->stripe_settings['test_publishable_key'] : '';
 		}
 
 		// If both site title and statement descriptor is not set. Fallback.
-		if ( empty( $this->total_label ) ) {
+		if (empty($this->total_label)) {
 			$this->total_label = $_SERVER['SERVER_NAME'];
 		}
 
-		$this->total_label = str_replace( "'", '', $this->total_label ) . apply_filters( 'wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)' );
+		$this->total_label = str_replace("'", '', $this->total_label) . apply_filters('wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)');
 
 		// Checks if Stripe Gateway is enabled.
-		if ( empty( $this->stripe_settings ) || ( isset( $this->stripe_settings['enabled'] ) && 'yes' !== $this->stripe_settings['enabled'] ) ) {
+		if (empty($this->stripe_settings) || (isset($this->stripe_settings['enabled']) && 'yes' !== $this->stripe_settings['enabled'])) {
 			return;
 		}
 
 		// Checks if Payment Request is enabled.
-		if ( ! isset( $this->stripe_settings['payment_request'] ) || 'yes' !== $this->stripe_settings['payment_request'] ) {
+		if ( ! isset($this->stripe_settings['payment_request']) || 'yes' !== $this->stripe_settings['payment_request']) {
 			return;
 		}
 
 		// Don't load for change payment method page.
-		if ( isset( $_GET['change_payment_method'] ) ) {
+		if (isset($_GET['change_payment_method'])) {
 			return;
 		}
 
-		add_action( 'woocommerce_init', array( $this, 'set_session' ) );
+		add_action('woocommerce_init', array($this, 'set_session'));
 		$this->init();
 	}
 
@@ -117,15 +117,15 @@ 
 	 * @since 4.0.0
 	 */
 	public function set_session() {
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			$wc_session = new WC_Session_Handler();
 
-			if ( version_compare( WC_VERSION, '3.3', '>=' ) ) {
+			if (version_compare(WC_VERSION, '3.3', '>=')) {
 				$wc_session->init();
 			}
 
-			if ( ! $wc_session->has_session() ) {
-				$wc_session->set_customer_session_cookie( true );
+			if ( ! $wc_session->has_session()) {
+				$wc_session->set_customer_session_cookie(true);
 			}
 		}
 	}
@@ -137,40 +137,40 @@ 
 	 * @version 4.0.0
 	 */
 	public function init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 
 		/*
 		 * In order to display the Payment Request button in the correct position,
 		 * a new hook was added to WooCommerce 3.0. In older versions of WooCommerce,
 		 * CSS is used to position the button.
 		 */
-		if ( WC_Stripe_Helper::is_pre_30() ) {
-			add_action( 'woocommerce_after_add_to_cart_button', array( $this, 'display_payment_request_button_html' ), 1 );
-			add_action( 'woocommerce_after_add_to_cart_button', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		if (WC_Stripe_Helper::is_pre_30()) {
+			add_action('woocommerce_after_add_to_cart_button', array($this, 'display_payment_request_button_html'), 1);
+			add_action('woocommerce_after_add_to_cart_button', array($this, 'display_payment_request_button_separator_html'), 2);
 		} else {
-			add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_html' ), 1 );
-			add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+			add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_html'), 1);
+			add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_separator_html'), 2);
 		}
 
-		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_html' ), 1 );
-		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_html'), 1);
+		add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_separator_html'), 2);
 
-		add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_html' ), 1 );
-		add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_html'), 1);
+		add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_separator_html'), 2);
 
-		add_action( 'wc_ajax_wc_stripe_get_cart_details', array( $this, 'ajax_get_cart_details' ) );
-		add_action( 'wc_ajax_wc_stripe_get_shipping_options', array( $this, 'ajax_get_shipping_options' ) );
-		add_action( 'wc_ajax_wc_stripe_update_shipping_method', array( $this, 'ajax_update_shipping_method' ) );
-		add_action( 'wc_ajax_wc_stripe_create_order', array( $this, 'ajax_create_order' ) );
-		add_action( 'wc_ajax_wc_stripe_add_to_cart', array( $this, 'ajax_add_to_cart' ) );
-		add_action( 'wc_ajax_wc_stripe_get_selected_product_data', array( $this, 'ajax_get_selected_product_data' ) );
-		add_action( 'wc_ajax_wc_stripe_clear_cart', array( $this, 'ajax_clear_cart' ) );
-		add_action( 'wc_ajax_wc_stripe_log_errors', array( $this, 'ajax_log_errors' ) );
+		add_action('wc_ajax_wc_stripe_get_cart_details', array($this, 'ajax_get_cart_details'));
+		add_action('wc_ajax_wc_stripe_get_shipping_options', array($this, 'ajax_get_shipping_options'));
+		add_action('wc_ajax_wc_stripe_update_shipping_method', array($this, 'ajax_update_shipping_method'));
+		add_action('wc_ajax_wc_stripe_create_order', array($this, 'ajax_create_order'));
+		add_action('wc_ajax_wc_stripe_add_to_cart', array($this, 'ajax_add_to_cart'));
+		add_action('wc_ajax_wc_stripe_get_selected_product_data', array($this, 'ajax_get_selected_product_data'));
+		add_action('wc_ajax_wc_stripe_clear_cart', array($this, 'ajax_clear_cart'));
+		add_action('wc_ajax_wc_stripe_log_errors', array($this, 'ajax_log_errors'));
 
-		add_filter( 'woocommerce_gateway_title', array( $this, 'filter_gateway_title' ), 10, 2 );
-		add_filter( 'woocommerce_validate_postcode', array( $this, 'postal_code_validation' ), 10, 3 );
+		add_filter('woocommerce_gateway_title', array($this, 'filter_gateway_title'), 10, 2);
+		add_filter('woocommerce_validate_postcode', array($this, 'postal_code_validation'), 10, 3);
 
-		add_action( 'woocommerce_checkout_order_processed', array( $this, 'add_order_meta' ), 10, 2 );
+		add_action('woocommerce_checkout_order_processed', array($this, 'add_order_meta'), 10, 2);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 * @return string
 	 */
 	public function get_button_type() {
-		return isset( $this->stripe_settings['payment_request_button_type'] ) ? $this->stripe_settings['payment_request_button_type'] : 'default';
+		return isset($this->stripe_settings['payment_request_button_type']) ? $this->stripe_settings['payment_request_button_type'] : 'default';
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * @return string
 	 */
 	public function get_button_theme() {
-		return isset( $this->stripe_settings['payment_request_button_theme'] ) ? $this->stripe_settings['payment_request_button_theme'] : 'dark';
+		return isset($this->stripe_settings['payment_request_button_theme']) ? $this->stripe_settings['payment_request_button_theme'] : 'dark';
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	public function get_button_height() {
-		return isset( $this->stripe_settings['payment_request_button_height'] ) ? str_replace( 'px', '', $this->stripe_settings['payment_request_button_height'] ) : '64';
+		return isset($this->stripe_settings['payment_request_button_height']) ? str_replace('px', '', $this->stripe_settings['payment_request_button_height']) : '64';
 	}
 
 	/**
@@ -213,40 +213,40 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_product_data() {
-		if ( ! is_product() ) {
+		if ( ! is_product()) {
 			return false;
 		}
 
 		global $post;
 
-		$product = wc_get_product( $post->ID );
+		$product = wc_get_product($post->ID);
 
 		$data  = array();
 		$items = array();
 
 		$items[] = array(
 			'label'  => WC_Stripe_Helper::is_pre_30() ? $product->name : $product->get_name(),
-			'amount' => WC_Stripe_Helper::get_stripe_amount( WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price() ),
+			'amount' => WC_Stripe_Helper::get_stripe_amount(WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price()),
 		);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
-				'label'   => __( 'Tax', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Tax', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 		}
 
-		if ( wc_shipping_enabled() && $product->needs_shipping() ) {
+		if (wc_shipping_enabled() && $product->needs_shipping()) {
 			$items[] = array(
-				'label'   => __( 'Shipping', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Shipping', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 
-			$data['shippingOptions']  = array(
+			$data['shippingOptions'] = array(
 				'id'     => 'pending',
-				'label'  => __( 'Pending', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Pending', 'woocommerce-gateway-stripe'),
 				'detail' => '',
 				'amount' => 0,
 			);
@@ -254,41 +254,41 @@ 
 
 		$data['displayItems'] = $items;
 		$data['total'] = array(
-			'label'   => apply_filters( 'wc_stripe_payment_request_total_label', $this->total_label ),
-			'amount'  => WC_Stripe_Helper::get_stripe_amount( WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price() ),
+			'label'   => apply_filters('wc_stripe_payment_request_total_label', $this->total_label),
+			'amount'  => WC_Stripe_Helper::get_stripe_amount(WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price()),
 			'pending' => true,
 		);
 
-		$data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() );
-		$data['currency']        = strtolower( get_woocommerce_currency() );
-		$data['country_code']    = substr( get_option( 'woocommerce_default_country' ), 0, 2 );
+		$data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping());
+		$data['currency']        = strtolower(get_woocommerce_currency());
+		$data['country_code']    = substr(get_option('woocommerce_default_country'), 0, 2);
 
-		return apply_filters( 'wc_stripe_payment_request_product_data', $data, $product );
+		return apply_filters('wc_stripe_payment_request_product_data', $data, $product);
 	}
 
 	/**
 	 * Filters the gateway title to reflect Payment Request type
 	 *
 	 */
-	public function filter_gateway_title( $title, $id ) {
+	public function filter_gateway_title($title, $id) {
 		global $post;
 
-		if ( ! is_object( $post ) ) {
+		if ( ! is_object($post)) {
 			return $title;
 		}
 
-		if ( WC_Stripe_Helper::is_pre_30() ) {
-			$method_title = get_post_meta( $post->ID, '_payment_method_title', true );
+		if (WC_Stripe_Helper::is_pre_30()) {
+			$method_title = get_post_meta($post->ID, '_payment_method_title', true);
 		} else {
-			$order        = wc_get_order( $post->ID );
-			$method_title = is_object( $order ) ? $order->get_payment_method_title() : '';
+			$order        = wc_get_order($post->ID);
+			$method_title = is_object($order) ? $order->get_payment_method_title() : '';
 		}
 
-		if ( 'stripe' === $id && ! empty( $method_title ) && 'Apple Pay (Stripe)' === $method_title ) {
+		if ('stripe' === $id && ! empty($method_title) && 'Apple Pay (Stripe)' === $method_title) {
 			return $method_title;
 		}
 
-		if ( 'stripe' === $id && ! empty( $method_title ) && 'Chrome Payment Request (Stripe)' === $method_title ) {
+		if ('stripe' === $id && ! empty($method_title) && 'Chrome Payment Request (Stripe)' === $method_title) {
 			return $method_title;
 		}
 
@@ -301,16 +301,16 @@ 
 	 * @since 3.1.4
 	 * @version 4.0.0
 	 */
-	public function postal_code_validation( $valid, $postcode, $country ) {
+	public function postal_code_validation($valid, $postcode, $country) {
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return $valid;
 		}
 
-		$payment_request_type = isset( $_POST['payment_request_type'] ) ? wc_clean( $_POST['payment_request_type'] ) : '';
+		$payment_request_type = isset($_POST['payment_request_type']) ? wc_clean($_POST['payment_request_type']) : '';
 
-		if ( 'apple_pay' !== $payment_request_type ) {
+		if ('apple_pay' !== $payment_request_type) {
 			return $valid;
 		}
 
@@ -320,7 +320,7 @@ 
 		 * the order and not let it go through. The remedy for now is just to remove this validation.
 		 * Note that this only works with shipping providers that don't validate full postal codes.
 		 */
-		if ( 'GB' === $country || 'CA' === $country ) {
+		if ('GB' === $country || 'CA' === $country) {
 			return true;
 		}
 
@@ -335,29 +335,29 @@ 
 	 * @param int $order_id
 	 * @param array $posted_data The posted data from checkout form.
 	 */
-	public function add_order_meta( $order_id, $posted_data ) {
-		if ( empty( $_POST['payment_request_type'] ) ) {
+	public function add_order_meta($order_id, $posted_data) {
+		if (empty($_POST['payment_request_type'])) {
 			return;
 		}
 
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 
-		$payment_request_type = wc_clean( $_POST['payment_request_type'] );
+		$payment_request_type = wc_clean($_POST['payment_request_type']);
 
-		if ( 'apple_pay' === $payment_request_type ) {
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_payment_method_title', 'Apple Pay (Stripe)' );
+		if ('apple_pay' === $payment_request_type) {
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_payment_method_title', 'Apple Pay (Stripe)');
 			} else {
-				$order->set_payment_method_title( 'Apple Pay (Stripe)' );
+				$order->set_payment_method_title('Apple Pay (Stripe)');
 				$order->save();
 			}
 		}
 
-		if ( 'payment_request_api' === $payment_request_type ) {
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_payment_method_title', 'Chrome Payment Request (Stripe)' );
+		if ('payment_request_api' === $payment_request_type) {
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_payment_method_title', 'Chrome Payment Request (Stripe)');
 			} else {
-				$order->set_payment_method_title( 'Chrome Payment Request (Stripe)' );
+				$order->set_payment_method_title('Chrome Payment Request (Stripe)');
 				$order->save();
 			}
 		}
@@ -371,11 +371,11 @@ 
 	 * @return array
 	 */
 	public function supported_product_types() {
-		return apply_filters( 'wc_stripe_payment_request_supported_types', array(
+		return apply_filters('wc_stripe_payment_request_supported_types', array(
 			'simple',
 			'variable',
 			'variation',
-		) );
+		));
 	}
 
 	/**
@@ -386,15 +386,15 @@ 
 	 * @return bool
 	 */
 	public function allowed_items_in_cart() {
-		foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-			$_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
+		foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) {
+			$_product = apply_filters('woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key);
 
-			if ( ! in_array( ( WC_Stripe_Helper::is_pre_30() ? $_product->product_type : $_product->get_type() ), $this->supported_product_types() ) ) {
+			if ( ! in_array((WC_Stripe_Helper::is_pre_30() ? $_product->product_type : $_product->get_type()), $this->supported_product_types())) {
 				return false;
 			}
 
 			// Pre Orders compatbility where we don't support charge upon release.
-			if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release( WC_Pre_Orders_Cart::get_pre_order_product() ) ) {
+			if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release(WC_Pre_Orders_Cart::get_pre_order_product())) {
 				return false;
 			}
 		}
@@ -409,71 +409,71 @@ 
 	 * @version 4.0.0
 	 */
 	public function scripts() {
-		if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_product() ) {
+		if (is_product()) {
 			global $post;
 
-			$product = wc_get_product( $post->ID );
+			$product = wc_get_product($post->ID);
 
-			if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) {
+			if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type()), $this->supported_product_types())) {
 				return;
 			}
 
-			if ( apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false ) ) {
+			if (apply_filters('wc_stripe_hide_payment_request_on_product_page', false)) {
 				return;
 			}
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true );
-		wp_register_script( 'wc_stripe_payment_request', plugins_url( 'assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true);
+		wp_register_script('wc_stripe_payment_request', plugins_url('assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery', 'stripe'), WC_STRIPE_VERSION, true);
 
 		wp_localize_script(
 			'wc_stripe_payment_request',
 			'wc_stripe_payment_request_params',
 			array(
-				'ajax_url' => WC_AJAX::get_endpoint( '%%endpoint%%' ),
+				'ajax_url' => WC_AJAX::get_endpoint('%%endpoint%%'),
 				'stripe'   => array(
 					'key'                => $this->publishable_key,
-					'allow_prepaid_card' => apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no',
+					'allow_prepaid_card' => apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no',
 				),
 				'nonce'    => array(
-					'payment'                        => wp_create_nonce( 'wc-stripe-payment-request' ),
-					'shipping'                       => wp_create_nonce( 'wc-stripe-payment-request-shipping' ),
-					'update_shipping'                => wp_create_nonce( 'wc-stripe-update-shipping-method' ),
-					'checkout'                       => wp_create_nonce( 'woocommerce-process_checkout' ),
-					'add_to_cart'                    => wp_create_nonce( 'wc-stripe-add-to-cart' ),
-					'get_selected_product_data'      => wp_create_nonce( 'wc-stripe-get-selected-product-data' ),
-					'log_errors'                     => wp_create_nonce( 'wc-stripe-log-errors' ),
-					'clear_cart'                     => wp_create_nonce( 'wc-stripe-clear-cart' ),
+					'payment'                        => wp_create_nonce('wc-stripe-payment-request'),
+					'shipping'                       => wp_create_nonce('wc-stripe-payment-request-shipping'),
+					'update_shipping'                => wp_create_nonce('wc-stripe-update-shipping-method'),
+					'checkout'                       => wp_create_nonce('woocommerce-process_checkout'),
+					'add_to_cart'                    => wp_create_nonce('wc-stripe-add-to-cart'),
+					'get_selected_product_data'      => wp_create_nonce('wc-stripe-get-selected-product-data'),
+					'log_errors'                     => wp_create_nonce('wc-stripe-log-errors'),
+					'clear_cart'                     => wp_create_nonce('wc-stripe-clear-cart'),
 				),
 				'i18n'     => array(
-					'no_prepaid_card'  => __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ),
+					'no_prepaid_card'  => __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'),
 					/* translators: Do not translate the [option] placeholder */
-					'unknown_shipping' => __( 'Unknown shipping option "[option]".', 'woocommerce-gateway-stripe' ),
+					'unknown_shipping' => __('Unknown shipping option "[option]".', 'woocommerce-gateway-stripe'),
 				),
 				'checkout' => array(
 					'url'            => wc_get_checkout_url(),
-					'currency_code'  => strtolower( get_woocommerce_currency() ),
-					'country_code'   => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
+					'currency_code'  => strtolower(get_woocommerce_currency()),
+					'country_code'   => substr(get_option('woocommerce_default_country'), 0, 2),
 					'needs_shipping' => WC()->cart->needs_shipping() ? 'yes' : 'no',
 				),
 				'button' => array(
 					'type'   => $this->get_button_type(),
 					'theme'  => $this->get_button_theme(),
 					'height' => $this->get_button_height(),
-					'locale' => substr( get_locale(), 0, 2 ), // Default format is en_US.
+					'locale' => substr(get_locale(), 0, 2), // Default format is en_US.
 				),
 				'is_product_page' => is_product(),
 				'product'         => $this->get_product_data(),
 			)
 		);
 
-		wp_enqueue_script( 'wc_stripe_payment_request' );
+		wp_enqueue_script('wc_stripe_payment_request');
 	}
 
 	/**
@@ -485,39 +485,39 @@ 
 	public function display_payment_request_button_html() {
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return;
 		}
 
-		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_product() && apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false ) ) {
+		if (is_product() && apply_filters('wc_stripe_hide_payment_request_on_product_page', false)) {
 			return;
 		}
 
-		if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false ) ) {
+		if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false)) {
 			return;
 		}
 
-		if ( is_product() ) {
+		if (is_product()) {
 			global $post;
 
-			$product = wc_get_product( $post->ID );
+			$product = wc_get_product($post->ID);
 
-			if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) {
+			if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type()), $this->supported_product_types())) {
 				return;
 			}
 
 			// Pre Orders charge upon release not supported.
-			if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) {
-				WC_Stripe_Logger::log( 'Pre Order charge upon release is not supported. ( Payment Request button disabled )' );
+			if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Product::product_is_charged_upon_release($product)) {
+				WC_Stripe_Logger::log('Pre Order charge upon release is not supported. ( Payment Request button disabled )');
 				return;
 			}
 		} else {
-			if ( ! $this->allowed_items_in_cart() ) {
-				WC_Stripe_Logger::log( 'Items in the cart has unsupported product type ( Payment Request button disabled )' );
+			if ( ! $this->allowed_items_in_cart()) {
+				WC_Stripe_Logger::log('Items in the cart has unsupported product type ( Payment Request button disabled )');
 				return;
 			}
 		}
@@ -539,44 +539,44 @@ 
 	public function display_payment_request_button_separator_html() {
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return;
 		}
 
-		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_product() && apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false ) ) {
+		if (is_product() && apply_filters('wc_stripe_hide_payment_request_on_product_page', false)) {
 			return;
 		}
 
-		if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false ) ) {
+		if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false)) {
 			return;
 		}
 
-		if ( is_product() ) {
+		if (is_product()) {
 			global $post;
 
-			$product = wc_get_product( $post->ID );
+			$product = wc_get_product($post->ID);
 
-			if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) {
+			if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type()), $this->supported_product_types())) {
 				return;
 			}
 
 			// Pre Orders charge upon release not supported.
-			if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) {
-				WC_Stripe_Logger::log( 'Pre Order charge upon release is not supported. ( Payment Request button disabled )' );
+			if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Product::product_is_charged_upon_release($product)) {
+				WC_Stripe_Logger::log('Pre Order charge upon release is not supported. ( Payment Request button disabled )');
 				return;
 			}
 		} else {
-			if ( ! $this->allowed_items_in_cart() ) {
-				WC_Stripe_Logger::log( 'Items in the cart has unsupported product type ( Payment Request button disabled )' );
+			if ( ! $this->allowed_items_in_cart()) {
+				WC_Stripe_Logger::log('Items in the cart has unsupported product type ( Payment Request button disabled )');
 				return;
 			}
 		}
 		?>
-		<p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">- <?php esc_html_e( 'OR', 'woocommerce-gateway-stripe' ); ?> -</p>
+		<p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">- <?php esc_html_e('OR', 'woocommerce-gateway-stripe'); ?> -</p>
 		<?php
 	}
 
@@ -587,11 +587,11 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_log_errors() {
-		check_ajax_referer( 'wc-stripe-log-errors', 'security' );
+		check_ajax_referer('wc-stripe-log-errors', 'security');
 
-		$errors = wc_clean( stripslashes( $_POST['errors'] ) );
+		$errors = wc_clean(stripslashes($_POST['errors']));
 
-		WC_Stripe_Logger::log( $errors );
+		WC_Stripe_Logger::log($errors);
 
 		exit;
 	}
@@ -603,7 +603,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_clear_cart() {
-		check_ajax_referer( 'wc-stripe-clear-cart', 'security' );
+		check_ajax_referer('wc-stripe-clear-cart', 'security');
 
 		WC()->cart->empty_cart();
 		exit;
@@ -613,10 +613,10 @@ 
 	 * Get cart details.
 	 */
 	public function ajax_get_cart_details() {
-		check_ajax_referer( 'wc-stripe-payment-request', 'security' );
+		check_ajax_referer('wc-stripe-payment-request', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		WC()->cart->calculate_totals();
@@ -627,14 +627,14 @@ 
 		$data = array(
 			'shipping_required' => WC()->cart->needs_shipping(),
 			'order_data'        => array(
-				'currency'        => strtolower( $currency ),
-				'country_code'    => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
+				'currency'        => strtolower($currency),
+				'country_code'    => substr(get_option('woocommerce_default_country'), 0, 2),
 			),
 		);
 
 		$data['order_data'] += $this->build_display_items();
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -645,47 +645,47 @@ 
 	 * @see WC_Shipping::get_packages().
 	 */
 	public function ajax_get_shipping_options() {
-		check_ajax_referer( 'wc-stripe-payment-request-shipping', 'security' );
+		check_ajax_referer('wc-stripe-payment-request-shipping', 'security');
 
 		try {
 			// Set the shipping package.
-			$posted = filter_input_array( INPUT_POST, array(
+			$posted = filter_input_array(INPUT_POST, array(
 				'country'   => FILTER_SANITIZE_STRING,
 				'state'     => FILTER_SANITIZE_STRING,
 				'postcode'  => FILTER_SANITIZE_STRING,
 				'city'      => FILTER_SANITIZE_STRING,
 				'address'   => FILTER_SANITIZE_STRING,
 				'address_2' => FILTER_SANITIZE_STRING,
-			) );
+			));
 
-			$this->calculate_shipping( $posted );
+			$this->calculate_shipping($posted);
 
 			// Set the shipping options.
 			$data     = array();
 			$packages = WC()->shipping->get_packages();
 
-			if ( ! empty( $packages ) && WC()->customer->has_calculated_shipping() ) {
-				foreach ( $packages as $package_key => $package ) {
-					if ( empty( $package['rates'] ) ) {
-						throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) );
+			if ( ! empty($packages) && WC()->customer->has_calculated_shipping()) {
+				foreach ($packages as $package_key => $package) {
+					if (empty($package['rates'])) {
+						throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe'));
 					}
 
-					foreach ( $package['rates'] as $key => $rate ) {
+					foreach ($package['rates'] as $key => $rate) {
 						$data['shipping_options'][] = array(
 							'id'       => $rate->id,
 							'label'    => $rate->label,
 							'detail'   => '',
-							'amount'   => WC_Stripe_Helper::get_stripe_amount( $rate->cost ),
+							'amount'   => WC_Stripe_Helper::get_stripe_amount($rate->cost),
 						);
 					}
 				}
 			} else {
-				throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe'));
 			}
 
-			if ( isset( $data[0] ) ) {
+			if (isset($data[0])) {
 				// Auto select the first shipping method.
-				WC()->session->set( 'chosen_shipping_methods', array( $data[0]['id'] ) );
+				WC()->session->set('chosen_shipping_methods', array($data[0]['id']));
 			}
 
 			WC()->cart->calculate_totals();
@@ -693,12 +693,12 @@ 
 			$data += $this->build_display_items();
 			$data['result'] = 'success';
 
-			wp_send_json( $data );
-		} catch ( Exception $e ) {
+			wp_send_json($data);
+		} catch (Exception $e) {
 			$data += $this->build_display_items();
 			$data['result'] = 'invalid_shipping_address';
 
-			wp_send_json( $data );
+			wp_send_json($data);
 		}
 	}
 
@@ -706,22 +706,22 @@ 
 	 * Update shipping method.
 	 */
 	public function ajax_update_shipping_method() {
-		check_ajax_referer( 'wc-stripe-update-shipping-method', 'security' );
+		check_ajax_referer('wc-stripe-update-shipping-method', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
-		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-		$shipping_method         = filter_input( INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+		$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
+		$shipping_method         = filter_input(INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
 
-		if ( is_array( $shipping_method ) ) {
-			foreach ( $shipping_method as $i => $value ) {
-				$chosen_shipping_methods[ $i ] = wc_clean( $value );
+		if (is_array($shipping_method)) {
+			foreach ($shipping_method as $i => $value) {
+				$chosen_shipping_methods[$i] = wc_clean($value);
 			}
 		}
 
-		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+		WC()->session->set('chosen_shipping_methods', $chosen_shipping_methods);
 
 		WC()->cart->calculate_totals();
 
@@ -729,7 +729,7 @@ 
 		$data += $this->build_display_items();
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -740,31 +740,31 @@ 
 	 * @return array $data
 	 */
 	public function ajax_get_selected_product_data() {
-		check_ajax_referer( 'wc-stripe-get-selected-product-data', 'security' );
+		check_ajax_referer('wc-stripe-get-selected-product-data', 'security');
 
-		$product_id = absint( $_POST['product_id'] );
-		$qty = ! isset( $_POST['qty'] ) ? 1 : absint( $_POST['qty'] );
+		$product_id = absint($_POST['product_id']);
+		$qty = ! isset($_POST['qty']) ? 1 : absint($_POST['qty']);
 
-		$product = wc_get_product( $product_id );
+		$product = wc_get_product($product_id);
 
-		if ( 'variable' === ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ) && isset( $_POST['attributes'] ) ) {
-			$attributes = array_map( 'wc_clean', $_POST['attributes'] );
+		if ('variable' === (WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type()) && isset($_POST['attributes'])) {
+			$attributes = array_map('wc_clean', $_POST['attributes']);
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				$variation_id = $product->get_matching_variation( $attributes );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				$variation_id = $product->get_matching_variation($attributes);
 			} else {
-				$data_store = WC_Data_Store::load( 'product' );
-				$variation_id = $data_store->find_matching_product_variation( $product, $attributes );
+				$data_store = WC_Data_Store::load('product');
+				$variation_id = $data_store->find_matching_product_variation($product, $attributes);
 			}
 
-			if ( ! empty( $variation_id ) ) {
-				$product = wc_get_product( $variation_id );
+			if ( ! empty($variation_id)) {
+				$product = wc_get_product($variation_id);
 			}
-		} elseif ( 'simple' === ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ) ) {
-			$product = wc_get_product( $product_id );
+		} elseif ('simple' === (WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type())) {
+			$product = wc_get_product($product_id);
 		}
 
-		$total = $qty * ( WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price() );
+		$total = $qty * (WC_Stripe_Helper::is_pre_30() ? $product->price : $product->get_price());
 
 		$quantity_label = 1 < $qty ? ' (x' . $qty . ')' : '';
 
@@ -772,28 +772,28 @@ 
 		$items = array();
 
 		$items[] = array(
-			'label'  => ( WC_Stripe_Helper::is_pre_30() ? $product->name : $product->get_name() ) . $quantity_label,
-			'amount' => WC_Stripe_Helper::get_stripe_amount( $total ),
+			'label'  => (WC_Stripe_Helper::is_pre_30() ? $product->name : $product->get_name()) . $quantity_label,
+			'amount' => WC_Stripe_Helper::get_stripe_amount($total),
 		);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
-				'label'   => __( 'Tax', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Tax', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 		}
 
-		if ( wc_shipping_enabled() && $product->needs_shipping() ) {
+		if (wc_shipping_enabled() && $product->needs_shipping()) {
 			$items[] = array(
-				'label'   => __( 'Shipping', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Shipping', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 
-			$data['shippingOptions']  = array(
+			$data['shippingOptions'] = array(
 				'id'     => 'pending',
-				'label'  => __( 'Pending', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Pending', 'woocommerce-gateway-stripe'),
 				'detail' => '',
 				'amount' => 0,
 			);
@@ -802,15 +802,15 @@ 
 		$data['displayItems'] = $items;
 		$data['total'] = array(
 			'label'   => $this->total_label,
-			'amount'  => WC_Stripe_Helper::get_stripe_amount( $total ),
+			'amount'  => WC_Stripe_Helper::get_stripe_amount($total),
 			'pending' => true,
 		);
 
-		$data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() );
-		$data['currency']        = strtolower( get_woocommerce_currency() );
-		$data['country_code']    = substr( get_option( 'woocommerce_default_country' ), 0, 2 );
+		$data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping());
+		$data['currency']        = strtolower(get_woocommerce_currency());
+		$data['country_code']    = substr(get_option('woocommerce_default_country'), 0, 2);
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -821,37 +821,37 @@ 
 	 * @return array $data
 	 */
 	public function ajax_add_to_cart() {
-		check_ajax_referer( 'wc-stripe-add-to-cart', 'security' );
+		check_ajax_referer('wc-stripe-add-to-cart', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		WC()->shipping->reset_shipping();
 
-		$product_id = absint( $_POST['product_id'] );
-		$qty = ! isset( $_POST['qty'] ) ? 1 : absint( $_POST['qty'] );
+		$product_id = absint($_POST['product_id']);
+		$qty = ! isset($_POST['qty']) ? 1 : absint($_POST['qty']);
 
-		$product = wc_get_product( $product_id );
+		$product = wc_get_product($product_id);
 
 		// First empty the cart to prevent wrong calculation.
 		WC()->cart->empty_cart();
 
-		if ( 'variable' === ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ) && isset( $_POST['attributes'] ) ) {
-			$attributes = array_map( 'wc_clean', $_POST['attributes'] );
+		if ('variable' === (WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type()) && isset($_POST['attributes'])) {
+			$attributes = array_map('wc_clean', $_POST['attributes']);
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				$variation_id = $product->get_matching_variation( $attributes );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				$variation_id = $product->get_matching_variation($attributes);
 			} else {
-				$data_store = WC_Data_Store::load( 'product' );
-				$variation_id = $data_store->find_matching_product_variation( $product, $attributes );
+				$data_store = WC_Data_Store::load('product');
+				$variation_id = $data_store->find_matching_product_variation($product, $attributes);
 			}
 
-			WC()->cart->add_to_cart( $product->get_id(), $qty, $variation_id, $attributes );
+			WC()->cart->add_to_cart($product->get_id(), $qty, $variation_id, $attributes);
 		}
 
-		if ( 'simple' === ( WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type() ) ) {
-			WC()->cart->add_to_cart( $product->get_id(), $qty );
+		if ('simple' === (WC_Stripe_Helper::is_pre_30() ? $product->product_type : $product->get_type())) {
+			WC()->cart->add_to_cart($product->get_id(), $qty);
 		}
 
 		WC()->cart->calculate_totals();
@@ -860,7 +860,7 @@ 
 		$data += $this->build_display_items();
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -873,31 +873,31 @@ 
 	 * @version 4.0.0
 	 */
 	public function normalize_state() {
-		$billing_country  = ! empty( $_POST['billing_country'] ) ? wc_clean( $_POST['billing_country'] ) : '';
-		$shipping_country = ! empty( $_POST['shipping_country'] ) ? wc_clean( $_POST['shipping_country'] ) : '';
-		$billing_state    = ! empty( $_POST['billing_state'] ) ? wc_clean( $_POST['billing_state'] ) : '';
-		$shipping_state   = ! empty( $_POST['shipping_state'] ) ? wc_clean( $_POST['shipping_state'] ) : '';
+		$billing_country  = ! empty($_POST['billing_country']) ? wc_clean($_POST['billing_country']) : '';
+		$shipping_country = ! empty($_POST['shipping_country']) ? wc_clean($_POST['shipping_country']) : '';
+		$billing_state    = ! empty($_POST['billing_state']) ? wc_clean($_POST['billing_state']) : '';
+		$shipping_state   = ! empty($_POST['shipping_state']) ? wc_clean($_POST['shipping_state']) : '';
 
-		if ( $billing_state && $billing_country ) {
-			$valid_states = WC()->countries->get_states( $billing_country );
+		if ($billing_state && $billing_country) {
+			$valid_states = WC()->countries->get_states($billing_country);
 
 			// Valid states found for country.
-			if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
-				foreach ( $valid_states as $state_abbr => $state ) {
-					if ( preg_match( '/' . preg_quote( $state ) . '/i', $billing_state ) ) {
+			if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) {
+				foreach ($valid_states as $state_abbr => $state) {
+					if (preg_match('/' . preg_quote($state) . '/i', $billing_state)) {
 						$_POST['billing_state'] = $state_abbr;
 					}
 				}
 			}
 		}
 
-		if ( $shipping_state && $shipping_country ) {
-			$valid_states = WC()->countries->get_states( $shipping_country );
+		if ($shipping_state && $shipping_country) {
+			$valid_states = WC()->countries->get_states($shipping_country);
 
 			// Valid states found for country.
-			if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
-				foreach ( $valid_states as $state_abbr => $state ) {
-					if ( preg_match( '/' . preg_quote( $state ) . '/i', $shipping_state ) ) {
+			if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) {
+				foreach ($valid_states as $state_abbr => $state) {
+					if (preg_match('/' . preg_quote($state) . '/i', $shipping_state)) {
 						$_POST['shipping_state'] = $state_abbr;
 					}
 				}
@@ -912,19 +912,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_create_order() {
-		if ( WC()->cart->is_empty() ) {
-			wp_send_json_error( __( 'Empty cart', 'woocommerce-gateway-stripe' ) );
+		if (WC()->cart->is_empty()) {
+			wp_send_json_error(__('Empty cart', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
+		if ( ! defined('WOOCOMMERCE_CHECKOUT')) {
+			define('WOOCOMMERCE_CHECKOUT', true);
 		}
 
 		$this->normalize_state();
 
 		WC()->checkout()->process_checkout();
 
-		die( 0 );
+		die(0);
 	}
 
 	/**
@@ -934,7 +934,7 @@ 
 	 * @version 4.0.0
 	 * @param array $address
 	 */
-	protected function calculate_shipping( $address = array() ) {
+	protected function calculate_shipping($address = array()) {
 		global $states;
 
 		$country   = $address['country'];
@@ -951,28 +951,28 @@ 
 		 * In some versions of Chrome, state can be a full name. So we need
 		 * to convert that to abbreviation as WC is expecting that.
 		 */
-		if ( 2 < strlen( $state ) ) {
-			$state = array_search( ucfirst( strtolower( $state ) ), $states[ $country ] );
+		if (2 < strlen($state)) {
+			$state = array_search(ucfirst(strtolower($state)), $states[$country]);
 		}
 
 		WC()->shipping->reset_shipping();
 
-		if ( $postcode && WC_Validation::is_postcode( $postcode, $country ) ) {
-			$postcode = wc_format_postcode( $postcode, $country );
+		if ($postcode && WC_Validation::is_postcode($postcode, $country)) {
+			$postcode = wc_format_postcode($postcode, $country);
 		}
 
-		if ( $country ) {
-			WC()->customer->set_location( $country, $state, $postcode, $city );
-			WC()->customer->set_shipping_location( $country, $state, $postcode, $city );
+		if ($country) {
+			WC()->customer->set_location($country, $state, $postcode, $city);
+			WC()->customer->set_shipping_location($country, $state, $postcode, $city);
 		} else {
 			WC_Stripe_Helper::is_pre_30() ? WC()->customer->set_to_base() : WC()->customer->set_billing_address_to_base();
 			WC_Stripe_Helper::is_pre_30() ? WC()->customer->set_shipping_to_base() : WC()->customer->set_shipping_address_to_base();
 		}
 
-		if ( WC_Stripe_Helper::is_pre_30() ) {
-			WC()->customer->calculated_shipping( true );
+		if (WC_Stripe_Helper::is_pre_30()) {
+			WC()->customer->calculated_shipping(true);
 		} else {
-			WC()->customer->set_calculated_shipping( true );
+			WC()->customer->set_calculated_shipping(true);
 			WC()->customer->save();
 		}
 
@@ -989,17 +989,17 @@ 
 		$packages[0]['destination']['address']   = $address_1;
 		$packages[0]['destination']['address_2'] = $address_2;
 
-		foreach ( WC()->cart->get_cart() as $item ) {
-			if ( $item['data']->needs_shipping() ) {
-				if ( isset( $item['line_total'] ) ) {
+		foreach (WC()->cart->get_cart() as $item) {
+			if ($item['data']->needs_shipping()) {
+				if (isset($item['line_total'])) {
 					$packages[0]['contents_cost'] += $item['line_total'];
 				}
 			}
 		}
 
-		$packages = apply_filters( 'woocommerce_cart_shipping_packages', $packages );
+		$packages = apply_filters('woocommerce_cart_shipping_packages', $packages);
 
-		WC()->shipping->calculate_shipping( $packages );
+		WC()->shipping->calculate_shipping($packages);
 	}
 
 	/**
@@ -1008,19 +1008,19 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	protected function build_shipping_methods( $shipping_methods ) {
-		if ( empty( $shipping_methods ) ) {
+	protected function build_shipping_methods($shipping_methods) {
+		if (empty($shipping_methods)) {
 			return array();
 		}
 
 		$shipping = array();
 
-		foreach ( $shipping_methods as $method ) {
+		foreach ($shipping_methods as $method) {
 			$shipping[] = array(
 				'id'         => $method['id'],
 				'label'      => $method['label'],
 				'detail'     => '',
-				'amount'     => WC_Stripe_Helper::get_stripe_amount( $method['amount']['value'] ),
+				'amount'     => WC_Stripe_Helper::get_stripe_amount($method['amount']['value']),
 			);
 		}
 
@@ -1034,69 +1034,69 @@ 
 	 * @version 4.0.0
 	 */
 	protected function build_display_items() {
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		$items    = array();
 		$subtotal = 0;
 
 		// Default show only subtotal instead of itemization.
-		if ( ! apply_filters( 'wc_stripe_payment_request_hide_itemization', true ) ) {
-			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+		if ( ! apply_filters('wc_stripe_payment_request_hide_itemization', true)) {
+			foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) {
 				$amount         = $cart_item['line_subtotal'];
-				$subtotal       += $cart_item['line_subtotal'];
+				$subtotal += $cart_item['line_subtotal'];
 				$quantity_label = 1 < $cart_item['quantity'] ? ' (x' . $cart_item['quantity'] . ')' : '';
 
 				$product_name = WC_Stripe_Helper::is_pre_30() ? $cart_item['data']->post->post_title : $cart_item['data']->get_name();
 
 				$item = array(
 					'label'  => $product_name . $quantity_label,
-					'amount' => WC_Stripe_Helper::get_stripe_amount( $amount ),
+					'amount' => WC_Stripe_Helper::get_stripe_amount($amount),
 				);
 
 				$items[] = $item;
 			}
 		}
 
-		$discounts   = wc_format_decimal( WC()->cart->get_cart_discount_total(), WC()->cart->dp );
-		$tax         = wc_format_decimal( WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp );
-		$shipping    = wc_format_decimal( WC()->cart->shipping_total, WC()->cart->dp );
-		$items_total = wc_format_decimal( WC()->cart->cart_contents_total, WC()->cart->dp ) + $discounts;
-		$order_total = wc_format_decimal( $items_total + $tax + $shipping - $discounts, WC()->cart->dp );
+		$discounts   = wc_format_decimal(WC()->cart->get_cart_discount_total(), WC()->cart->dp);
+		$tax         = wc_format_decimal(WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp);
+		$shipping    = wc_format_decimal(WC()->cart->shipping_total, WC()->cart->dp);
+		$items_total = wc_format_decimal(WC()->cart->cart_contents_total, WC()->cart->dp) + $discounts;
+		$order_total = wc_format_decimal($items_total + $tax + $shipping - $discounts, WC()->cart->dp);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Tax', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $tax ),
+				'label'  => esc_html(__('Tax', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($tax),
 			);
 		}
 
-		if ( WC()->cart->needs_shipping() ) {
+		if (WC()->cart->needs_shipping()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Shipping', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $shipping ),
+				'label'  => esc_html(__('Shipping', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($shipping),
 			);
 		}
 
-		if ( WC()->cart->has_discount() ) {
+		if (WC()->cart->has_discount()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Discount', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $discounts ),
+				'label'  => esc_html(__('Discount', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($discounts),
 			);
 		}
 
-		if ( version_compare( WC_VERSION, '3.2', '<' ) ) {
+		if (version_compare(WC_VERSION, '3.2', '<')) {
 			$cart_fees = WC()->cart->fees;
 		} else {
 			$cart_fees = WC()->cart->get_fees();
 		}
 
 		// Include fees and taxes as display items.
-		foreach ( $cart_fees as $key => $fee ) {
+		foreach ($cart_fees as $key => $fee) {
 			$items[] = array(
 				'label'  => $fee->name,
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $fee->amount ),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($fee->amount),
 			);
 		}
 
@@ -1104,7 +1104,7 @@ 
 			'displayItems' => $items,
 			'total'      => array(
 				'label'   => $this->total_label,
-				'amount'  => max( 0, apply_filters( 'woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount( $order_total ), $order_total, WC()->cart ) ),
+				'amount'  => max(0, apply_filters('woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount($order_total), $order_total, WC()->cart)),
 				'pending' => false,
 			),
 		);

includes/class-wc-stripe-apple-pay-registration.php

Spacing +45 added lines, -45 removed lines

@@ -5,7 +5,7 @@ 
  * @since 4.0.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -60,16 +60,16 @@ 
 	public $apple_pay_verify_notice;
 
 	public function __construct() {
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
-		$this->stripe_enabled          = $this->get_option( 'enabled' );
-		$this->payment_request         = 'yes' === $this->get_option( 'payment_request', 'yes' );
-		$this->apple_pay_domain_set    = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' );
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
+		$this->stripe_enabled          = $this->get_option('enabled');
+		$this->payment_request         = 'yes' === $this->get_option('payment_request', 'yes');
+		$this->apple_pay_domain_set    = 'yes' === $this->get_option('apple_pay_domain_set', 'no');
 		$this->apple_pay_verify_notice = '';
-		$this->testmode                = 'yes' === $this->get_option( 'testmode', 'no' );
-		$this->secret_key              = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
+		$this->testmode                = 'yes' === $this->get_option('testmode', 'no');
+		$this->secret_key              = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
 		$this->init_apple_pay();
 
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
 	}
 
 	/**
@@ -80,13 +80,13 @@ 
 	 * @param string default
 	 * @return string $setting_value
 	 */
-	public function get_option( $setting = '', $default = '' ) {
-		if ( empty( $this->stripe_settings ) ) {
+	public function get_option($setting = '', $default = '') {
+		if (empty($this->stripe_settings)) {
 			return $default;
 		}
 
-		if ( ! empty( $this->stripe_settings[ $setting ] ) ) {
-			return $this->stripe_settings[ $setting ];
+		if ( ! empty($this->stripe_settings[$setting])) {
+			return $this->stripe_settings[$setting];
 		}
 
 		return $default;
@@ -101,9 +101,9 @@ 
 	public function init_apple_pay() {
 		if (
 			is_admin() &&
-			isset( $_GET['page'] ) && 'wc-settings' === $_GET['page'] &&
-			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
-			isset( $_GET['section'] ) && 'stripe' === $_GET['section'] &&
+			isset($_GET['page']) && 'wc-settings' === $_GET['page'] &&
+			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
+			isset($_GET['section']) && 'stripe' === $_GET['section'] &&
 			$this->payment_request
 		) {
 			$this->process_apple_pay_verification();
@@ -117,9 +117,9 @@ 
 	 * @version 3.1.0
 	 * @param string $secret_key
 	 */
-	private function register_apple_pay_domain( $secret_key = '' ) {
-		if ( empty( $secret_key ) ) {
-			throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) );
+	private function register_apple_pay_domain($secret_key = '') {
+		if (empty($secret_key)) {
+			throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe'));
 		}
 
 		$endpoint = 'https://api.stripe.com/v1/apple_pay/domains';
@@ -133,23 +133,23 @@ 
 			'Authorization' => 'Bearer ' . $secret_key,
 		);
 
-		$response = wp_remote_post( $endpoint, array(
+		$response = wp_remote_post($endpoint, array(
 			'headers' => $headers,
-			'body'    => http_build_query( $data ),
-		) );
+			'body'    => http_build_query($data),
+		));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message()));
 		}
 
-		if ( 200 !== $response['response']['code'] ) {
-			$parsed_response = json_decode( $response['body'] );
+		if (200 !== $response['response']['code']) {
+			$parsed_response = json_decode($response['body']);
 
 			$this->apple_pay_verify_notice = $parsed_response->error->message;
 
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message));
 		}
 	}
 
@@ -161,45 +161,45 @@ 
 	 */
 	public function process_apple_pay_verification() {
 		try {
-			$path     = untrailingslashit( $_SERVER['DOCUMENT_ROOT'] );
+			$path     = untrailingslashit($_SERVER['DOCUMENT_ROOT']);
 			$dir      = '.well-known';
 			$file     = 'apple-developer-merchantid-domain-association';
 			$fullpath = $path . '/' . $dir . '/' . $file;
 
-			if ( $this->apple_pay_domain_set && file_exists( $fullpath ) ) {
+			if ($this->apple_pay_domain_set && file_exists($fullpath)) {
 				return;
 			}
 
-			if ( ! file_exists( $path . '/' . $dir ) ) {
-				if ( ! @mkdir( $path . '/' . $dir, 0755 ) ) { // @codingStandardsIgnoreLine
-					throw new Exception( __( 'Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($path . '/' . $dir)) {
+				if ( ! @mkdir($path . '/' . $dir, 0755)) { // @codingStandardsIgnoreLine
+					throw new Exception(__('Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
-			if ( ! file_exists( $fullpath ) ) {
-				if ( ! @copy( WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath ) ) { // @codingStandardsIgnoreLine
-					throw new Exception( __( 'Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($fullpath)) {
+				if ( ! @copy(WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath)) { // @codingStandardsIgnoreLine
+					throw new Exception(__('Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
 			// At this point then the domain association folder and file should be available.
 			// Proceed to verify/and or verify again.
-			$this->register_apple_pay_domain( $this->secret_key );
+			$this->register_apple_pay_domain($this->secret_key);
 
 			// No errors to this point, verification success!
 			$this->stripe_settings['apple_pay_domain_set'] = 'yes';
 			$this->apple_pay_domain_set = true;
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Your domain has been verified with Apple Pay!' );
+			WC_Stripe_Logger::log('Your domain has been verified with Apple Pay!');
 
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->stripe_settings['apple_pay_domain_set'] = 'no';
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 		}
 	}
 
@@ -209,11 +209,11 @@ 
 	 * @since 4.0.6
 	 */
 	public function admin_notices() {
-		if ( ! $this->stripe_enabled ) {
+		if ( ! $this->stripe_enabled) {
 			return;
 		}
 
-		if ( $this->payment_request && ! empty( $this->apple_pay_verify_notice ) ) {
+		if ($this->payment_request && ! empty($this->apple_pay_verify_notice)) {
 			$allowed_html = array(
 				'a' => array(
 					'href' => array(),
@@ -221,7 +221,7 @@ 
 				),
 			);
 
-			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses( make_clickable( $this->apple_pay_verify_notice ), $allowed_html ) . '</p></div>';
+			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses(make_clickable($this->apple_pay_verify_notice), $allowed_html) . '</p></div>';
 		}
 
 		/**
@@ -229,9 +229,9 @@ 
 		 * when setting screen is displayed. So if domain verification is not set,
 		 * something went wrong so lets notify user.
 		 */
-		if ( ! empty( $this->secret_key ) && $this->payment_request && ! $this->apple_pay_domain_set ) {
+		if ( ! empty($this->secret_key) && $this->payment_request && ! $this->apple_pay_domain_set) {
 			/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
-			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf( __( 'Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe' ), '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', '</a>' ) . '</p></div>';
+			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf(__('Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe'), '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', '</a>') . '</p></div>';
 		}
 	}
 }

includes/class-wc-gateway-stripe.php

Spacing +175 added lines, -175 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -101,9 +101,9 @@ 
 	public function __construct() {
 		$this->retry_interval       = 2;
 		$this->id                   = 'stripe';
-		$this->method_title         = __( 'Stripe', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe', 'woocommerce-gateway-stripe');
 		/* translators: 1) link to Stripe register page 2) link to Stripe api keys page */
-		$this->method_description   = sprintf( __( 'Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys' );
+		$this->method_description   = sprintf(__('Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys');
 		$this->has_fields           = true;
 		$this->supports             = array(
 			'products',
@@ -130,32 +130,32 @@ 
 		$this->init_settings();
 
 		// Get setting values.
-		$this->title                   = $this->get_option( 'title' );
-		$this->description             = $this->get_option( 'description' );
-		$this->enabled                 = $this->get_option( 'enabled' );
-		$this->testmode                = 'yes' === $this->get_option( 'testmode' );
-		$this->inline_cc_form          = 'yes' === $this->get_option( 'inline_cc_form' );
-		$this->capture                 = 'yes' === $this->get_option( 'capture', 'yes' );
-		$this->statement_descriptor    = WC_Stripe_Helper::clean_statement_descriptor( $this->get_option( 'statement_descriptor' ) );
-		$this->three_d_secure          = 'yes' === $this->get_option( 'three_d_secure' );
-		$this->stripe_checkout         = 'yes' === $this->get_option( 'stripe_checkout' );
-		$this->stripe_checkout_image   = $this->get_option( 'stripe_checkout_image', '' );
-		$this->saved_cards             = 'yes' === $this->get_option( 'saved_cards' );
-		$this->secret_key              = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
-		$this->publishable_key         = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' );
-		$this->bitcoin                 = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' );
-		$this->payment_request         = 'yes' === $this->get_option( 'payment_request', 'yes' );
-
-		if ( $this->stripe_checkout ) {
-			$this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' );
+		$this->title                   = $this->get_option('title');
+		$this->description             = $this->get_option('description');
+		$this->enabled                 = $this->get_option('enabled');
+		$this->testmode                = 'yes' === $this->get_option('testmode');
+		$this->inline_cc_form          = 'yes' === $this->get_option('inline_cc_form');
+		$this->capture                 = 'yes' === $this->get_option('capture', 'yes');
+		$this->statement_descriptor    = WC_Stripe_Helper::clean_statement_descriptor($this->get_option('statement_descriptor'));
+		$this->three_d_secure          = 'yes' === $this->get_option('three_d_secure');
+		$this->stripe_checkout         = 'yes' === $this->get_option('stripe_checkout');
+		$this->stripe_checkout_image   = $this->get_option('stripe_checkout_image', '');
+		$this->saved_cards             = 'yes' === $this->get_option('saved_cards');
+		$this->secret_key              = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
+		$this->publishable_key         = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key');
+		$this->bitcoin                 = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin');
+		$this->payment_request         = 'yes' === $this->get_option('payment_request', 'yes');
+
+		if ($this->stripe_checkout) {
+			$this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe');
 		}
 
-		WC_Stripe_API::set_secret_key( $this->secret_key );
+		WC_Stripe_API::set_secret_key($this->secret_key);
 
 		// Hooks.
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) );
-		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('admin_enqueue_scripts', array($this, 'admin_scripts'));
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 * @since 4.0.2
 	 */
 	public function is_available() {
-		if ( is_add_payment_method_page() && ! $this->saved_cards ) {
+		if (is_add_payment_method_page() && ! $this->saved_cards) {
 			return false;
 		}
 
@@ -187,24 +187,24 @@ 
 		$icons_str .= $icons['amex'];
 		$icons_str .= $icons['mastercard'];
 
-		if ( 'USD' === get_woocommerce_currency() ) {
+		if ('USD' === get_woocommerce_currency()) {
 			$icons_str .= $icons['discover'];
 			$icons_str .= $icons['jcb'];
 			$icons_str .= $icons['diners'];
 		}
 
-		if ( $this->bitcoin && $this->stripe_checkout ) {
+		if ($this->bitcoin && $this->stripe_checkout) {
 			$icons_str .= $icons['bitcoin'];
 		}
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( dirname( __FILE__ ) . '/admin/stripe-settings.php' );
+		$this->form_fields = require(dirname(__FILE__) . '/admin/stripe-settings.php');
 	}
 
 	/**
@@ -212,68 +212,68 @@ 
 	 */
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 		$total                = WC()->cart->total;
 		$user_email           = '';
 
 		// 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();
 			$user_email = WC_Stripe_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
 		} else {
-			if ( $user->ID ) {
-				$user_email = get_user_meta( $user->ID, 'billing_email', true );
+			if ($user->ID) {
+				$user_email = get_user_meta($user->ID, 'billing_email', true);
 				$user_email = $user_email ? $user_email : $user->user_email;
 			}
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Card', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Card', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-payment-data"
-			data-panel-label="' . esc_attr( $pay_button_text ) . '"
+			data-panel-label="' . esc_attr($pay_button_text) . '"
 			data-description=""
-			data-email="' . esc_attr( $user_email ) . '"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-name="' . esc_attr( $this->statement_descriptor ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '"
-			data-image="' . esc_attr( $this->stripe_checkout_image ) . '"
-			data-bitcoin="' . esc_attr( ( $this->bitcoin && $this->capture ) ? 'true' : 'false' ) . '"
-			data-locale="' . esc_attr( apply_filters( 'wc_stripe_checkout_locale', $this->get_locale() ) ) . '"
-			data-three-d-secure="' . esc_attr( $this->three_d_secure ? 'true' : 'false' ) . '"
-			data-allow-remember-me="' . esc_attr( $this->saved_cards ? 'true' : 'false' ) . '">';
-
-		if ( $this->description ) {
-			if ( $this->testmode ) {
+			data-email="' . esc_attr($user_email) . '"
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-name="' . esc_attr($this->statement_descriptor) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '"
+			data-image="' . esc_attr($this->stripe_checkout_image) . '"
+			data-bitcoin="' . esc_attr(($this->bitcoin && $this->capture) ? 'true' : 'false') . '"
+			data-locale="' . esc_attr(apply_filters('wc_stripe_checkout_locale', $this->get_locale())) . '"
+			data-three-d-secure="' . esc_attr($this->three_d_secure ? 'true' : 'false') . '"
+			data-allow-remember-me="' . esc_attr($this->saved_cards ? 'true' : 'false') . '">';
+
+		if ($this->description) {
+			if ($this->testmode) {
 				/* translators: link to Stripe testing page */
-				$this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s" target="_blank">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' );
-				$this->description  = trim( $this->description );
+				$this->description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s" target="_blank">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing');
+				$this->description  = trim($this->description);
 			}
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
-		if ( ! $this->stripe_checkout ) {
-			if ( apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ) {
+		if ( ! $this->stripe_checkout) {
+			if (apply_filters('wc_stripe_use_elements_checkout_form', true)) {
 				$this->elements_form();
 			} else {
-				WC_Stripe_Logger::log( 'DEPRECATED! Since version 4.0. Stripe Elements is used. This legacy credit card form will be removed by version 4.1!' );
+				WC_Stripe_Logger::log('DEPRECATED! Since version 4.0. Stripe Elements is used. This legacy credit card form will be removed by version 4.1!');
 				$this->form();
 				echo '<div class="stripe-source-errors" role="alert"></div>';
 			}
 		}
 
-		if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			$this->save_payment_method_checkbox();
 		}
 
@@ -288,12 +288,12 @@ 
 	 */
 	public function elements_form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 
-			<?php if ( $this->inline_cc_form ) { ?>
+			<?php if ($this->inline_cc_form) { ?>
 				<label for="card-element">
-					<?php esc_html_e( 'Credit or debit card', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('Credit or debit card', 'woocommerce-gateway-stripe'); ?>
 				</label>
 
 				<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
@@ -301,7 +301,7 @@ 
 				</div>
 			<?php } else { ?>
 				<div class="form-row form-row-wide">
-					<label><?php _e( 'Card Number', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Card Number', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 
 					<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 					<!-- a Stripe Element will be inserted here. -->
@@ -309,7 +309,7 @@ 
 				</div>
 
 				<div class="form-row form-row-first">
-					<label><?php _e( 'Expiry Date', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Expiry Date', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 
 					<div id="stripe-exp-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 					<!-- a Stripe Element will be inserted here. -->
@@ -317,7 +317,7 @@ 
 				</div>
 
 				<div class="form-row form-row-last">
-					<label><?php _e( 'Card Code (CVC)', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Card Code (CVC)', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 				<div id="stripe-cvc-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 				<!-- a Stripe Element will be inserted here. -->
 				</div>
@@ -327,7 +327,7 @@ 
 
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -340,13 +340,13 @@ 
 	 * @version 3.1.0
 	 */
 	public function admin_scripts() {
-		if ( 'woocommerce_page_wc-settings' !== get_current_screen()->id ) {
+		if ('woocommerce_page_wc-settings' !== get_current_screen()->id) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_script( 'woocommerce_stripe_admin', plugins_url( 'assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION, true );
+		wp_enqueue_script('woocommerce_stripe_admin', plugins_url('assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION, true);
 	}
 
 	/**
@@ -358,33 +358,33 @@ 
 	 * @version 4.0.0
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			return;
 		}
 
-		if ( 'no' === $this->enabled ) {
+		if ('no' === $this->enabled) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_register_style( 'stripe_paymentfonts', plugins_url( 'assets/css/stripe-paymentfonts.css', WC_STRIPE_MAIN_FILE ), array(), '1.2.5' );
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_register_script( 'stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true );
-		wp_register_script( 'stripev2', 'https://js.stripe.com/v2/', '', '2.0', true );
-		wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true );
-		wp_register_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripev2', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_register_style('stripe_paymentfonts', plugins_url('assets/css/stripe-paymentfonts.css', WC_STRIPE_MAIN_FILE), array(), '1.2.5');
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_register_script('stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true);
+		wp_register_script('stripev2', 'https://js.stripe.com/v2/', '', '2.0', true);
+		wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true);
+		wp_register_script('woocommerce_stripe', plugins_url('assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripev2', 'stripe'), WC_STRIPE_VERSION, true);
 
 		$stripe_params = array(
 			'key'                  => $this->publishable_key,
-			'i18n_terms'           => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ),
-			'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ),
+			'i18n_terms'           => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'),
+			'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'),
 		);
 
 		// If we're on the pay page we need to pass stripe.js the address of the order.
-		if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) {
-			$order_id = wc_get_order_id_by_order_key( urldecode( $_GET['key'] ) );
-			$order    = wc_get_order( $order_id );
+		if (isset($_GET['pay_for_order']) && 'true' === $_GET['pay_for_order']) {
+			$order_id = wc_get_order_id_by_order_key(urldecode($_GET['key']));
+			$order    = wc_get_order($order_id);
 
 			$stripe_params['billing_first_name'] = WC_Stripe_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
 			$stripe_params['billing_last_name']  = WC_Stripe_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
@@ -396,38 +396,38 @@ 
 			$stripe_params['billing_country']    = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
 		}
 
-		$stripe_params['no_prepaid_card_msg']                     = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_owner_msg']                       = __( 'Please enter your IBAN account name.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_iban_msg']                        = __( 'Please enter your IBAN account number.', 'woocommerce-gateway-stripe' );
-		$stripe_params['sepa_mandate_notification']               = apply_filters( 'wc_stripe_sepa_mandate_notification', 'email' );
-		$stripe_params['allow_prepaid_card']                      = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no';
+		$stripe_params['no_prepaid_card_msg']                     = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_owner_msg']                       = __('Please enter your IBAN account name.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_iban_msg']                        = __('Please enter your IBAN account number.', 'woocommerce-gateway-stripe');
+		$stripe_params['sepa_mandate_notification']               = apply_filters('wc_stripe_sepa_mandate_notification', 'email');
+		$stripe_params['allow_prepaid_card']                      = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no';
 		$stripe_params['inline_cc_form']                          = $this->inline_cc_form ? 'yes' : 'no';
-		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'yes' : 'no';
-		$stripe_params['is_checkout']                             = ( is_checkout() && empty( $_GET['pay_for_order'] ) );
+		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'yes' : 'no';
+		$stripe_params['is_checkout']                             = (is_checkout() && empty($_GET['pay_for_order']));
 		$stripe_params['return_url']                              = $this->get_stripe_return_url();
-		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint( '%%endpoint%%' );
-		$stripe_params['stripe_nonce']                            = wp_create_nonce( '_wc_stripe_nonce' );
+		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint('%%endpoint%%');
+		$stripe_params['stripe_nonce']                            = wp_create_nonce('_wc_stripe_nonce');
 		$stripe_params['statement_descriptor']                    = $this->statement_descriptor;
-		$stripe_params['use_elements']                            = apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ? 'yes' : 'no';
-		$stripe_params['elements_options']                        = apply_filters( 'wc_stripe_elements_options', array() );
+		$stripe_params['use_elements']                            = apply_filters('wc_stripe_use_elements_checkout_form', true) ? 'yes' : 'no';
+		$stripe_params['elements_options']                        = apply_filters('wc_stripe_elements_options', array());
 		$stripe_params['is_stripe_checkout']                      = $this->stripe_checkout ? 'yes' : 'no';
-		$stripe_params['is_change_payment_page']                  = isset( $_GET['change_payment_method'] ) ? 'yes' : 'no';
-		$stripe_params['validate_modal_checkout']                 = apply_filters( 'wc_stripe_validate_model_checkout', true ) ? 'yes' : 'no';
-		$stripe_params['elements_styling']                        = apply_filters( 'wc_stripe_elements_styling', false );
-		$stripe_params['elements_classes']                        = apply_filters( 'wc_stripe_elements_classes', false );
+		$stripe_params['is_change_payment_page']                  = isset($_GET['change_payment_method']) ? 'yes' : 'no';
+		$stripe_params['validate_modal_checkout']                 = apply_filters('wc_stripe_validate_model_checkout', true) ? 'yes' : 'no';
+		$stripe_params['elements_styling']                        = apply_filters('wc_stripe_elements_styling', false);
+		$stripe_params['elements_classes']                        = apply_filters('wc_stripe_elements_classes', false);
 
 		// merge localized messages to be use in JS
-		$stripe_params = array_merge( $stripe_params, WC_Stripe_Helper::get_localized_messages() );
+		$stripe_params = array_merge($stripe_params, WC_Stripe_Helper::get_localized_messages());
 
-		wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
-		wp_localize_script( 'woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
+		wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
+		wp_localize_script('woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
 
-		if ( $this->stripe_checkout ) {
-			wp_enqueue_script( 'stripe_checkout' );
+		if ($this->stripe_checkout) {
+			wp_enqueue_script('stripe_checkout');
 		}
 
 		$this->tokenization_script();
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
@@ -443,43 +443,43 @@ 
 	 *
 	 * @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 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 ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
 			$source_object   = $this->get_source_object();
-			$prepared_source = $this->prepare_source( $source_object, get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source($source_object, get_current_user_id(), $force_save_source);
 
 			// Check if we don't allow prepaid credit cards.
-			if ( ! apply_filters( 'wc_stripe_allow_prepaid_card', true ) ) {
-				if ( $source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding ) {
-					$localized_message = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-					throw new WC_Stripe_Exception( print_r( $source_object, true ), $localized_message );
+			if ( ! apply_filters('wc_stripe_allow_prepaid_card', true)) {
+				if ($source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding) {
+					$localized_message = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+					throw new WC_Stripe_Exception(print_r($source_object, true), $localized_message);
 				}
 			}
 
-			if ( empty( $prepared_source->source ) ) {
-				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new WC_Stripe_Exception( print_r( $prepared_source, true ), $localized_message );
+			if (empty($prepared_source->source)) {
+				$localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new WC_Stripe_Exception(print_r($prepared_source, true), $localized_message);
 			}
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
 				/*
 				 * Check if card 3DS is required or optional with 3DS setting.
@@ -488,109 +488,109 @@ 
 				 * Note that if we need to save source, the original source must be first
 				 * attached to a customer in Stripe before it can be charged.
 				 */
-				if ( $this->is_3ds_required( $source_object ) ) {
-					$response = $this->create_3ds_source( $order, $source_object );
+				if ($this->is_3ds_required($source_object)) {
+					$response = $this->create_3ds_source($order, $source_object);
 
-					if ( ! empty( $response->error ) ) {
+					if ( ! empty($response->error)) {
 						$localized_message = $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);
 					}
 
 					// Update order meta with 3DS source.
-					if ( WC_Stripe_Helper::is_pre_30() ) {
-						update_post_meta( $order_id, '_stripe_source_id', $response->id );
+					if (WC_Stripe_Helper::is_pre_30()) {
+						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 3DS...' );
+					WC_Stripe_Logger::log('Info: Redirecting to 3DS...');
 
 					return array(
 						'result'   => 'success',
-						'redirect' => esc_url_raw( $response->redirect->url ),
+						'redirect' => esc_url_raw($response->redirect->url),
 					);
 				}
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// If it is an API error such connection or server, let's retry.
-					if ( 'api_connection_error' === $response->error->type || 'api_error' === $response->error->type ) {
-						if ( $retry ) {
-							sleep( 5 );
-							return $this->process_payment( $order_id, false, $force_save_source );
+					if ('api_connection_error' === $response->error->type || 'api_error' === $response->error->type) {
+						if ($retry) {
+							sleep(5);
+							return $this->process_payment($order_id, false, $force_save_source);
 						} else {
 							$localized_message = 'API connection error and retries exhausted.';
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$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_payment( $order_id, false, $force_save_source );
+								return $this->process_payment($order_id, false, $force_save_source);
 							}
 
-							sleep( $this->retry_interval );
+							sleep($this->retry_interval);
 
 							$this->retry_interval++;
-							return $this->process_payment( $order_id, true, $force_save_source );
+							return $this->process_payment($order_id, true, $force_save_source);
 						} else {
-							$localized_message = __( 'On going requests error and retries exhausted.', 'woocommerce-gateway-stripe' );
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$localized_message = __('On going requests error and retries exhausted.', 'woocommerce-gateway-stripe');
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( preg_match( '/No such customer/i', $response->error->message ) && $retry ) {
-						if ( WC_Stripe_Helper::is_pre_30() ) {
-							delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-							delete_post_meta( $order_id, '_stripe_customer_id' );
+					if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+						if (WC_Stripe_Helper::is_pre_30()) {
+							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();
 						}
 
-						return $this->process_payment( $order_id, false, $force_save_source );
-					} elseif ( preg_match( '/No such token/i', $response->error->message ) && $prepared_source->token_id ) {
+						return $this->process_payment($order_id, false, $force_save_source);
+					} elseif (preg_match('/No such token/i', $response->error->message) && $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);
 					}
 
 					$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);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -601,17 +601,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} 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 +79 added lines, -79 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,25 +71,25 @@ 
 		// 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( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		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('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sofort_supported_currencies', array(
+		return apply_filters('wc_stripe_sofort_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,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;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['sofort'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,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_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		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');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total = WC()->cart->total;
 
 		// 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' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		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 ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,28 +241,28 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$bank_country          = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$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');
 	}
 
 	/**
@@ -276,59 +276,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 ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_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_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				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-bancontact.php

Spacing +77 added lines, -77 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,25 +71,25 @@ 
 		// 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( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		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('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'Bancontact is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('Bancontact is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_bancontact_supported_currencies', array(
+		return apply_filters('wc_stripe_bancontact_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,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;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['bancontact'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,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_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		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');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total = WC()->cart->total;
 
 		// 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' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		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 ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,25 +241,25 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url              = $this->get_stripe_return_url( $order );
+		$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');
 	}
 
 	/**
@@ -273,51 +273,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 ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_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_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				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(