woocommerce / woocommerce-gateway-stripe

includes/class-wc-stripe-customer.php

Spacing +86 added lines, -86 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,10 +32,10 @@ 
 	 * Constructor
 	 * @param int $user_id The WP user ID
 	 */
-	public function __construct( $user_id = 0 ) {
-		if ( $user_id ) {
-			$this->set_user_id( $user_id );
-			$this->set_id( get_user_meta( $user_id, '_stripe_customer_id', true ) );
+	public function __construct($user_id = 0) {
+		if ($user_id) {
+			$this->set_user_id($user_id);
+			$this->set_id(get_user_meta($user_id, '_stripe_customer_id', true));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 	 * Set Stripe customer ID.
 	 * @param [type] $id [description]
 	 */
-	public function set_id( $id ) {
-		$this->id = wc_clean( $id );
+	public function set_id($id) {
+		$this->id = wc_clean($id);
 	}
 
 	/**
@@ -60,15 +60,15 @@ 
 	 * @return int
 	 */
 	public function get_user_id() {
-		return absint( $this->user_id );
+		return absint($this->user_id);
 	}
 
 	/**
 	 * Set User ID used by WordPress.
 	 * @param int $user_id
 	 */
-	public function set_user_id( $user_id ) {
-		$this->user_id = absint( $user_id );
+	public function set_user_id($user_id) {
+		$this->user_id = absint($user_id);
 	}
 
 	/**
@@ -76,13 +76,13 @@ 
 	 * @return WP_User
 	 */
 	protected function get_user() {
-		return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
+		return $this->get_user_id() ? get_user_by('id', $this->get_user_id()) : false;
 	}
 
 	/**
 	 * Store data from the Stripe API about this customer
 	 */
-	public function set_customer_data( $data ) {
+	public function set_customer_data($data) {
 		$this->customer_data = $data;
 	}
 
@@ -90,14 +90,14 @@ 
 	 * Get data from the Stripe API about this customer
 	 */
 	public function get_customer_data() {
-		$this->customer_data = get_transient( 'stripe_customer_' . $this->get_id() );
+		$this->customer_data = get_transient('stripe_customer_' . $this->get_id());
 
-		if ( empty( $this->customer_data ) && $this->get_id() && false === $this->customer_data ) {
-			$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() );
+		if (empty($this->customer_data) && $this->get_id() && false === $this->customer_data) {
+			$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id());
 
-			if ( empty( $response->error ) ) {
-				$this->set_customer_data( $response );
-				set_transient( 'stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48 );
+			if (empty($response->error)) {
+				$this->set_customer_data($response);
+				set_transient('stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48);
 			}
 		}
 
@@ -112,7 +112,7 @@ 
 		$data   = $this->get_customer_data();
 		$source = '';
 
-		if ( $data ) {
+		if ($data) {
 			$source = $data->default_source;
 		}
 
@@ -124,13 +124,13 @@ 
 	 * @param array $args
 	 * @return WP_Error|int
 	 */
-	public function create_customer( $args = array() ) {
-		$billing_email = filter_var( $_POST['billing_email'], FILTER_SANITIZE_EMAIL );
+	public function create_customer($args = array()) {
+		$billing_email = filter_var($_POST['billing_email'], FILTER_SANITIZE_EMAIL);
 		$user = $this->get_user();
 
-		if ( $user ) {
-			$billing_first_name = get_user_meta( $user->ID, 'billing_first_name', true );
-			$billing_last_name  = get_user_meta( $user->ID, 'billing_last_name', true );
+		if ($user) {
+			$billing_first_name = get_user_meta($user->ID, 'billing_first_name', true);
+			$billing_last_name  = get_user_meta($user->ID, 'billing_last_name', true);
 
 			$defaults = array(
 				'email'       => $user->user_email,
@@ -138,31 +138,31 @@ 
 			);
 		} else {
 			$defaults = array(
-				'email'       => ! empty( $billing_email ) ? $billing_email : '',
+				'email'       => ! empty($billing_email) ? $billing_email : '',
 				'description' => '',
 			);
 		}
 
 		$metadata = array();
 
-		$defaults['metadata'] = apply_filters( 'wc_stripe_customer_metadata', $metadata, $user );
+		$defaults['metadata'] = apply_filters('wc_stripe_customer_metadata', $metadata, $user);
 
-		$args     = wp_parse_args( $args, $defaults );
-		$response = WC_Stripe_API::request( apply_filters( 'wc_stripe_create_customer_args', $args ), 'customers' );
+		$args     = wp_parse_args($args, $defaults);
+		$response = WC_Stripe_API::request(apply_filters('wc_stripe_create_customer_args', $args), 'customers');
 
-		if ( ! empty( $response->error ) ) {
-			throw new Exception( $response->error->message );
+		if ( ! empty($response->error)) {
+			throw new Exception($response->error->message);
 		}
 
-		$this->set_id( $response->id );
+		$this->set_id($response->id);
 		$this->clear_cache();
-		$this->set_customer_data( $response );
+		$this->set_customer_data($response);
 
-		if ( $this->get_user_id() ) {
-			update_user_meta( $this->get_user_id(), '_stripe_customer_id', $response->id );
+		if ($this->get_user_id()) {
+			update_user_meta($this->get_user_id(), '_stripe_customer_id', $response->id);
 		}
 
-		do_action( 'woocommerce_stripe_add_customer', $args, $response );
+		do_action('woocommerce_stripe_add_customer', $args, $response);
 
 		return $response->id;
 	}
@@ -173,72 +173,72 @@ 
 	 * @param bool $retry
 	 * @return WP_Error|int
 	 */
-	public function add_source( $source_id, $retry = true ) {
-		if ( ! $this->get_id() ) {
+	public function add_source($source_id, $retry = true) {
+		if ( ! $this->get_id()) {
 			$this->create_customer();
 		}
 
-		$response = WC_Stripe_API::request( array(
+		$response = WC_Stripe_API::request(array(
 			'source' => $source_id,
-		), 'customers/' . $this->get_id() . '/sources' );
+		), 'customers/' . $this->get_id() . '/sources');
 
-		if ( ! empty( $response->error ) ) {
+		if ( ! empty($response->error)) {
 			// It is possible the WC user once was linked to a customer on Stripe
 			// but no longer exists. Instead of failing, lets try to create a
 			// new customer.
-			if ( preg_match( '/No such customer/i', $response->error->message ) ) {
-				delete_user_meta( $this->get_user_id(), '_stripe_customer_id' );
+			if (preg_match('/No such customer/i', $response->error->message)) {
+				delete_user_meta($this->get_user_id(), '_stripe_customer_id');
 				$this->create_customer();
-				return $this->add_source( $source_id, false );
+				return $this->add_source($source_id, false);
 			} else {
 				return $response;
 			}
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'error', __( 'Unable to add payment source.', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('error', __('Unable to add payment source.', 'woocommerce-gateway-stripe'));
 		}
 
 		// Add token to WooCommerce.
-		if ( $this->get_user_id() && class_exists( 'WC_Payment_Token_CC' ) ) {
-			if ( ! empty( $response->type ) ) {
-				switch ( $response->type ) {
+		if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) {
+			if ( ! empty($response->type)) {
+				switch ($response->type) {
 					case 'alipay':
 						break;
 					case 'sepa_debit':
 						$wc_token = new WC_Payment_Token_SEPA();
-						$wc_token->set_token( $response->id );
-						$wc_token->set_gateway_id( 'stripe_sepa' );
-						$wc_token->set_last4( $response->sepa_debit->last4 );
+						$wc_token->set_token($response->id);
+						$wc_token->set_gateway_id('stripe_sepa');
+						$wc_token->set_last4($response->sepa_debit->last4);
 						break;
 					default:
-						if ( 'source' === $response->object && 'card' === $response->type ) {
+						if ('source' === $response->object && 'card' === $response->type) {
 							$wc_token = new WC_Payment_Token_CC();
-							$wc_token->set_token( $response->id );
-							$wc_token->set_gateway_id( 'stripe' );
-							$wc_token->set_card_type( strtolower( $response->card->brand ) );
-							$wc_token->set_last4( $response->card->last4 );
-							$wc_token->set_expiry_month( $response->card->exp_month );
-							$wc_token->set_expiry_year( $response->card->exp_year );
+							$wc_token->set_token($response->id);
+							$wc_token->set_gateway_id('stripe');
+							$wc_token->set_card_type(strtolower($response->card->brand));
+							$wc_token->set_last4($response->card->last4);
+							$wc_token->set_expiry_month($response->card->exp_month);
+							$wc_token->set_expiry_year($response->card->exp_year);
 						}
 						break;
 				}
 			} else {
 				// Legacy.
 				$wc_token = new WC_Payment_Token_CC();
-				$wc_token->set_token( $response->id );
-				$wc_token->set_gateway_id( 'stripe' );
-				$wc_token->set_card_type( strtolower( $response->brand ) );
-				$wc_token->set_last4( $response->last4 );
-				$wc_token->set_expiry_month( $response->exp_month );
-				$wc_token->set_expiry_year( $response->exp_year );
+				$wc_token->set_token($response->id);
+				$wc_token->set_gateway_id('stripe');
+				$wc_token->set_card_type(strtolower($response->brand));
+				$wc_token->set_last4($response->last4);
+				$wc_token->set_expiry_month($response->exp_month);
+				$wc_token->set_expiry_year($response->exp_year);
 			}
 
-			$wc_token->set_user_id( $this->get_user_id() );
+			$wc_token->set_user_id($this->get_user_id());
 			$wc_token->save();
 		}
 
 		$this->clear_cache();
 
-		do_action( 'woocommerce_stripe_add_source', $this->get_id(), $wc_token, $response, $source_id );
+		do_action('woocommerce_stripe_add_source', $this->get_id(), $wc_token, $response, $source_id);
 
 		return $response->id;
 	}
@@ -250,38 +250,38 @@ 
 	 * @return array
 	 */
 	public function get_sources() {
-		$sources = get_transient( 'stripe_sources_' . $this->get_id() );
+		$sources = get_transient('stripe_sources_' . $this->get_id());
 
-		if ( false === $sources ) {
-			$response = WC_Stripe_API::request( array(
+		if (false === $sources) {
+			$response = WC_Stripe_API::request(array(
 				'limit'       => 100,
-			), 'customers/' . $this->get_id() . '/sources', 'GET' );
+			), 'customers/' . $this->get_id() . '/sources', 'GET');
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				return array();
 			}
 
-			if ( is_array( $response->data ) ) {
+			if (is_array($response->data)) {
 				$sources = $response->data;
 			}
 
-			set_transient( 'stripe_sources_' . $this->get_id(), $sources, HOUR_IN_SECONDS * 24 );
+			set_transient('stripe_sources_' . $this->get_id(), $sources, HOUR_IN_SECONDS * 24);
 		}
 
-		return empty( $sources ) ? array() : $sources;
+		return empty($sources) ? array() : $sources;
 	}
 
 	/**
 	 * Delete a source from stripe.
 	 * @param string $source_id
 	 */
-	public function delete_source( $source_id ) {
-		$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field( $source_id ), 'DELETE' );
+	public function delete_source($source_id) {
+		$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field($source_id), 'DELETE');
 
 		$this->clear_cache();
 
-		if ( empty( $response->error ) ) {
-			do_action( 'wc_stripe_delete_source', $this->get_id(), $response );
+		if (empty($response->error)) {
+			do_action('wc_stripe_delete_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -293,15 +293,15 @@ 
 	 * Set default source in Stripe
 	 * @param string $source_id
 	 */
-	public function set_default_source( $source_id ) {
-		$response = WC_Stripe_API::request( array(
-			'default_source' => sanitize_text_field( $source_id ),
-		), 'customers/' . $this->get_id(), 'POST' );
+	public function set_default_source($source_id) {
+		$response = WC_Stripe_API::request(array(
+			'default_source' => sanitize_text_field($source_id),
+		), 'customers/' . $this->get_id(), 'POST');
 
 		$this->clear_cache();
 
-		if ( empty( $response->error ) ) {
-			do_action( 'wc_stripe_set_default_source', $this->get_id(), $response );
+		if (empty($response->error)) {
+			do_action('wc_stripe_set_default_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -313,8 +313,8 @@ 
 	 * Deletes caches for this users cards.
 	 */
 	public function clear_cache() {
-		delete_transient( 'stripe_sources_' . $this->get_id() );
-		delete_transient( 'stripe_customer_' . $this->get_id() );
+		delete_transient('stripe_sources_' . $this->get_id());
+		delete_transient('stripe_customer_' . $this->get_id());
 		$this->customer_data = array();
 	}
 }

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

Spacing +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -64,9 +64,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_bitcoin';
-		$this->method_title         = __( 'Stripe Bitcoin', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Bitcoin', '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',
@@ -78,29 +78,29 @@ 
 		// 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_thankyou_stripe_bitcoin', array( $this, 'thankyou_page' ) );
+		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_thankyou_stripe_bitcoin', array($this, 'thankyou_page'));
 
 		// Customer Emails
-		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
+		add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 3);
 	}
 
 	/**
@@ -110,19 +110,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>';
 		}
 	}
@@ -135,8 +135,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'Bitcoin is enabled - it requires store currency to be set to USD.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('Bitcoin is enabled - it requires store currency to be set to USD.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -152,9 +152,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_bitcoin_supported_currencies', array(
+		return apply_filters('wc_stripe_bitcoin_supported_currencies', array(
 			'USD',
-		) );
+		));
 	}
 
 	/**
@@ -165,7 +165,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;
 		}
 
@@ -180,9 +180,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'bitcoin' => '<i class="stripe-pf stripe-pf-bitcoin stripe-pf-right" alt="Bitcoin" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 
 		$icons_str .= $icons['bitcoin'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -210,19 +210,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-bitcoin-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bitcoin-settings.php');
 	}
 
 	/**
@@ -233,25 +233,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-bitcoin-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>';
@@ -262,8 +262,8 @@ 
 	 *
 	 * @param int $order_id
 	 */
-	public function thankyou_page( $order_id ) {
-		$this->get_instructions( $order_id );
+	public function thankyou_page($order_id) {
+		$this->get_instructions($order_id);
 	}
 
 	/**
@@ -275,13 +275,13 @@ 
 	 * @param bool $sent_to_admin
 	 * @param bool $plain_text
 	 */
-	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
+	public function email_instructions($order, $sent_to_admin, $plain_text = false) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
 		$payment_method = WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method();
 
-		if ( ! $sent_to_admin && 'stripe_bitcoin' === $payment_method && $order->has_status( 'on-hold' ) ) {
-			$this->get_instructions( $order_id, $plain_text );
+		if ( ! $sent_to_admin && 'stripe_bitcoin' === $payment_method && $order->has_status('on-hold')) {
+			$this->get_instructions($order_id, $plain_text);
 		}
 	}
 
@@ -292,38 +292,38 @@ 
 	 * @version 4.0.0
 	 * @param int $order_id
 	 */
-	public function get_instructions( $order_id, $plain_text = false ) {
-		$data = get_post_meta( $order_id, '_stripe_bitcoin', true );
+	public function get_instructions($order_id, $plain_text = false) {
+		$data = get_post_meta($order_id, '_stripe_bitcoin', true);
 
-		if ( $plain_text ) {
-			esc_html_e( 'Please pay the following:', 'woocommerce-gateway-stripe' ) . "\n\n";
+		if ($plain_text) {
+			esc_html_e('Please pay the following:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Bitcoin Amount:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Bitcoin Amount:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['amount'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Receiver:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Receiver:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['address'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'URI:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('URI:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['uri'] . "\n\n";
 		} else {
 			?>
-			<h3><?php esc_html_e( 'Please pay the following:', 'woocommerce-gateway-stripe' ); ?></h3>
+			<h3><?php esc_html_e('Please pay the following:', 'woocommerce-gateway-stripe'); ?></h3>
 			<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Bitcoin Amount:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Bitcoin Amount:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['amount']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Receiver:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Receiver:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['address']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'URI:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('URI:', 'woocommerce-gateway-stripe'); ?>
 				<strong>
 				<?php
 				/* translators: link */
-				printf( __( '<a href="%s">Pay Bitcoin</a>', 'woocommerce-gateway-stripe' ), $data['uri'] );
+				printf(__('<a href="%s">Pay Bitcoin</a>', 'woocommerce-gateway-stripe'), $data['uri']);
 				?>
 				</strong>
 			</li>
@@ -340,7 +340,7 @@ 
 	 * @param object $order
 	 * @param object $source_object
 	 */
-	public function save_instructions( $order, $source_object ) {
+	public function save_instructions($order, $source_object) {
 		$data = array(
 			'amount'  => $source_object->bitcoin->amount,
 			'address' => $source_object->bitcoin->address,
@@ -349,7 +349,7 @@ 
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		update_post_meta( $order_id, '_stripe_bitcoin', $data );
+		update_post_meta($order_id, '_stripe_bitcoin', $data);
 	}
 
 	/**
@@ -363,40 +363,40 @@ 
 	 *
 	 * @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 );
-			$source_object = ! empty( $_POST['stripe_source'] ) ? json_decode( stripslashes( $_POST['stripe_source'] ) ) : false;
+			$order = wc_get_order($order_id);
+			$source_object = ! empty($_POST['stripe_source']) ? json_decode(stripslashes($_POST['stripe_source'])) : false;
 
 			// 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();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
-			if ( empty( $prepared_source->source ) ) {
-				$error_msg = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new Exception( $error_msg );
+			if (empty($prepared_source->source)) {
+				$error_msg = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new Exception($error_msg);
 			}
 
 			// Store source to order meta.
-			$this->save_source( $order, $prepared_source );
+			$this->save_source($order, $prepared_source);
 
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			$this->save_instructions( $order, $source_object );
+			$this->save_instructions($order, $source_object);
 
 			// Mark as on-hold (we're awaiting the payment)
-			$order->update_status( 'on-hold', __( 'Awaiting Bitcoin payment', 'woocommerce-gateway-stripe' ) );
+			$order->update_status('on-hold', __('Awaiting Bitcoin payment', 'woocommerce-gateway-stripe'));
 
-			wc_reduce_stock_levels( $order_id );
+			wc_reduce_stock_levels($order_id);
 
 			// Remove cart
 			WC()->cart->empty_cart();
@@ -404,16 +404,16 @@ 
 			// Return thankyou redirect
 			return array(
 				'result'    => 'success',
-				'redirect'  => $this->get_return_url( $order ),
+				'redirect'  => $this->get_return_url($order),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +97 added lines, -97 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sepa';
-		$this->method_title         = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SEPA Direct Debit', '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',
@@ -84,25 +84,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'));
 	}
 
 	/**
@@ -112,19 +112,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>';
 		}
 	}
@@ -137,8 +137,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'SEPA 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 = __('SEPA is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -154,9 +154,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sepa_supported_currencies', array(
+		return apply_filters('wc_stripe_sepa_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -167,7 +167,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;
 		}
 
@@ -182,9 +182,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'sepa' => '<i class="stripe-pf stripe-pf-sepa stripe-pf-right" alt="SEPA" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 
 		$icons_str .= $icons['sepa'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -212,19 +212,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-sepa-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php');
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public function mandate_display() {
 		/* translators: statement descriptor */
-		printf( __( 'By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe' ), WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor ) );
+		printf(__('By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe'), WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor));
 	}
 
 	/**
@@ -247,24 +247,24 @@ 
 	 */
 	public function form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<p class="wc-stripe-sepa-mandate"><?php $this->mandate_display(); ?></p>
 			<p class="form-row form-row-wide validate-required">
 				<label for="stripe-sepa-owner">
-					<?php esc_html_e( 'IBAN Account Name.', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('IBAN Account Name.', 'woocommerce-gateway-stripe'); ?>
 				</label>
 				<input id="stripe-sepa-owner" name="stripe_sepa_owner" value="" />
 			</p>
 			<p class="form-row form-row-wide validate-required">
 				<label for="stripe-sepa-iban">
-					<?php esc_html_e( 'IBAN Account Number.', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('IBAN Account Number.', 'woocommerce-gateway-stripe'); ?>
 				</label>
 				<input id="stripe-sepa-iban" name="stripe_sepa_iban" value="" />
 			</p>
 			<!-- 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
@@ -276,42 +276,42 @@ 
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
 		$total                = WC()->cart->total;
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 
 		// 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-sepa_debit-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 ) {
-			if ( $this->testmode ) {
-				$this->description .= ' ' . __( 'TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe' );
-				$this->description  = trim( $this->description );
+		if ($this->description) {
+			if ($this->testmode) {
+				$this->description .= ' ' . __('TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe');
+				$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();
 		}
 
 		$this->form();
 
-		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();
 		}
 
@@ -329,76 +329,76 @@ 
 	 *
 	 * @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();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
 			// Store source to order meta.
-			$this->save_source( $order, $prepared_source );
+			$this->save_source($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);
 
-				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 {
 							$message = 'API connection error and retries exhausted.';
-							$order->add_order_note( $message );
-							throw new Exception( $message );
+							$order->add_order_note($message);
+							throw new Exception($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 ) {
-						delete_user_meta( WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id' );
+					if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+						delete_user_meta(WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_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 ) {
+						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();
-						$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $message );
-						throw new Exception( $message );
+						$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($message);
+						throw new Exception($message);
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					$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;
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($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();
 			}
@@ -409,17 +409,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +78 added lines, -78 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;
 		}
 
@@ -169,9 +169,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'bancontact' => '<i class="stripe-pf stripe-pf-bancontact-mister-cash stripe-pf-right" alt="Bancontact" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -188,7 +188,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);
 	}
 
 	/**
@@ -199,19 +199,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');
 	}
 
 	/**
@@ -222,25 +222,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>';
@@ -254,24 +254,24 @@ 
 	 * @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['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Bancontact source' );
+		WC_Stripe_Logger::log('Info: Begin creating Bancontact source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -285,51 +285,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 Exception( $response->error->message );
+				throw new Exception($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 ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +87 added lines, -87 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;
 		}
 
@@ -169,9 +169,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'sofort' => '<i class="stripe-pf stripe-pf-sofort stripe-pf-right" alt="SOFORT" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -188,7 +188,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);
 	}
 
 	/**
@@ -199,19 +199,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');
 	}
 
 	/**
@@ -230,24 +230,24 @@ 
 			'IT' => 'Italy',
 		);
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<label for="stripe-bank-country">
-				<?php _e( 'Country origin of your bank.', 'woocommerce-gateway-stripe' ); ?>
+				<?php _e('Country origin of your bank.', 'woocommerce-gateway-stripe'); ?>
 			</label>
 			<br />
 			<p class="form-row form-row-wide validate-required">
 			<select id="stripe-bank-country" class="wc-enhanced-select" name="stripe_sofort_bank_country">
-				<option value="-1"><?php esc_html_e( 'Choose Bank Country', 'woocommerce-gateway-stripe' ); ?></option>
-				<?php foreach ( $supported_countries as $code => $country ) { ?>
-				<option value="<?php echo esc_attr( $code ); ?>"><?php echo esc_html( $country ); ?></option>
+				<option value="-1"><?php esc_html_e('Choose Bank Country', 'woocommerce-gateway-stripe'); ?></option>
+				<?php foreach ($supported_countries as $code => $country) { ?>
+				<option value="<?php echo esc_attr($code); ?>"><?php echo esc_html($country); ?></option>
 				<?php } ?>
 			</select>
 			</p>
 
 			<!-- 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
@@ -261,25 +261,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)));
 		}
 
 		$this->form();
@@ -295,26 +295,26 @@ 
 	 * @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();
-		$bank_country                      = wc_clean( $_POST['stripe_sofort_bank_country'] );
-		$return_url                        = $this->get_stripe_return_url( $order );
+		$bank_country                      = wc_clean($_POST['stripe_sofort_bank_country']);
+		$return_url                        = $this->get_stripe_return_url($order);
 		$post_data                         = array();
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']             = strtolower( $currency );
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']             = strtolower($currency);
 		$post_data['type']                 = 'sofort';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
-		$post_data['sofort']               = array( 'country' => $bank_country );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
+		$post_data['sofort']               = array('country' => $bank_country);
 
-		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( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -328,51 +328,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 Exception( $response->error->message );
+				throw new Exception($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 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 ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +267 added lines, -267 removed lines

@@ -6,7 +6,7 @@ 
  * @since   3.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -42,30 +42,30 @@ 
 	 * @version 4.0.0
 	 */
 	public function __construct() {
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
 		$this->publishable_key         = $this->get_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'] ) : '';
+		$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 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;
 		}
 
@@ -79,38 +79,38 @@ 
 	 * @version 4.0.0
 	 */
 	protected function init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) );
-		add_action( 'wp', array( $this, 'set_session' ) );
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
+		add_action('wp', array($this, 'set_session'));
 
 		/*
 		 * 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( '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, 3 );
+		add_action('woocommerce_checkout_order_processed', array($this, 'add_order_meta'), 10, 3);
 	}
 
 	/**
@@ -120,11 +120,11 @@ 
 	 * @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 ( ! $wc_session->has_session() ) {
-				$wc_session->set_customer_session_cookie( true );
+			if ( ! $wc_session->has_session()) {
+				$wc_session->set_customer_session_cookie(true);
 			}
 		}
 	}
@@ -135,15 +135,15 @@ 
 	 * @return string
 	 */
 	protected function get_publishable_key() {
-		if ( empty( $this->stripe_settings ) ) {
+		if (empty($this->stripe_settings)) {
 			return '';
 		}
 
-		if ( empty( $this->stripe_settings['testmode'] ) ) {
+		if (empty($this->stripe_settings['testmode'])) {
 			return '';
 		}
 
-		if ( empty( $this->stripe_settings['test_publishable_key'] ) ) {
+		if (empty($this->stripe_settings['test_publishable_key'])) {
 			return '';
 		}
 
@@ -158,7 +158,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';
 	}
 
 	/**
@@ -169,7 +169,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';
 	}
 
 	/**
@@ -180,7 +180,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';
 	}
 
 	/**
@@ -190,40 +190,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,
 			);
@@ -232,13 +232,13 @@ 
 		$data['displayItems'] = $items;
 		$data['total'] = array(
 			'label'   => $this->total_label,
-			'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()),
 			'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 $data;
 	}
@@ -247,25 +247,25 @@ 
 	 * 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;
 		}
 
@@ -278,10 +278,10 @@ 
 	 * @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;
 		}
 
@@ -291,7 +291,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;
 		}
 
@@ -307,27 +307,27 @@ 
 	 * @param array $posted_data The posted data from checkout form.
 	 * @param object $order
 	 */
-	public function add_order_meta( $order_id, $posted_data, $order ) {
-		if ( empty( $_POST['payment_request_type'] ) ) {
+	public function add_order_meta($order_id, $posted_data, $order) {
+		if (empty($_POST['payment_request_type'])) {
 			return;
 		}
 
-		$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();
 			}
 		}
@@ -341,11 +341,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',
-		) );
+		));
 	}
 
 	/**
@@ -356,15 +356,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;
 			}
 		}
@@ -379,71 +379,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->get_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');
 	}
 
 	/**
@@ -455,35 +455,35 @@ 
 	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_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;
 			}
 		}
@@ -505,40 +505,40 @@ 
 	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_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
 	}
 
@@ -549,11 +549,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;
 	}
@@ -565,7 +565,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;
@@ -575,10 +575,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();
@@ -591,14 +591,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);
 	}
 
 	/**
@@ -609,47 +609,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();
@@ -657,12 +657,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);
 		}
 	}
 
@@ -670,22 +670,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();
 
@@ -693,7 +693,7 @@ 
 		$data += $this->build_display_items();
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -704,31 +704,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 . ')' : '';
 
@@ -736,28 +736,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,
 			);
@@ -766,15 +766,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);
 	}
 
 	/**
@@ -785,37 +785,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();
@@ -824,7 +824,7 @@ 
 		$data += $this->build_display_items();
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -837,31 +837,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;
 					}
 				}
@@ -876,19 +876,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);
 	}
 
 	/**
@@ -898,7 +898,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'];
@@ -915,28 +915,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();
 		}
 
@@ -953,17 +953,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);
 	}
 
 	/**
@@ -972,19 +972,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']),
 			);
 		}
 
@@ -998,69 +998,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),
 			);
 		}
 
@@ -1068,7 +1068,7 @@ 
 			'displayItems' => $items,
 			'total'      => array(
 				'label'   => $this->total_label,
-				'amount'  => max( 0, apply_filters( 'woocommerce_calculated_total', WC_Stripe_Helper::get_stripe_amount( $order_total ), $order_total, WC()->cart ) ),
+				'amount'  => max(0, apply_filters('woocommerce_calculated_total', WC_Stripe_Helper::get_stripe_amount($order_total), $order_total, WC()->cart)),
 				'pending' => false,
 			),
 		);

includes/payment-methods/class-wc-gateway-stripe-alipay.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_alipay';
-		$this->method_title         = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Alipay', '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>';
 		}
 	}
@@ -125,10 +125,10 @@ 
 	 */
 	public function get_environment_warning() {
 		if (
-			'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() )
+			'yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())
 		) {
 			/* translators: supported currency list */
-			$message = sprintf( __( 'Alipay is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe' ), implode( ', ', $this->get_supported_currency() ) );
+			$message = sprintf(__('Alipay is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe'), implode(', ', $this->get_supported_currency()));
 
 			return $message;
 		}
@@ -144,7 +144,7 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_alipay_supported_currencies', array(
+		return apply_filters('wc_stripe_alipay_supported_currencies', array(
 			'EUR',
 			'AUD',
 			'CAD',
@@ -154,7 +154,7 @@ 
 			'NZD',
 			'SGD',
 			'USD',
-		) );
+		));
 	}
 
 	/**
@@ -165,7 +165,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;
 		}
 
@@ -180,9 +180,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'alipay' => '<i class="stripe-pf stripe-pf-alipay stripe-pf-right" alt="Alipay" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 
 		$icons_str .= $icons['alipay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -209,19 +209,19 @@ 
 	 * @version 4.0.0
 	 */
 	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-alipay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php');
 	}
 
 	/**
@@ -232,25 +232,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-alipay-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>';
@@ -264,24 +264,24 @@ 
 	 * @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']                 = 'alipay';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Alipay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Alipay source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -295,53 +295,53 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_save = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_save = 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 Exception( $response->error->message );
+				throw new Exception($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 Alipay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Alipay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			$statuses = array( 'pending', 'failed' );
+			$statuses = array('pending', 'failed');
 
-			if ( $order->has_status( $statuses ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status($statuses)) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_giropay';
-		$this->method_title         = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Giropay', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,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 = __( 'Giropay 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 = __('Giropay 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_giropay_supported_currencies', array(
+		return apply_filters('wc_stripe_giropay_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;
 		}
 
@@ -169,9 +169,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'giropay' => '<i class="stripe-pf stripe-pf-giropay stripe-pf-right" alt="Giropay" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 
 		$icons_str .= $icons['giropay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -199,19 +199,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-giropay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php');
 	}
 
 	/**
@@ -222,25 +222,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-giropay-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $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>';
@@ -254,24 +254,24 @@ 
 	 * @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']                 = 'giropay';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Giropay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Giropay source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -285,51 +285,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 Exception( $response->error->message );
+				throw new Exception($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 Giropay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Giropay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_ideal';
-		$this->method_title         = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe iDeal', '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 = __( 'iDeal 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 = __('iDeal 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_ideal_supported_currencies', array(
+		return apply_filters('wc_stripe_ideal_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;
 		}
 
@@ -169,9 +169,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'ideal' => '<i class="stripe-pf stripe-pf-ideal stripe-pf-right" alt="iDeal" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 
 		$icons_str .= $icons['ideal'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -199,19 +199,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-ideal-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-ideal-settings.php');
 	}
 
 	/**
@@ -222,25 +222,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-ideal-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>';
@@ -254,24 +254,24 @@ 
 	 * @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']                 = 'ideal';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating iDeal source' );
+		WC_Stripe_Logger::log('Info: Begin creating iDeal source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -285,51 +285,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 Exception( $response->error->message );
+				throw new Exception($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 iDeal...' );
+			WC_Stripe_Logger::log('Info: Redirecting to iDeal...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(