woocommerce / woocommerce-gateway-stripe

includes/class-wc-gateway-stripe.php

Spacing +263 added lines, -263 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -120,9 +120,9 @@ 
 	public function __construct() {
 		$this->retry_interval       = 1;
 		$this->id                   = 'stripe';
-		$this->method_title         = __( 'Stripe', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe', 'woocommerce-gateway-stripe');
 		/* translators: 1) link to Stripe register page 2) link to Stripe api keys page */
-		$this->method_description   = sprintf( __( 'Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys' );
+		$this->method_description   = sprintf(__('Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys');
 		$this->has_fields           = true;
 		$this->supports             = array(
 			'products',
@@ -149,43 +149,43 @@ 
 		$this->init_settings();
 
 		// Get setting values.
-		$this->title                       = $this->get_option( 'title' );
-		$this->description                 = $this->get_option( 'description' );
-		$this->enabled                     = $this->get_option( 'enabled' );
-		$this->testmode                    = 'yes' === $this->get_option( 'testmode' );
-		$this->inline_cc_form              = 'yes' === $this->get_option( 'inline_cc_form' );
-		$this->capture                     = 'yes' === $this->get_option( 'capture', 'yes' );
-		$this->statement_descriptor        = WC_Stripe_Helper::clean_statement_descriptor( $this->get_option( 'statement_descriptor' ) );
-		$this->three_d_secure              = 'yes' === $this->get_option( 'three_d_secure' );
-		$this->stripe_checkout             = 'yes' === $this->get_option( 'stripe_checkout' );
-		$this->stripe_checkout_image       = $this->get_option( 'stripe_checkout_image', '' );
-		$this->stripe_checkout_description = $this->get_option( 'stripe_checkout_description' );
-		$this->saved_cards                 = 'yes' === $this->get_option( 'saved_cards' );
-		$this->secret_key                  = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
-		$this->publishable_key             = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' );
-		$this->bitcoin                     = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' );
-		$this->payment_request             = 'yes' === $this->get_option( 'payment_request', 'yes' );
-
-		if ( $this->stripe_checkout ) {
-			$this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' );
-		}
-
-		WC_Stripe_API::set_secret_key( $this->secret_key );
+		$this->title                       = $this->get_option('title');
+		$this->description                 = $this->get_option('description');
+		$this->enabled                     = $this->get_option('enabled');
+		$this->testmode                    = 'yes' === $this->get_option('testmode');
+		$this->inline_cc_form              = 'yes' === $this->get_option('inline_cc_form');
+		$this->capture                     = 'yes' === $this->get_option('capture', 'yes');
+		$this->statement_descriptor        = WC_Stripe_Helper::clean_statement_descriptor($this->get_option('statement_descriptor'));
+		$this->three_d_secure              = 'yes' === $this->get_option('three_d_secure');
+		$this->stripe_checkout             = 'yes' === $this->get_option('stripe_checkout');
+		$this->stripe_checkout_image       = $this->get_option('stripe_checkout_image', '');
+		$this->stripe_checkout_description = $this->get_option('stripe_checkout_description');
+		$this->saved_cards                 = 'yes' === $this->get_option('saved_cards');
+		$this->secret_key                  = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
+		$this->publishable_key             = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key');
+		$this->bitcoin                     = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin');
+		$this->payment_request             = 'yes' === $this->get_option('payment_request', 'yes');
+
+		if ($this->stripe_checkout) {
+			$this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe');
+		}
+
+		WC_Stripe_API::set_secret_key($this->secret_key);
 
 		// Hooks.
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) );
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'woocommerce_admin_order_totals_after_total', array( $this, 'display_order_fee' ), 10, 1 );
-		add_action( 'woocommerce_admin_order_totals_after_total', array( $this, 'display_order_payout' ), 20, 1 );
-		add_action( 'woocommerce_customer_save_address', array( $this, 'show_update_card_notice' ), 10, 2 );
-		add_action( 'woocommerce_receipt_stripe', array( $this, 'stripe_checkout_receipt_page' ) );
-		add_action( 'woocommerce_api_' . strtolower( get_class( $this ) ), array( $this, 'stripe_checkout_return_handler' ) );
-
-		if ( WC_Stripe_Helper::is_pre_orders_exists() ) {
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts'));
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('woocommerce_admin_order_totals_after_total', array($this, 'display_order_fee'), 10, 1);
+		add_action('woocommerce_admin_order_totals_after_total', array($this, 'display_order_payout'), 20, 1);
+		add_action('woocommerce_customer_save_address', array($this, 'show_update_card_notice'), 10, 2);
+		add_action('woocommerce_receipt_stripe', array($this, 'stripe_checkout_receipt_page'));
+		add_action('woocommerce_api_' . strtolower(get_class($this)), array($this, 'stripe_checkout_return_handler'));
+
+		if (WC_Stripe_Helper::is_pre_orders_exists()) {
 			$this->pre_orders = new WC_Stripe_Pre_Orders_Compat();
 
-			add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this->pre_orders, 'process_pre_order_release_payment' ) );
+			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this->pre_orders, 'process_pre_order_release_payment'));
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return bool
 	 */
 	public function are_keys_set() {
-		if ( empty( $this->secret_key ) || empty( $this->publishable_key ) ) {
+		if (empty($this->secret_key) || empty($this->publishable_key)) {
 			return false;
 		}
 
@@ -209,7 +209,7 @@ 
 	 * @since 4.0.2
 	 */
 	public function is_available() {
-		if ( is_add_payment_method_page() && ! $this->saved_cards ) {
+		if (is_add_payment_method_page() && ! $this->saved_cards) {
 			return false;
 		}
 
@@ -223,13 +223,13 @@ 
 	 * @param int $user_id
 	 * @param array $load_address
 	 */
-	public function show_update_card_notice( $user_id, $load_address ) {
-		if ( ! $this->saved_cards || ! WC_Stripe_Payment_Tokens::customer_has_saved_methods( $user_id ) || 'billing' !== $load_address ) {
+	public function show_update_card_notice($user_id, $load_address) {
+		if ( ! $this->saved_cards || ! WC_Stripe_Payment_Tokens::customer_has_saved_methods($user_id) || 'billing' !== $load_address) {
 			return;
 		}
 
 		/* translators: 1) Opening anchor tag 2) closing anchor tag */
-		wc_add_notice( sprintf( __( 'If your billing address has been changed for saved payment methods, be sure to remove any %1$ssaved payment methods%2$s on file and re-add them.', 'woocommerce-gateway-stripe' ), '<a href="' . esc_url( wc_get_endpoint_url( 'payment-methods' ) ) . '" class="wc-stripe-update-card-notice" style="text-decoration:underline;">', '</a>' ), 'notice' );
+		wc_add_notice(sprintf(__('If your billing address has been changed for saved payment methods, be sure to remove any %1$ssaved payment methods%2$s on file and re-add them.', 'woocommerce-gateway-stripe'), '<a href="' . esc_url(wc_get_endpoint_url('payment-methods')) . '" class="wc-stripe-update-card-notice" style="text-decoration:underline;">', '</a>'), 'notice');
 	}
 
 	/**
@@ -248,24 +248,24 @@ 
 		$icons_str .= $icons['amex'];
 		$icons_str .= $icons['mastercard'];
 
-		if ( 'USD' === get_woocommerce_currency() ) {
+		if ('USD' === get_woocommerce_currency()) {
 			$icons_str .= $icons['discover'];
 			$icons_str .= $icons['jcb'];
 			$icons_str .= $icons['diners'];
 		}
 
-		if ( $this->bitcoin && $this->stripe_checkout ) {
+		if ($this->bitcoin && $this->stripe_checkout) {
 			$icons_str .= $icons['bitcoin'];
 		}
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( dirname( __FILE__ ) . '/admin/stripe-settings.php' );
+		$this->form_fields = require(dirname(__FILE__) . '/admin/stripe-settings.php');
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 		$total                = WC()->cart->total;
 		$user_email           = '';
 		$description          = $this->get_description() ? $this->get_description() : '';
@@ -281,26 +281,26 @@ 
 		$lastname             = '';
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order      = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order      = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total      = $order->get_total();
 			$user_email = WC_Stripe_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
 		} else {
-			if ( $user->ID ) {
-				$user_email = get_user_meta( $user->ID, 'billing_email', true );
+			if ($user->ID) {
+				$user_email = get_user_meta($user->ID, 'billing_email', true);
 				$user_email = $user_email ? $user_email : $user->user_email;
 			}
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Card', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Card', 'woocommerce-gateway-stripe');
 			$total           = '';
 			$firstname       = $user->user_firstname;
 			$lastname        = $user->user_lastname;
 
-		} elseif ( function_exists( 'wcs_order_contains_subscription' ) && isset( $_GET['change_payment_method'] ) ) {
-			$pay_button_text = __( 'Change Payment Method', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		} elseif (function_exists('wcs_order_contains_subscription') && isset($_GET['change_payment_method'])) {
+			$pay_button_text = __('Change Payment Method', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
@@ -309,46 +309,46 @@ 
 
 		echo '<div
 			id="stripe-payment-data"
-			data-panel-label="' . esc_attr( $pay_button_text ) . '"
-			data-description="' . esc_attr( strip_tags( $this->stripe_checkout_description ) ) . '"
-			data-email="' . esc_attr( $user_email ) . '"
-			data-verify-zip="' . esc_attr( apply_filters( 'wc_stripe_checkout_verify_zip', false ) ? 'true' : 'false' ) . '"
-			data-billing-address="' . esc_attr( apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'true' : 'false' ) . '"
-			data-shipping-address="' . esc_attr( apply_filters( 'wc_stripe_checkout_require_shipping_address', false ) ? 'true' : 'false' ) . '" 
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-name="' . esc_attr( $this->statement_descriptor ) . '"
-			data-full-name="' . esc_attr( $firstname . ' ' . $lastname ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '"
-			data-image="' . esc_attr( $this->stripe_checkout_image ) . '"
-			data-bitcoin="' . esc_attr( ( $this->bitcoin && $this->capture ) ? 'true' : 'false' ) . '"
-			data-locale="' . esc_attr( apply_filters( 'wc_stripe_checkout_locale', $this->get_locale() ) ) . '"
-			data-three-d-secure="' . esc_attr( $this->three_d_secure ? 'true' : 'false' ) . '"
-			data-allow-remember-me="' . esc_attr( apply_filters( 'wc_stripe_allow_remember_me', true ) ? 'true' : 'false' ) . '">';
-
-		if ( $description ) {
-			if ( $this->testmode ) {
+			data-panel-label="' . esc_attr($pay_button_text) . '"
+			data-description="' . esc_attr(strip_tags($this->stripe_checkout_description)) . '"
+			data-email="' . esc_attr($user_email) . '"
+			data-verify-zip="' . esc_attr(apply_filters('wc_stripe_checkout_verify_zip', false) ? 'true' : 'false') . '"
+			data-billing-address="' . esc_attr(apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'true' : 'false') . '"
+			data-shipping-address="' . esc_attr(apply_filters('wc_stripe_checkout_require_shipping_address', false) ? 'true' : 'false') . '" 
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-name="' . esc_attr($this->statement_descriptor) . '"
+			data-full-name="' . esc_attr($firstname . ' ' . $lastname) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '"
+			data-image="' . esc_attr($this->stripe_checkout_image) . '"
+			data-bitcoin="' . esc_attr(($this->bitcoin && $this->capture) ? 'true' : 'false') . '"
+			data-locale="' . esc_attr(apply_filters('wc_stripe_checkout_locale', $this->get_locale())) . '"
+			data-three-d-secure="' . esc_attr($this->three_d_secure ? 'true' : 'false') . '"
+			data-allow-remember-me="' . esc_attr(apply_filters('wc_stripe_allow_remember_me', true) ? 'true' : 'false') . '">';
+
+		if ($description) {
+			if ($this->testmode) {
 				/* translators: link to Stripe testing page */
-				$description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the <a href="%s" target="_blank">Testing Stripe documentation</a> for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' );
-				$description  = trim( $description );
+				$description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the <a href="%s" target="_blank">Testing Stripe documentation</a> for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing');
+				$description  = trim($description);
 			}
 
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
-		if ( ! $this->stripe_checkout ) {
+		if ( ! $this->stripe_checkout) {
 			$this->elements_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'])) {
 
-			if ( ! $this->stripe_checkout ) {
+			if ( ! $this->stripe_checkout) {
 				$this->save_payment_method_checkbox();
-			} elseif ( $this->stripe_checkout && isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
+			} elseif ($this->stripe_checkout && isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
 				$this->save_payment_method_checkbox();
 			}
 		}
@@ -366,12 +366,12 @@ 
 	 */
 	public function elements_form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 
-			<?php if ( $this->inline_cc_form ) { ?>
+			<?php if ($this->inline_cc_form) { ?>
 				<label for="card-element">
-					<?php esc_html_e( 'Credit or debit card', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('Credit or debit card', 'woocommerce-gateway-stripe'); ?>
 				</label>
 
 				<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
@@ -379,7 +379,7 @@ 
 				</div>
 			<?php } else { ?>
 				<div class="form-row form-row-wide">
-					<label><?php esc_html_e( 'Card Number', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php esc_html_e('Card Number', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 					<div class="stripe-card-group">
 						<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 						<!-- a Stripe Element will be inserted here. -->
@@ -390,7 +390,7 @@ 
 				</div>
 
 				<div class="form-row form-row-first">
-					<label><?php esc_html_e( 'Expiry Date', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php esc_html_e('Expiry Date', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 
 					<div id="stripe-exp-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 					<!-- a Stripe Element will be inserted here. -->
@@ -398,7 +398,7 @@ 
 				</div>
 
 				<div class="form-row form-row-last">
-					<label><?php esc_html_e( 'Card Code (CVC)', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php esc_html_e('Card Code (CVC)', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 				<div id="stripe-cvc-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 				<!-- a Stripe Element will be inserted here. -->
 				</div>
@@ -408,7 +408,7 @@ 
 
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -421,13 +421,13 @@ 
 	 * @version 3.1.0
 	 */
 	public function admin_scripts() {
-		if ( 'woocommerce_page_wc-settings' !== get_current_screen()->id ) {
+		if ('woocommerce_page_wc-settings' !== get_current_screen()->id) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_script( 'woocommerce_stripe_admin', plugins_url( 'assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION, true );
+		wp_enqueue_script('woocommerce_stripe_admin', plugins_url('assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION, true);
 	}
 
 	/**
@@ -439,44 +439,44 @@ 
 	 * @version 4.0.0
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			return;
 		}
 
 		// If Stripe is not enabled bail.
-		if ( 'no' === $this->enabled ) {
+		if ('no' === $this->enabled) {
 			return;
 		}
 
 		// If keys are not set bail.
-		if ( ! $this->are_keys_set() ) {
-			WC_Stripe_Logger::log( 'Keys are not set correctly.' );
+		if ( ! $this->are_keys_set()) {
+			WC_Stripe_Logger::log('Keys are not set correctly.');
 			return;
 		}
 
 		// If no SSL bail.
-		if ( ! $this->testmode && ! is_ssl() ) {
-			WC_Stripe_Logger::log( 'Stripe live mode requires SSL.' );
+		if ( ! $this->testmode && ! is_ssl()) {
+			WC_Stripe_Logger::log('Stripe live mode requires SSL.');
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_register_style( 'stripe_styles', plugins_url( 'assets/css/stripe-styles.css', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION );
-		wp_enqueue_style( 'stripe_styles' );
-		wp_register_script( 'stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true );
-		wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true );
-		wp_register_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_register_style('stripe_styles', plugins_url('assets/css/stripe-styles.css', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION);
+		wp_enqueue_style('stripe_styles');
+		wp_register_script('stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true);
+		wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true);
+		wp_register_script('woocommerce_stripe', plugins_url('assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripe'), WC_STRIPE_VERSION, true);
 
 		$stripe_params = array(
 			'key'                  => $this->publishable_key,
-			'i18n_terms'           => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ),
-			'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ),
+			'i18n_terms'           => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'),
+			'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'),
 		);
 
 		// If we're on the pay page we need to pass stripe.js the address of the order.
-		if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) {
-			$order_id = wc_get_order_id_by_order_key( urldecode( $_GET['key'] ) );
-			$order    = wc_get_order( $order_id );
+		if (isset($_GET['pay_for_order']) && 'true' === $_GET['pay_for_order']) {
+			$order_id = wc_get_order_id_by_order_key(urldecode($_GET['key']));
+			$order    = wc_get_order($order_id);
 
 			$stripe_params['billing_first_name'] = WC_Stripe_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
 			$stripe_params['billing_last_name']  = WC_Stripe_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
@@ -488,38 +488,38 @@ 
 			$stripe_params['billing_country']    = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
 		}
 
-		$stripe_params['no_prepaid_card_msg']                     = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_owner_msg']                       = __( 'Please enter your IBAN account name.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_iban_msg']                        = __( 'Please enter your IBAN account number.', 'woocommerce-gateway-stripe' );
-		$stripe_params['sepa_mandate_notification']               = apply_filters( 'wc_stripe_sepa_mandate_notification', 'email' );
-		$stripe_params['allow_prepaid_card']                      = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no';
+		$stripe_params['no_prepaid_card_msg']                     = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_owner_msg']                       = __('Please enter your IBAN account name.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_iban_msg']                        = __('Please enter your IBAN account number.', 'woocommerce-gateway-stripe');
+		$stripe_params['sepa_mandate_notification']               = apply_filters('wc_stripe_sepa_mandate_notification', 'email');
+		$stripe_params['allow_prepaid_card']                      = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no';
 		$stripe_params['inline_cc_form']                          = $this->inline_cc_form ? 'yes' : 'no';
-		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'yes' : 'no';
-		$stripe_params['is_checkout']                             = ( is_checkout() && empty( $_GET['pay_for_order'] ) ) ? 'yes' : 'no';
+		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'yes' : 'no';
+		$stripe_params['is_checkout']                             = (is_checkout() && empty($_GET['pay_for_order'])) ? 'yes' : 'no';
 		$stripe_params['return_url']                              = $this->get_stripe_return_url();
-		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint( '%%endpoint%%' );
-		$stripe_params['stripe_nonce']                            = wp_create_nonce( '_wc_stripe_nonce' );
+		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint('%%endpoint%%');
+		$stripe_params['stripe_nonce']                            = wp_create_nonce('_wc_stripe_nonce');
 		$stripe_params['statement_descriptor']                    = $this->statement_descriptor;
-		$stripe_params['elements_options']                        = apply_filters( 'wc_stripe_elements_options', array() );
+		$stripe_params['elements_options']                        = apply_filters('wc_stripe_elements_options', array());
 		$stripe_params['is_stripe_checkout']                      = $this->stripe_checkout ? 'yes' : 'no';
-		$stripe_params['is_change_payment_page']                  = isset( $_GET['change_payment_method'] ) ? 'yes' : 'no';
-		$stripe_params['is_add_payment_page']                     = is_wc_endpoint_url( 'add-payment-method' ) ? 'yes' : 'no';
-		$stripe_params['is_pay_for_order_page']                   = is_wc_endpoint_url( 'order-pay' ) ? 'yes' : 'no';
-		$stripe_params['elements_styling']                        = apply_filters( 'wc_stripe_elements_styling', false );
-		$stripe_params['elements_classes']                        = apply_filters( 'wc_stripe_elements_classes', false );
+		$stripe_params['is_change_payment_page']                  = isset($_GET['change_payment_method']) ? 'yes' : 'no';
+		$stripe_params['is_add_payment_page']                     = is_wc_endpoint_url('add-payment-method') ? 'yes' : 'no';
+		$stripe_params['is_pay_for_order_page']                   = is_wc_endpoint_url('order-pay') ? 'yes' : 'no';
+		$stripe_params['elements_styling']                        = apply_filters('wc_stripe_elements_styling', false);
+		$stripe_params['elements_classes']                        = apply_filters('wc_stripe_elements_classes', false);
 
 		// merge localized messages to be use in JS
-		$stripe_params = array_merge( $stripe_params, WC_Stripe_Helper::get_localized_messages() );
+		$stripe_params = array_merge($stripe_params, WC_Stripe_Helper::get_localized_messages());
 
-		wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
-		wp_localize_script( 'woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
+		wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
+		wp_localize_script('woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
 
-		if ( $this->stripe_checkout ) {
-			wp_enqueue_script( 'stripe_checkout' );
+		if ($this->stripe_checkout) {
+			wp_enqueue_script('stripe_checkout');
 		}
 
 		$this->tokenization_script();
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
@@ -527,71 +527,71 @@ 
 	 *
 	 * @since 4.1.0
 	 */
-	public function stripe_checkout_receipt_page( $order_id ) {
-		if ( ! $this->stripe_checkout ) {
+	public function stripe_checkout_receipt_page($order_id) {
+		if ( ! $this->stripe_checkout) {
 			return;
 		}
 
 		$user                 = wp_get_current_user();
 		$total                = WC()->cart->total;
 		$user_email           = '';
-		$display_tokenization = $this->supports( 'tokenization' ) && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && $this->saved_cards;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( ! empty( $_GET['key'] ) ) {
-			$order      = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if ( ! empty($_GET['key'])) {
+			$order      = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total      = $order->get_total();
 			$user_email = WC_Stripe_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
 		} else {
-			if ( $user->ID ) {
-				$user_email = get_user_meta( $user->ID, 'billing_email', true );
+			if ($user->ID) {
+				$user_email = get_user_meta($user->ID, 'billing_email', true);
 				$user_email = $user_email ? $user_email : $user->user_email;
 			}
 		}
 
 		ob_start();
 
-		do_action( 'wc_stripe_checkout_receipt_page_before_form' );
+		do_action('wc_stripe_checkout_receipt_page_before_form');
 
-		echo '<form method="post" class="woocommerce-checkout" action="' . WC()->api_request_url( get_class( $this ) ) . '">';
+		echo '<form method="post" class="woocommerce-checkout" action="' . WC()->api_request_url(get_class($this)) . '">';
 		echo '<div
 			id="stripe-payment-data"
-			data-panel-label="' . esc_attr( apply_filters( 'wc_stripe_checkout_label', '' ) ) . '"
-			data-description="' . esc_attr( strip_tags( $this->stripe_checkout_description ) ) . '"
-			data-email="' . esc_attr( $user_email ) . '"
-			data-verify-zip="' . esc_attr( apply_filters( 'wc_stripe_checkout_verify_zip', false ) ? 'true' : 'false' ) . '"
-			data-billing-address="' . esc_attr( apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'true' : 'false' ) . '"
-			data-shipping-address="' . esc_attr( apply_filters( 'wc_stripe_checkout_require_shipping_address', false ) ? 'true' : 'false' ) . '" 
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-name="' . esc_attr( $this->statement_descriptor ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '"
-			data-image="' . esc_attr( $this->stripe_checkout_image ) . '"
-			data-bitcoin="' . esc_attr( ( $this->bitcoin && $this->capture ) ? 'true' : 'false' ) . '"
-			data-locale="' . esc_attr( apply_filters( 'wc_stripe_checkout_locale', $this->get_locale() ) ) . '"
-			data-three-d-secure="' . esc_attr( $this->three_d_secure ? 'true' : 'false' ) . '"
-			data-allow-remember-me="' . esc_attr( apply_filters( 'wc_stripe_allow_remember_me', true ) ? 'true' : 'false' ) . '">';
-		echo '<input type="hidden" name="order_id" value="' . esc_attr( $order_id ) . '" />';
+			data-panel-label="' . esc_attr(apply_filters('wc_stripe_checkout_label', '')) . '"
+			data-description="' . esc_attr(strip_tags($this->stripe_checkout_description)) . '"
+			data-email="' . esc_attr($user_email) . '"
+			data-verify-zip="' . esc_attr(apply_filters('wc_stripe_checkout_verify_zip', false) ? 'true' : 'false') . '"
+			data-billing-address="' . esc_attr(apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'true' : 'false') . '"
+			data-shipping-address="' . esc_attr(apply_filters('wc_stripe_checkout_require_shipping_address', false) ? 'true' : 'false') . '" 
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-name="' . esc_attr($this->statement_descriptor) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '"
+			data-image="' . esc_attr($this->stripe_checkout_image) . '"
+			data-bitcoin="' . esc_attr(($this->bitcoin && $this->capture) ? 'true' : 'false') . '"
+			data-locale="' . esc_attr(apply_filters('wc_stripe_checkout_locale', $this->get_locale())) . '"
+			data-three-d-secure="' . esc_attr($this->three_d_secure ? 'true' : 'false') . '"
+			data-allow-remember-me="' . esc_attr(apply_filters('wc_stripe_allow_remember_me', true) ? 'true' : 'false') . '">';
+		echo '<input type="hidden" name="order_id" value="' . esc_attr($order_id) . '" />';
 		echo '<input type="hidden" name="stripe_checkout_order" value="yes" />';
 
 		if (
-			apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) &&
-			( ! function_exists( 'wcs_order_contains_subscription' ) || ( function_exists( 'wcs_order_contains_subscription' ) && ! WC_Subscriptions_Cart::cart_contains_subscription() ) ) &&
-			( ! WC_Stripe_Helper::is_pre_orders_exists() || ( WC_Stripe_Helper::is_pre_orders_exists() && ! $this->pre_orders->is_pre_order( $order_id ) ) )
+			apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) &&
+			( ! function_exists('wcs_order_contains_subscription') || (function_exists('wcs_order_contains_subscription') && ! WC_Subscriptions_Cart::cart_contains_subscription())) &&
+			( ! WC_Stripe_Helper::is_pre_orders_exists() || (WC_Stripe_Helper::is_pre_orders_exists() && ! $this->pre_orders->is_pre_order($order_id)))
 		) {
 			$this->save_payment_method_checkbox();
 		}
 
-		wp_nonce_field( 'stripe-checkout-process', 'stripe_checkout_process_nonce' );
+		wp_nonce_field('stripe-checkout-process', 'stripe_checkout_process_nonce');
 
-		do_action( 'wc_stripe_checkout_receipt_page_before_form_submit' );
+		do_action('wc_stripe_checkout_receipt_page_before_form_submit');
 
-		echo '<button type="submit" class="wc-stripe-checkout-button">' . __( 'Place Order', 'woocommerce-gateway-stripe' ) . '</button>';
+		echo '<button type="submit" class="wc-stripe-checkout-button">' . __('Place Order', 'woocommerce-gateway-stripe') . '</button>';
 
-		do_action( 'wc_stripe_checkout_receipt_page_after_form_submit' );
+		do_action('wc_stripe_checkout_receipt_page_after_form_submit');
 
 		echo '</form>';
 
-		do_action( 'wc_stripe_checkout_receipt_page_after_form' );
+		do_action('wc_stripe_checkout_receipt_page_after_form');
 
 		echo '</div>';
 
@@ -604,32 +604,32 @@ 
 	 * @since 4.1.0
 	 */
 	public function stripe_checkout_return_handler() {
-		if ( ! $this->stripe_checkout ) {
+		if ( ! $this->stripe_checkout) {
 			return;
 		}
 
-		if ( ! wp_verify_nonce( $_POST['stripe_checkout_process_nonce'], 'stripe-checkout-process' ) ) {
+		if ( ! wp_verify_nonce($_POST['stripe_checkout_process_nonce'], 'stripe-checkout-process')) {
 			return;
 		}
 
-		$order_id = wc_clean( $_POST['order_id'] );
-		$order    = wc_get_order( $order_id );
+		$order_id = wc_clean($_POST['order_id']);
+		$order    = wc_get_order($order_id);
 
-		do_action( 'wc_stripe_checkout_return_handler', $order );
+		do_action('wc_stripe_checkout_return_handler', $order);
 
-		if ( WC_Stripe_Helper::is_pre_orders_exists() && $this->pre_orders->is_pre_order( $order_id ) && WC_Pre_Orders_Order::order_requires_payment_tokenization( $order_id ) ) {
-			$result = $this->pre_orders->process_pre_order( $order_id );
+		if (WC_Stripe_Helper::is_pre_orders_exists() && $this->pre_orders->is_pre_order($order_id) && WC_Pre_Orders_Order::order_requires_payment_tokenization($order_id)) {
+			$result = $this->pre_orders->process_pre_order($order_id);
 		} else {
-			$result = $this->process_payment( $order_id );
+			$result = $this->process_payment($order_id);
 		}
 
-		if ( 'success' === $result['result'] ) {
-			wp_redirect( $result['redirect'] );
+		if ('success' === $result['result']) {
+			wp_redirect($result['redirect']);
 			exit;
 		}
 
 		// Redirects back to pay order page.
-		wp_safe_redirect( $order->get_checkout_payment_url( true ) );
+		wp_safe_redirect($order->get_checkout_payment_url(true));
 		exit;
 	}
 
@@ -642,9 +642,9 @@ 
 	public function maybe_redirect_stripe_checkout() {
 		return (
 			$this->stripe_checkout &&
-			! isset( $_POST['stripe_checkout_order'] ) &&
+			! isset($_POST['stripe_checkout_order']) &&
 			! $this->is_using_saved_payment_method() &&
-			! is_wc_endpoint_url( 'order-pay' )
+			! is_wc_endpoint_url('order-pay')
 		);
 	}
 
@@ -662,54 +662,54 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false, $previous_error = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false, $previous_error = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( $this->maybe_redirect_stripe_checkout() ) {
-				WC_Stripe_Logger::log( sprintf( 'Redirecting to Stripe Checkout page for order %s', $order_id ) );
+			if ($this->maybe_redirect_stripe_checkout()) {
+				WC_Stripe_Logger::log(sprintf('Redirecting to Stripe Checkout page for order %s', $order_id));
 
 				return array(
 					'result'   => 'success',
-					'redirect' => $order->get_checkout_payment_url( true ),
+					'redirect' => $order->get_checkout_payment_url(true),
 				);
 			}
 
-			if ( $this->maybe_process_pre_orders( $order_id ) ) {
-				return $this->pre_orders->process_pre_order( $order_id );
+			if ($this->maybe_process_pre_orders($order_id)) {
+				return $this->pre_orders->process_pre_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);
 			$source_object   = $prepared_source->source_object;
 
 			// Check if we don't allow prepaid credit cards.
-			if ( ! apply_filters( 'wc_stripe_allow_prepaid_card', true ) && $this->is_prepaid_card( $source_object ) ) {
-				$localized_message = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-				throw new WC_Stripe_Exception( print_r( $source_object, true ), $localized_message );
+			if ( ! apply_filters('wc_stripe_allow_prepaid_card', true) && $this->is_prepaid_card($source_object)) {
+				$localized_message = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+				throw new WC_Stripe_Exception(print_r($source_object, true), $localized_message);
 			}
 
-			if ( empty( $prepared_source->source ) ) {
-				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new WC_Stripe_Exception( print_r( $prepared_source, true ), $localized_message );
+			if (empty($prepared_source->source)) {
+				$localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new WC_Stripe_Exception(print_r($prepared_source, true), $localized_message);
 			}
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
 				/*
 				 * Check if card 3DS is required or optional with 3DS setting.
@@ -718,104 +718,104 @@ 
 				 * Note that if we need to save source, the original source must be first
 				 * attached to a customer in Stripe before it can be charged.
 				 */
-				if ( $this->is_3ds_required( $source_object ) ) {
-					$response = $this->create_3ds_source( $order, $source_object );
+				if ($this->is_3ds_required($source_object)) {
+					$response = $this->create_3ds_source($order, $source_object);
 
-					if ( ! empty( $response->error ) ) {
+					if ( ! empty($response->error)) {
 						$localized_message = $response->error->message;
 
-						$order->add_order_note( $localized_message );
+						$order->add_order_note($localized_message);
 
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 
 					// Update order meta with 3DS source.
-					if ( WC_Stripe_Helper::is_pre_30() ) {
-						update_post_meta( $order_id, '_stripe_source_id', $response->id );
+					if (WC_Stripe_Helper::is_pre_30()) {
+						update_post_meta($order_id, '_stripe_source_id', $response->id);
 					} else {
-						$order->update_meta_data( '_stripe_source_id', $response->id );
+						$order->update_meta_data('_stripe_source_id', $response->id);
 						$order->save();
 					}
 
-					WC_Stripe_Logger::log( 'Info: Redirecting to 3DS...' );
+					WC_Stripe_Logger::log('Info: Redirecting to 3DS...');
 
 					return array(
 						'result'   => 'success',
-						'redirect' => esc_url_raw( $response->redirect->url ),
+						'redirect' => esc_url_raw($response->redirect->url),
 					);
 				}
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				/* If we're doing a retry and source is chargeable, we need to pass
 				 * a different idempotency key and retry for success.
 				 */
-				if ( $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
-					add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+				if ($this->need_update_idempotency_key($source_object, $previous_error)) {
+					add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 				}
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( $this->is_no_such_customer_error( $response->error ) ) {
-						if ( WC_Stripe_Helper::is_pre_30() ) {
-							delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-							delete_post_meta( $order_id, '_stripe_customer_id' );
+					if ($this->is_no_such_customer_error($response->error)) {
+						if (WC_Stripe_Helper::is_pre_30()) {
+							delete_user_meta($order->customer_user, '_stripe_customer_id');
+							delete_post_meta($order_id, '_stripe_customer_id');
 						} else {
-							delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-							$order->delete_meta_data( '_stripe_customer_id' );
+							delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+							$order->delete_meta_data('_stripe_customer_id');
 							$order->save();
 						}
 					}
 
-					if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+					if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-						$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+						$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 						$wc_token->delete();
-						$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 
 					// We want to retry.
-					if ( $this->is_retryable_error( $response->error ) ) {
-						if ( $retry ) {
+					if ($this->is_retryable_error($response->error)) {
+						if ($retry) {
 							// Don't do anymore retries after this.
-							if ( 5 <= $this->retry_interval ) {
-								return $this->process_payment( $order_id, false, $force_save_source, $response->error );
+							if (5 <= $this->retry_interval) {
+								return $this->process_payment($order_id, false, $force_save_source, $response->error);
 							}
 
-							sleep( $this->retry_interval );
+							sleep($this->retry_interval);
 
 							$this->retry_interval++;
 
-							return $this->process_payment( $order_id, true, $force_save_source, $response->error );
+							return $this->process_payment($order_id, true, $force_save_source, $response->error);
 						} else {
-							$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					if ( 'card_error' === $response->error->type ) {
-						$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+					if ('card_error' === $response->error->type) {
+						$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 					} else {
-						$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+						$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 					}
 
-					$order->add_order_note( $localized_message );
+					$order->add_order_note($localized_message);
 
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -826,20 +826,20 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
 			/* translators: error message */
-			$order->update_status( 'failed' );
+			$order->update_status('failed');
 
-			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(
@@ -856,17 +856,17 @@ 
 	 *
 	 * @param int $order_id
 	 */
-	public function display_order_fee( $order_id ) {
-		if ( apply_filters( 'wc_stripe_hide_display_order_fee', false, $order_id ) ) {
+	public function display_order_fee($order_id) {
+		if (apply_filters('wc_stripe_hide_display_order_fee', false, $order_id)) {
 			return;
 		}
 
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 
-		$fee      = WC_Stripe_Helper::get_stripe_fee( $order );
-		$currency = WC_Stripe_Helper::get_stripe_currency( $order );
+		$fee      = WC_Stripe_Helper::get_stripe_fee($order);
+		$currency = WC_Stripe_Helper::get_stripe_currency($order);
 
-		if ( ! $fee || ! $currency ) {
+		if ( ! $fee || ! $currency) {
 			return;
 		}
 
@@ -874,12 +874,12 @@ 
 
 		<tr>
 			<td class="label stripe-fee">
-				<?php echo wc_help_tip( __( 'This represents the fee Stripe collects for the transaction.', 'woocommerce-gateway-stripe' ) ); ?>
-				<?php esc_html_e( 'Stripe Fee:', 'woocommerce-gateway-stripe' ); ?>
+				<?php echo wc_help_tip(__('This represents the fee Stripe collects for the transaction.', 'woocommerce-gateway-stripe')); ?>
+				<?php esc_html_e('Stripe Fee:', 'woocommerce-gateway-stripe'); ?>
 			</td>
 			<td width="1%"></td>
 			<td class="total">
-				-&nbsp;<?php echo wc_price( $fee, array( 'currency' => $currency ) ); ?>
+				-&nbsp;<?php echo wc_price($fee, array('currency' => $currency)); ?>
 			</td>
 		</tr>
 
@@ -893,17 +893,17 @@ 
 	 *
 	 * @param int $order_id
 	 */
-	public function display_order_payout( $order_id ) {
-		if ( apply_filters( 'wc_stripe_hide_display_order_payout', false, $order_id ) ) {
+	public function display_order_payout($order_id) {
+		if (apply_filters('wc_stripe_hide_display_order_payout', false, $order_id)) {
 			return;
 		}
 
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 
-		$net      = WC_Stripe_Helper::get_stripe_net( $order );
-		$currency = WC_Stripe_Helper::get_stripe_currency( $order );
+		$net      = WC_Stripe_Helper::get_stripe_net($order);
+		$currency = WC_Stripe_Helper::get_stripe_currency($order);
 
-		if ( ! $net || ! $currency ) {
+		if ( ! $net || ! $currency) {
 			return;
 		}
 
@@ -911,12 +911,12 @@ 
 
 		<tr>
 			<td class="label stripe-payout">
-				<?php echo wc_help_tip( __( 'This represents the net total that will be credited to your Stripe bank account. This may be in the currency that is set in your Stripe account.', 'woocommerce-gateway-stripe' ) ); ?>
-				<?php esc_html_e( 'Stripe Payout:', 'woocommerce-gateway-stripe' ); ?>
+				<?php echo wc_help_tip(__('This represents the net total that will be credited to your Stripe bank account. This may be in the currency that is set in your Stripe account.', 'woocommerce-gateway-stripe')); ?>
+				<?php esc_html_e('Stripe Payout:', 'woocommerce-gateway-stripe'); ?>
 			</td>
 			<td width="1%"></td>
 			<td class="total">
-				<?php echo wc_price( $net, array( 'currency' => $currency ) ); ?>
+				<?php echo wc_price($net, array('currency' => $currency)); ?>
 			</td>
 		</tr>
 

includes/admin/stripe-settings.php

Spacing +66 added lines, -66 removed lines

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

woocommerce-gateway-stripe.php

Spacing +85 added lines, -85 removed lines

@@ -15,12 +15,12 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! function_exists( 'woothemes_queue_update' ) ) {
-	require_once( 'woo-includes/woo-functions.php' );
+if ( ! function_exists('woothemes_queue_update')) {
+	require_once('woo-includes/woo-functions.php');
 }
 
 /**
@@ -30,24 +30,24 @@ 
  * @return string
  */
 function woocommerce_stripe_missing_wc_notice() {
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 }
 
-if ( ! is_woocommerce_active() ) {
-	add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
+if ( ! is_woocommerce_active()) {
+	add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
 	return;
 }
 
-if ( ! class_exists( 'WC_Stripe' ) ) :
+if ( ! class_exists('WC_Stripe')) :
 	/**
 	 * Required minimums and constants
 	 */
-	define( 'WC_STRIPE_VERSION', '4.1.1' );
-	define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-	define( 'WC_STRIPE_MIN_WC_VER', '2.6.0' );
-	define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
-	define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-	define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+	define('WC_STRIPE_VERSION', '4.1.1');
+	define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+	define('WC_STRIPE_MIN_WC_VER', '2.6.0');
+	define('WC_STRIPE_MAIN_FILE', __FILE__);
+	define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+	define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 
 	class WC_Stripe {
 
@@ -67,7 +67,7 @@ 
 		 * @return Singleton The *Singleton* instance.
 		 */
 		public static function get_instance() {
-			if ( null === self::$instance ) {
+			if (null === self::$instance) {
 				self::$instance = new self();
 			}
 			return self::$instance;
@@ -94,8 +94,8 @@ 
 		 * *Singleton* via the `new` operator from outside of this class.
 		 */
 		private function __construct() {
-			add_action( 'admin_init', array( $this, 'install' ) );
-			add_action( 'plugins_loaded', array( $this, 'init' ) );
+			add_action('admin_init', array($this, 'install'));
+			add_action('plugins_loaded', array($this, 'init'));
 		}
 
 		/**
@@ -105,46 +105,46 @@ 
 		 * @version 4.0.0
 		 */
 		public function init() {
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php' );
-			include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-exception.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-logger.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-helper.php');
+			include_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php');
 
-			load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+			load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-			require_once( dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bitcoin.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-order-handler.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-tokens.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php' );
+			require_once(dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bitcoin.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-order-handler.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-payment-tokens.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-customer.php');
 
-			if ( is_admin() ) {
-				require_once( dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php' );
+			if (is_admin()) {
+				require_once(dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php');
 			}
 
 			// REMOVE IN THE FUTURE.
-			require_once( dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php' );
+			require_once(dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php');
 
-			add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
-			add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-			add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+			add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+			add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+			add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 		}
 
 		/**
@@ -154,8 +154,8 @@ 
 		 * @version 4.0.0
 		 */
 		public function update_plugin_version() {
-			delete_option( 'wc_stripe_version' );
-			update_option( 'wc_stripe_version', WC_STRIPE_VERSION );
+			delete_option('wc_stripe_version');
+			update_option('wc_stripe_version', WC_STRIPE_VERSION);
 		}
 
 		/**
@@ -165,15 +165,15 @@ 
 		 * @version 3.1.0
 		 */
 		public function install() {
-			if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+			if ( ! is_plugin_active(plugin_basename(__FILE__))) {
 				return;
 			}
 
-			if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
-				do_action( 'woocommerce_stripe_updated' );
+			if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
+				do_action('woocommerce_stripe_updated');
 
-				if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-					define( 'WC_STRIPE_INSTALLING', true );
+				if ( ! defined('WC_STRIPE_INSTALLING')) {
+					define('WC_STRIPE_INSTALLING', true);
 				}
 
 				$this->update_plugin_version();
@@ -186,13 +186,13 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function plugin_action_links( $links ) {
+		public function plugin_action_links($links) {
 			$plugin_links = array(
-				'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://woocommerce.com/contact-us/">' . esc_html__( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+				'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__('Docs', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://woocommerce.com/contact-us/">' . esc_html__('Support', 'woocommerce-gateway-stripe') . '</a>',
 			);
-			return array_merge( $plugin_links, $links );
+			return array_merge($plugin_links, $links);
 		}
 
 		/**
@@ -201,8 +201,8 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function add_gateways( $methods ) {
-			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+		public function add_gateways($methods) {
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 				$methods[] = 'WC_Stripe_Subs_Compat';
 				$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
 			} else {
@@ -229,30 +229,30 @@ 
 		 * @since 4.0.0
 		 * @version 4.0.0
 		 */
-		public function filter_gateway_order_admin( $sections ) {
-			unset( $sections['stripe'] );
-			unset( $sections['stripe_bancontact'] );
-			unset( $sections['stripe_sofort'] );
-			unset( $sections['stripe_giropay'] );
-			unset( $sections['stripe_eps'] );
-			unset( $sections['stripe_ideal'] );
-			unset( $sections['stripe_p24'] );
-			unset( $sections['stripe_alipay'] );
-			unset( $sections['stripe_sepa'] );
-			unset( $sections['stripe_bitcoin'] );
-			unset( $sections['stripe_multibanco'] );
+		public function filter_gateway_order_admin($sections) {
+			unset($sections['stripe']);
+			unset($sections['stripe_bancontact']);
+			unset($sections['stripe_sofort']);
+			unset($sections['stripe_giropay']);
+			unset($sections['stripe_eps']);
+			unset($sections['stripe_ideal']);
+			unset($sections['stripe_p24']);
+			unset($sections['stripe_alipay']);
+			unset($sections['stripe_sepa']);
+			unset($sections['stripe_bitcoin']);
+			unset($sections['stripe_multibanco']);
 
 			$sections['stripe']            = 'Stripe';
-			$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
-			$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
-			$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
-			$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
-			$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
-			$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
-			$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
-			$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
-			$sections['stripe_bitcoin']    = __( 'Stripe Bitcoin', 'woocommerce-gateway-stripe' );
-			$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+			$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
+			$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
+			$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
+			$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
+			$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
+			$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
+			$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
+			$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
+			$sections['stripe_bitcoin']    = __('Stripe Bitcoin', 'woocommerce-gateway-stripe');
+			$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 
 			return $sections;
 		}

woo-includes/woo-functions.php

Spacing +2 added lines, -2 removed lines

@@ -2,13 +2,13 @@
 /**
  * Functions used by plugins
  */
-if ( ! class_exists( 'WC_Dependencies' ) )
+if ( ! class_exists('WC_Dependencies'))
 	require_once 'class-wc-dependencies.php';
 
 /**
  * WC Detection
  */
-if ( ! function_exists( 'is_woocommerce_active' ) ) {
+if ( ! function_exists('is_woocommerce_active')) {
 	function is_woocommerce_active() {
 		return WC_Dependencies::woocommerce_active_check();
 	}

Braces +2 added lines, -1 removed lines

@@ -2,8 +2,9 @@
 /**
  * Functions used by plugins
  */
-if ( ! class_exists( 'WC_Dependencies' ) )
+if ( ! class_exists( 'WC_Dependencies' ) ) {
 	require_once 'class-wc-dependencies.php';
+}
 
 /**
  * WC Detection

woo-includes/class-wc-dependencies.php

Spacing +5 added lines, -5 removed lines

@@ -10,17 +10,17 @@
 
 	public static function init() {
 
-		self::$active_plugins = (array) get_option( 'active_plugins', array() );
+		self::$active_plugins = (array) get_option('active_plugins', array());
 
-		if ( is_multisite() )
-			self::$active_plugins = array_merge( self::$active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		if (is_multisite())
+			self::$active_plugins = array_merge(self::$active_plugins, get_site_option('active_sitewide_plugins', array()));
 	}
 
 	public static function woocommerce_active_check() {
 
-		if ( ! self::$active_plugins ) self::init();
+		if ( ! self::$active_plugins) self::init();
 
-		return in_array( 'woocommerce/woocommerce.php', self::$active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', self::$active_plugins );
+		return in_array('woocommerce/woocommerce.php', self::$active_plugins) || array_key_exists('woocommerce/woocommerce.php', self::$active_plugins);
 	}
 
 }

Braces +6 added lines, -3 removed lines

@@ -12,13 +12,16 @@
 
 		self::$active_plugins = (array) get_option( 'active_plugins', array() );
 
-		if ( is_multisite() )
-			self::$active_plugins = array_merge( self::$active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		if ( is_multisite() ) {
+					self::$active_plugins = array_merge( self::$active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		}
 	}
 
 	public static function woocommerce_active_check() {
 
-		if ( ! self::$active_plugins ) self::init();
+		if ( ! self::$active_plugins ) {
+			self::init();
+		}
 
 		return in_array( 'woocommerce/woocommerce.php', self::$active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', self::$active_plugins );
 	}