woocommerce / woocommerce-gateway-stripe

includes/class-wc-gateway-stripe.php

Spacing +222 added lines, -222 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -106,8 +106,8 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe';
-		$this->method_title         = __( 'Stripe', 'woocommerce-gateway-stripe' );
-		$this->method_description   = __( 'Stripe works by adding credit card fields on the checkout and then sending the details to Stripe for verification.', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe', 'woocommerce-gateway-stripe');
+		$this->method_description   = __('Stripe works by adding credit card fields on the checkout and then sending the details to Stripe for verification.', 'woocommerce-gateway-stripe');
 		$this->has_fields           = true;
 		$this->view_transaction_url = 'https://dashboard.stripe.com/payments/%s';
 		$this->supports             = array(
@@ -135,38 +135,38 @@ 
 		$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->capture                = 'yes' === $this->get_option( 'capture', 'yes' );
-		$this->stripe_checkout        = 'yes' === $this->get_option( 'stripe_checkout' );
-		$this->stripe_checkout_locale = $this->get_option( 'stripe_checkout_locale' );
-		$this->stripe_checkout_image  = $this->get_option( 'stripe_checkout_image', '' );
-		$this->saved_cards            = 'yes' === $this->get_option( 'saved_cards' );
-		$this->secret_key             = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
-		$this->publishable_key        = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' );
-		$this->bitcoin                = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' );
-		$this->apple_pay              = 'yes' === $this->get_option( 'apple_pay' );
-		$this->apple_pay_button       = $this->get_option( 'apple_pay_button', 'black' );
-		$this->logging                = 'yes' === $this->get_option( 'logging' );
-		$this->allow_remember_me      = 'yes' === $this->get_option( 'allow_remember_me', 'no' );
-
-		if ( $this->stripe_checkout ) {
-			$this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' );
-		}
-
-		if ( $this->testmode ) {
-			$this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' );
-			$this->description  = trim( $this->description );
-		}
-
-		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->capture                = 'yes' === $this->get_option('capture', 'yes');
+		$this->stripe_checkout        = 'yes' === $this->get_option('stripe_checkout');
+		$this->stripe_checkout_locale = $this->get_option('stripe_checkout_locale');
+		$this->stripe_checkout_image  = $this->get_option('stripe_checkout_image', '');
+		$this->saved_cards            = 'yes' === $this->get_option('saved_cards');
+		$this->secret_key             = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
+		$this->publishable_key        = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key');
+		$this->bitcoin                = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin');
+		$this->apple_pay              = 'yes' === $this->get_option('apple_pay');
+		$this->apple_pay_button       = $this->get_option('apple_pay_button', 'black');
+		$this->logging                = 'yes' === $this->get_option('logging');
+		$this->allow_remember_me      = 'yes' === $this->get_option('allow_remember_me', 'no');
+
+		if ($this->stripe_checkout) {
+			$this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe');
+		}
+
+		if ($this->testmode) {
+			$this->description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing');
+			$this->description  = trim($this->description);
+		}
+
+		WC_Stripe_API::set_secret_key($this->secret_key);
 
 		// Hooks.
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 	}
 
 	/**
@@ -176,24 +176,24 @@ 
 	 * @return string
 	 */
 	public function get_icon() {
-		$ext   = version_compare( WC()->version, '2.6', '>=' ) ? '.svg' : '.png';
-		$style = version_compare( WC()->version, '2.6', '>=' ) ? 'style="margin-left: 0.3em"' : '';
+		$ext   = version_compare(WC()->version, '2.6', '>=') ? '.svg' : '.png';
+		$style = version_compare(WC()->version, '2.6', '>=') ? 'style="margin-left: 0.3em"' : '';
 
-		$icon  = '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext ) . '" alt="Visa" width="32" ' . $style . ' />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext ) . '" alt="Mastercard" width="32" ' . $style . ' />';
-		$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext ) . '" alt="Amex" width="32" ' . $style . ' />';
+		$icon  = '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext) . '" alt="Visa" width="32" ' . $style . ' />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext) . '" alt="Mastercard" width="32" ' . $style . ' />';
+		$icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext) . '" alt="Amex" width="32" ' . $style . ' />';
 
-		if ( 'USD' === get_woocommerce_currency() ) {
-			$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext ) . '" alt="Discover" width="32" ' . $style . ' />';
-			$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext ) . '" alt="JCB" width="32" ' . $style . ' />';
-			$icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext ) . '" alt="Diners" width="32" ' . $style . ' />';
+		if ('USD' === get_woocommerce_currency()) {
+			$icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext) . '" alt="Discover" width="32" ' . $style . ' />';
+			$icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext) . '" alt="JCB" width="32" ' . $style . ' />';
+			$icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext) . '" alt="Diners" width="32" ' . $style . ' />';
 		}
 
-		if ( $this->bitcoin && $this->stripe_checkout ) {
-			$icon .= '<img src="' . WC_HTTPS::force_https_url( plugins_url( '/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE ) ) . '" alt="Bitcoin" width="24" ' . $style . ' />';
+		if ($this->bitcoin && $this->stripe_checkout) {
+			$icon .= '<img src="' . WC_HTTPS::force_https_url(plugins_url('/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE)) . '" alt="Bitcoin" width="24" ' . $style . ' />';
 		}
 
-		return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icon, $this->id);
 	}
 
 	/**
@@ -204,11 +204,11 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_stripe_amount( $total, $currency = '' ) {
-		if ( ! $currency ) {
+	public function get_stripe_amount($total, $currency = '') {
+		if ( ! $currency) {
 			$currency = get_woocommerce_currency();
 		}
-		switch ( strtoupper( $currency ) ) {
+		switch (strtoupper($currency)) {
 			// Zero decimal currencies.
 			case 'BIF' :
 			case 'CLP' :
@@ -225,10 +225,10 @@ 
 			case 'XAF' :
 			case 'XOF' :
 			case 'XPF' :
-				$total = absint( $total );
+				$total = absint($total);
 				break;
 			default :
-				$total = round( $total, 2 ) * 100; // In cents.
+				$total = round($total, 2) * 100; // In cents.
 				break;
 		}
 		return $total;
@@ -238,13 +238,13 @@ 
 	 * Check if SSL is enabled and notify the user
 	 */
 	public function admin_notices() {
-		if ( 'no' === $this->enabled ) {
+		if ('no' === $this->enabled) {
 			return;
 		}
 
 		// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected.
-		if ( ( function_exists( 'wc_site_is_https' ) && ! wc_site_is_https() ) && ( 'no' === get_option( 'woocommerce_force_ssl_checkout' ) && ! class_exists( 'WordPressHTTPS' ) ) ) {
-			echo '<div class="error stripe-ssl-message"><p>' . sprintf( __( 'Stripe is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Stripe will only work in test mode.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) . '</p></div>';
+		if ((function_exists('wc_site_is_https') && ! wc_site_is_https()) && ('no' === get_option('woocommerce_force_ssl_checkout') && ! class_exists('WordPressHTTPS'))) {
+			echo '<div class="error stripe-ssl-message"><p>' . sprintf(__('Stripe is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Stripe will only work in test mode.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout')) . '</p></div>';
 		}
 	}
 
@@ -252,11 +252,11 @@ 
 	 * Check if this gateway is enabled
 	 */
 	public function is_available() {
-		if ( 'yes' === $this->enabled ) {
-			if ( ! $this->testmode && is_checkout() && ! is_ssl() ) {
+		if ('yes' === $this->enabled) {
+			if ( ! $this->testmode && is_checkout() && ! is_ssl()) {
 				return false;
 			}
-			if ( ! $this->secret_key || ! $this->publishable_key ) {
+			if ( ! $this->secret_key || ! $this->publishable_key) {
 				return false;
 			}
 			return true;
@@ -268,9 +268,9 @@ 
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = include( 'settings-stripe.php' );
+		$this->form_fields = include('settings-stripe.php');
 
-		wc_enqueue_js( "
+		wc_enqueue_js("
 			jQuery( function( $ ) {
 				$( document.body ).on( 'change', '#woocommerce_stripe_testmode', function() {
 					var test_secret_key = $( '#woocommerce_stripe_test_secret_key' ).parents( 'tr' ).eq( 0 ),
@@ -315,7 +315,7 @@ 
 					var value = $( this ).val();
 
 					if ( value.indexOf( '_test_' ) >= 0 ) {
-						$( this ).css( 'border-color', 'red' ).after( '<span class=\"description stripe-error-description\" style=\"color:red; display:block;\">" . __( 'This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe' ) . "</span>' );
+						$( this ).css( 'border-color', 'red' ).after( '<span class=\"description stripe-error-description\" style=\"color:red; display:block;\">" . __('This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe') . "</span>' );
 					} else {
 						$( this ).css( 'border-color', '' );
 						$( '.stripe-error-description', $( this ).parent() ).remove();
@@ -326,7 +326,7 @@ 
 					var value = $( this ).val();
 
 					if ( value.indexOf( '_live_' ) >= 0 ) {
-						$( this ).css( 'border-color', 'red' ).after( '<span class=\"description stripe-error-description\" style=\"color:red; display:block;\">" . __( 'This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe' ) . "</span>' );
+						$( this ).css( 'border-color', 'red' ).after( '<span class=\"description stripe-error-description\" style=\"color:red; display:block;\">" . __('This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe') . "</span>' );
 					} else {
 						$( this ).css( 'border-color', '' );
 						$( '.stripe-error-description', $( this ).parent() ).remove();
@@ -341,54 +341,54 @@ 
 	 */
 	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;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && isset( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && isset($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		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;
 		} else {
 			$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');
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-payment-data"
-			data-panel-label="' . esc_attr( $pay_button_text ) . '"
+			data-panel-label="' . esc_attr($pay_button_text) . '"
 			data-description=""
-			data-email="' . esc_attr( $user_email ) . '"
-			data-amount="' . esc_attr( $this->get_stripe_amount( $total ) ) . '"
-			data-name="' . esc_attr( get_bloginfo( 'name', 'display' ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '"
-			data-image="' . esc_attr( $this->stripe_checkout_image ) . '"
-			data-bitcoin="' . esc_attr( $this->bitcoin ? 'true' : 'false' ) . '"
-			data-locale="' . esc_attr( $this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en' ) . '"
-			data-allow-remember-me="' . esc_attr( $this->allow_remember_me ? 'true' : 'false' ) . '">';
+			data-email="' . esc_attr($user_email) . '"
+			data-amount="' . esc_attr($this->get_stripe_amount($total)) . '"
+			data-name="' . esc_attr(get_bloginfo('name', 'display')) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '"
+			data-image="' . esc_attr($this->stripe_checkout_image) . '"
+			data-bitcoin="' . esc_attr($this->bitcoin ? 'true' : 'false') . '"
+			data-locale="' . esc_attr($this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en') . '"
+			data-allow-remember-me="' . esc_attr($this->allow_remember_me ? 'true' : 'false') . '">';
 
-		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)));
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
-		if ( ! $this->stripe_checkout ) {
+		if ( ! $this->stripe_checkout) {
 			$this->form();
 
-			if ( $display_tokenization ) {
+			if ($display_tokenization) {
 				$this->save_payment_method_checkbox();
 			}
 		}
@@ -404,20 +404,20 @@ 
 	 * @return array
 	 */
 	public function get_localized_messages() {
-		return apply_filters( 'wc_stripe_localized_messages', array(
-			'invalid_number'        => __( 'The card number is not a valid credit card number.', 'woocommerce-gateway-stripe' ),
-			'invalid_expiry_month'  => __( 'The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe' ),
-			'invalid_expiry_year'   => __( 'The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe' ),
-			'invalid_cvc'           => __( 'The card\'s security code is invalid.', 'woocommerce-gateway-stripe' ),
-			'incorrect_number'      => __( 'The card number is incorrect.', 'woocommerce-gateway-stripe' ),
-			'expired_card'          => __( 'The card has expired.', 'woocommerce-gateway-stripe' ),
-			'incorrect_cvc'         => __( 'The card\'s security code is incorrect.', 'woocommerce-gateway-stripe' ),
-			'incorrect_zip'         => __( 'The card\'s zip code failed validation.', 'woocommerce-gateway-stripe' ),
-			'card_declined'         => __( 'The card was declined.', 'woocommerce-gateway-stripe' ),
-			'missing'               => __( 'There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe' ),
-			'processing_error'      => __( 'An error occurred while processing the card.', 'woocommerce-gateway-stripe' ),
-			'invalid_request_error' => __( 'Could not find payment information.', 'woocommerce-gateway-stripe' ),
-			) );
+		return apply_filters('wc_stripe_localized_messages', array(
+			'invalid_number'        => __('The card number is not a valid credit card number.', 'woocommerce-gateway-stripe'),
+			'invalid_expiry_month'  => __('The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe'),
+			'invalid_expiry_year'   => __('The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe'),
+			'invalid_cvc'           => __('The card\'s security code is invalid.', 'woocommerce-gateway-stripe'),
+			'incorrect_number'      => __('The card number is incorrect.', 'woocommerce-gateway-stripe'),
+			'expired_card'          => __('The card has expired.', 'woocommerce-gateway-stripe'),
+			'incorrect_cvc'         => __('The card\'s security code is incorrect.', 'woocommerce-gateway-stripe'),
+			'incorrect_zip'         => __('The card\'s zip code failed validation.', 'woocommerce-gateway-stripe'),
+			'card_declined'         => __('The card was declined.', 'woocommerce-gateway-stripe'),
+			'missing'               => __('There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe'),
+			'processing_error'      => __('An error occurred while processing the card.', 'woocommerce-gateway-stripe'),
+			'invalid_request_error' => __('Could not find payment information.', 'woocommerce-gateway-stripe'),
+			));
 	}
 
 	/**
@@ -428,30 +428,30 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		if ( $this->stripe_checkout ) {
-			wp_enqueue_script( 'stripe_checkout', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true );
-			wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe_checkout' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'stripe' ), WC_STRIPE_VERSION, true );
+		if ($this->stripe_checkout) {
+			wp_enqueue_script('stripe_checkout', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true);
+			wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe_checkout' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('stripe'), WC_STRIPE_VERSION, true);
 		} else {
-			wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '1.0', true );
-			wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripe' ), WC_STRIPE_VERSION, true );
+			wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '1.0', true);
+			wp_enqueue_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'] = $order->billing_first_name;
 			$stripe_params['billing_last_name']  = $order->billing_last_name;
@@ -463,14 +463,14 @@ 
 			$stripe_params['billing_country']    = $order->billing_country;
 		}
 
-		$stripe_params['no_prepaid_card_msg']                     = __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' );
-		$stripe_params['allow_prepaid_card']                      = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no';
-		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'yes' : 'no';
+		$stripe_params['no_prepaid_card_msg']                     = __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe');
+		$stripe_params['allow_prepaid_card']                      = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no';
+		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'yes' : 'no';
 
 		// merge localized messages to be use in JS
-		$stripe_params = array_merge( $stripe_params, $this->get_localized_messages() );
+		$stripe_params = array_merge($stripe_params, $this->get_localized_messages());
 
-		wp_localize_script( 'woocommerce_stripe', '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));
 	}
 
 	/**
@@ -479,24 +479,24 @@ 
 	 * @param  object $source
 	 * @return array()
 	 */
-	protected function generate_payment_request( $order, $source ) {
+	protected function generate_payment_request($order, $source) {
 		$post_data                = array();
-		$post_data['currency']    = strtolower( $order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency() );
-		$post_data['amount']      = $this->get_stripe_amount( $order->get_total(), $post_data['currency'] );
-		$post_data['description'] = sprintf( __( '%s - Order %s', 'woocommerce-gateway-stripe' ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), $order->get_order_number() );
+		$post_data['currency']    = strtolower($order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency());
+		$post_data['amount']      = $this->get_stripe_amount($order->get_total(), $post_data['currency']);
+		$post_data['description'] = sprintf(__('%s - Order %s', 'woocommerce-gateway-stripe'), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), $order->get_order_number());
 		$post_data['capture']     = $this->capture ? 'true' : 'false';
 
-		if ( ! empty( $order->billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) {
+		if ( ! empty($order->billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) {
 			$post_data['receipt_email'] = $order->billing_email;
 		}
 
-		$post_data['expand[]']    = 'balance_transaction';
+		$post_data['expand[]'] = 'balance_transaction';
 
-		if ( $source->customer ) {
+		if ($source->customer) {
 			$post_data['customer'] = $source->customer;
 		}
 
-		if ( $source->source ) {
+		if ($source->source) {
 			$post_data['source'] = $source->source;
 		}
 		
@@ -508,7 +508,7 @@ 
 		 * @param WC_Order $order
 		 * @param object $source
 		 */
-		return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source );
+		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source);
 	}
 
 	/**
@@ -520,22 +520,22 @@ 
 	 * @throws Exception When card was not added or for and invalid card.
 	 * @return object
 	 */
-	protected function get_source( $user_id, $force_customer = false ) {
-		$stripe_customer = new WC_Stripe_Customer( $user_id );
+	protected function get_source($user_id, $force_customer = false) {
+		$stripe_customer = new WC_Stripe_Customer($user_id);
 		$stripe_source   = false;
 		$token_id        = false;
 
 		// New CC info was entered and we have a new token to process
-		if ( isset( $_POST['stripe_token'] ) ) {
-			$stripe_token     = wc_clean( $_POST['stripe_token'] );
-			$maybe_saved_card = isset( $_POST['wc-stripe-new-payment-method'] ) && ! empty( $_POST['wc-stripe-new-payment-method'] );
+		if (isset($_POST['stripe_token'])) {
+			$stripe_token     = wc_clean($_POST['stripe_token']);
+			$maybe_saved_card = isset($_POST['wc-stripe-new-payment-method']) && ! empty($_POST['wc-stripe-new-payment-method']);
 
 			// This is true if the user wants to store the card to their account.
-			if ( ( $user_id && $this->saved_cards && $maybe_saved_card ) || $force_customer ) {
-				$stripe_source = $stripe_customer->add_card( $stripe_token );
+			if (($user_id && $this->saved_cards && $maybe_saved_card) || $force_customer) {
+				$stripe_source = $stripe_customer->add_card($stripe_token);
 
-				if ( is_wp_error( $stripe_source ) ) {
-					throw new Exception( $stripe_source->get_error_message() );
+				if (is_wp_error($stripe_source)) {
+					throw new Exception($stripe_source->get_error_message());
 				}
 
 			} else {
@@ -546,13 +546,13 @@ 
 		}
 
 		// Use an existing token, and then process the payment
-		elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) {
-			$token_id = wc_clean( $_POST['wc-stripe-payment-token'] );
-			$token    = WC_Payment_Tokens::get( $token_id );
+		elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) {
+			$token_id = wc_clean($_POST['wc-stripe-payment-token']);
+			$token    = WC_Payment_Tokens::get($token_id);
 
-			if ( ! $token || $token->get_user_id() !== get_current_user_id() ) {
-				WC()->session->set( 'refresh_totals', true );
-				throw new Exception( __( 'Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe' ) );
+			if ( ! $token || $token->get_user_id() !== get_current_user_id()) {
+				WC()->session->set('refresh_totals', true);
+				throw new Exception(__('Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe'));
 			}
 
 			$stripe_source = $token->get_token();
@@ -576,16 +576,16 @@ 
 	 * @param object $order
 	 * @return object
 	 */
-	protected function get_order_source( $order = null ) {
+	protected function get_order_source($order = null) {
 		$stripe_customer = new WC_Stripe_Customer();
 		$stripe_source   = false;
 		$token_id        = false;
 
-		if ( $order ) {
-			if ( $meta_value = get_post_meta( $order->id, '_stripe_customer_id', true ) ) {
-				$stripe_customer->set_id( $meta_value );
+		if ($order) {
+			if ($meta_value = get_post_meta($order->id, '_stripe_customer_id', true)) {
+				$stripe_customer->set_id($meta_value);
 			}
-			if ( $meta_value = get_post_meta( $order->id, '_stripe_card_id', true ) ) {
+			if ($meta_value = get_post_meta($order->id, '_stripe_card_id', true)) {
 				$stripe_source = $meta_value;
 			}
 		}
@@ -608,50 +608,50 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_customer = false ) {
+	public function process_payment($order_id, $retry = true, $force_customer = false) {
 		try {
-			$order  = wc_get_order( $order_id );
-			$source = $this->get_source( get_current_user_id(), $force_customer );
+			$order  = wc_get_order($order_id);
+			$source = $this->get_source(get_current_user_id(), $force_customer);
 
-			if ( empty( $source->source ) && empty( $source->customer ) ) {
-				$error_msg = __( 'Please enter your card details to make a payment.', 'woocommerce-gateway-stripe' );
-				$error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe' );
-				throw new Exception( $error_msg );
+			if (empty($source->source) && empty($source->customer)) {
+				$error_msg = __('Please enter your card details to make a payment.', 'woocommerce-gateway-stripe');
+				$error_msg .= ' ' . __('Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe');
+				throw new Exception($error_msg);
 			}
 
 			// Store source to order meta.
-			$this->save_source( $order, $source );
+			$this->save_source($order, $source);
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe::get_minimum_amount() ) {
-					throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe::get_minimum_amount()) {
+					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100)));
 				}
 
-				WC_Stripe::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe::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, $source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
 
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( 'customer' === $response->get_error_code() && $retry ) {
-						delete_user_meta( get_current_user_id(), '_stripe_customer_id' );
-						return $this->process_payment( $order_id, false, $force_customer );
+					if ('customer' === $response->get_error_code() && $retry) {
+						delete_user_meta(get_current_user_id(), '_stripe_customer_id');
+						return $this->process_payment($order_id, false, $force_customer);
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					} elseif ( 'source' === $response->get_error_code() && $source->token_id ) {
-						$token = WC_Payment_Tokens::get( $source->token_id );
+					} elseif ('source' === $response->get_error_code() && $source->token_id) {
+						$token = WC_Payment_Tokens::get($source->token_id);
 						$token->delete();
-						throw new Exception( __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' ) );
+						throw new Exception(__('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe'));
 					}
 					$localized_messages = $this->get_localized_messages();
 
-					throw new Exception( ( isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message() ) );
+					throw new Exception((isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message()));
 				}
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -659,23 +659,23 @@ 
 			// Remove cart.
 			WC()->cart->empty_cart();
 
-			do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 			// 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::log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe::log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage()));
 
-			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);
 			}
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
 			return array(
 				'result'   => 'fail',
@@ -690,52 +690,52 @@ 
 	 * @param WC_Order $order For to which the source applies.
 	 * @param stdClass $source Source information.
 	 */
-	protected function save_source( $order, $source ) {
+	protected function save_source($order, $source) {
 		// Store source in the order.
-		if ( $source->customer ) {
-			update_post_meta( $order->id, '_stripe_customer_id', $source->customer );
+		if ($source->customer) {
+			update_post_meta($order->id, '_stripe_customer_id', $source->customer);
 		}
-		if ( $source->source ) {
-			update_post_meta( $order->id, '_stripe_card_id', $source->source );
+		if ($source->source) {
+			update_post_meta($order->id, '_stripe_card_id', $source->source);
 		}
 	}
 
 	/**
 	 * Store extra meta data for an order from a Stripe Response.
 	 */
-	public function process_response( $response, $order ) {
-		WC_Stripe::log( "Processing response: " . print_r( $response, true ) );
+	public function process_response($response, $order) {
+		WC_Stripe::log("Processing response: " . print_r($response, true));
 
 		// Store charge data
-		update_post_meta( $order->id, '_stripe_charge_id', $response->id );
-		update_post_meta( $order->id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no' );
+		update_post_meta($order->id, '_stripe_charge_id', $response->id);
+		update_post_meta($order->id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no');
 
 		// Store other data such as fees
-		if ( isset( $response->balance_transaction ) && isset( $response->balance_transaction->fee ) ) {
+		if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) {
 			// Fees and Net needs to both come from Stripe to be accurate as the returned
 			// values are in the local currency of the Stripe account, not from WC.
-			$fee = ! empty( $response->balance_transaction->fee ) ? number_format( $response->balance_transaction->fee / 100, 2, '.', '' ) : 0;
-			$net = ! empty( $response->balance_transaction->net ) ? number_format( $response->balance_transaction->net / 100, 2, '.', '' ) : 0;
-			update_post_meta( $order->id, 'Stripe Fee', $fee );
-			update_post_meta( $order->id, 'Net Revenue From Stripe', $net );
+			$fee = ! empty($response->balance_transaction->fee) ? number_format($response->balance_transaction->fee / 100, 2, '.', '') : 0;
+			$net = ! empty($response->balance_transaction->net) ? number_format($response->balance_transaction->net / 100, 2, '.', '') : 0;
+			update_post_meta($order->id, 'Stripe Fee', $fee);
+			update_post_meta($order->id, 'Net Revenue From Stripe', $net);
 		}
 
-		if ( $response->captured ) {
-			$order->payment_complete( $response->id );
+		if ($response->captured) {
+			$order->payment_complete($response->id);
 
-			$message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id );
-			$order->add_order_note( $message );
-			WC_Stripe::log( 'Success: ' . $message );
+			$message = sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $response->id);
+			$order->add_order_note($message);
+			WC_Stripe::log('Success: ' . $message);
 
 		} else {
-			add_post_meta( $order->id, '_transaction_id', $response->id, true );
+			add_post_meta($order->id, '_transaction_id', $response->id, true);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
+			if ($order->has_status(array('pending', 'failed'))) {
 				$order->reduce_order_stock();
 			}
 
-			$order->update_status( 'on-hold', sprintf( __( 'Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe' ), $response->id ) );
-			WC_Stripe::log( "Successful auth: $response->id" );
+			$order->update_status('on-hold', sprintf(__('Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe'), $response->id));
+			WC_Stripe::log("Successful auth: $response->id");
 		}
 
 		return $response;
@@ -747,32 +747,32 @@ 
 	 * @since 3.0.0
 	 */
 	public function add_payment_method() {
-		if ( empty( $_POST['stripe_token'] ) || ! is_user_logged_in() ) {
-			wc_add_notice( __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' ), 'error' );
+		if (empty($_POST['stripe_token']) || ! is_user_logged_in()) {
+			wc_add_notice(__('There was a problem adding the card.', 'woocommerce-gateway-stripe'), 'error');
 			return;
 		}
 
-		$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-		$card            = $stripe_customer->add_card( wc_clean( $_POST['stripe_token'] ) );
+		$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+		$card            = $stripe_customer->add_card(wc_clean($_POST['stripe_token']));
 
-		if ( is_wp_error( $card ) ) {
+		if (is_wp_error($card)) {
 			$localized_messages = $this->get_localized_messages();
-			$error_msg = __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' );
+			$error_msg = __('There was a problem adding the card.', 'woocommerce-gateway-stripe');
 
 			// loop through the errors to find matching localized message
-			foreach ( $card->errors as $error => $msg ) {
-				if ( isset( $localized_messages[ $error ] ) ) {
-					$error_msg = $localized_messages[ $error ];
+			foreach ($card->errors as $error => $msg) {
+				if (isset($localized_messages[$error])) {
+					$error_msg = $localized_messages[$error];
 				}
 			}
 
-			wc_add_notice( $error_msg, 'error' );
+			wc_add_notice($error_msg, 'error');
 			return;
 		}
 
 		return array(
 			'result'   => 'success',
-			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
+			'redirect' => wc_get_endpoint_url('payment-methods'),
 		);
 	}
 
@@ -782,36 +782,36 @@ 
 	 * @param  float $amount
 	 * @return bool
 	 */
-	public function process_refund( $order_id, $amount = null, $reason = '' ) {
-		$order = wc_get_order( $order_id );
+	public function process_refund($order_id, $amount = null, $reason = '') {
+		$order = wc_get_order($order_id);
 
-		if ( ! $order || ! $order->get_transaction_id() ) {
+		if ( ! $order || ! $order->get_transaction_id()) {
 			return false;
 		}
 
 		$body = array();
 
-		if ( ! is_null( $amount ) ) {
-			$body['amount']	= $this->get_stripe_amount( $amount );
+		if ( ! is_null($amount)) {
+			$body['amount'] = $this->get_stripe_amount($amount);
 		}
 
-		if ( $reason ) {
+		if ($reason) {
 			$body['metadata'] = array(
 				'reason'	=> $reason,
 			);
 		}
 
-		WC_Stripe::log( "Info: Beginning refund for order $order_id for the amount of {$amount}" );
+		WC_Stripe::log("Info: Beginning refund for order $order_id for the amount of {$amount}");
 
-		$response = WC_Stripe_API::request( $body, 'charges/' . $order->get_transaction_id() . '/refunds' );
+		$response = WC_Stripe_API::request($body, 'charges/' . $order->get_transaction_id() . '/refunds');
 
-		if ( is_wp_error( $response ) ) {
-			WC_Stripe::log( "Error: " . $response->get_error_message() );
+		if (is_wp_error($response)) {
+			WC_Stripe::log("Error: " . $response->get_error_message());
 			return $response;
-		} elseif ( ! empty( $response->id ) ) {
-			$refund_message = sprintf( __( 'Refunded %s - Refund ID: %s - Reason: %s', 'woocommerce-gateway-stripe' ), wc_price( $response->amount / 100 ), $response->id, $reason );
-			$order->add_order_note( $refund_message );
-			WC_Stripe::log( "Success: " . html_entity_decode( strip_tags( $refund_message ) ) );
+		} elseif ( ! empty($response->id)) {
+			$refund_message = sprintf(__('Refunded %s - Refund ID: %s - Reason: %s', 'woocommerce-gateway-stripe'), wc_price($response->amount / 100), $response->id, $reason);
+			$order->add_order_note($refund_message);
+			WC_Stripe::log("Success: " . html_entity_decode(strip_tags($refund_message)));
 			return true;
 		}
 	}
@@ -824,10 +824,10 @@ 
 	 * @param int $order_id
 	 * @return null
 	 */
-	public function send_failed_order_email( $order_id ) {
+	public function send_failed_order_email($order_id) {
 		$emails = WC()->mailer()->get_emails();
-		if ( ! empty( $emails ) && ! empty( $order_id ) ) {
-			$emails['WC_Email_Failed_Order']->trigger( $order_id );
+		if ( ! empty($emails) && ! empty($order_id)) {
+			$emails['WC_Email_Failed_Order']->trigger($order_id);
 		}
 	}
 }

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

Spacing +125 added lines, -125 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -40,7 +40,7 @@ 
 	public function __construct() {
 		self::$_this = $this;
 
-		$this->_gateway_settings = get_option( 'woocommerce_stripe_settings', '' );
+		$this->_gateway_settings = get_option('woocommerce_stripe_settings', '');
 
 		$this->init();
 	}
@@ -57,15 +57,15 @@ 
 	 * @version 3.1.0
 	 */
 	public function init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_apple_pay_button' ), 20 );
-		add_action( 'woocommerce_review_order_before_payment', array( $this, 'display_apple_pay_button' ) );
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('woocommerce_proceed_to_checkout', array($this, 'display_apple_pay_button'), 20);
+		add_action('woocommerce_review_order_before_payment', array($this, 'display_apple_pay_button'));
 		
-		if ( is_admin() ) {
-			add_action( 'wp_ajax_wc_stripe_apple_pay', array( $this, 'process_apple_pay' ) );
-			add_action( 'wp_ajax_nopriv_wc_stripe_apple_pay', array( $this, 'process_apple_pay' ) );
-			add_action( 'wp_ajax_wc_stripe_generate_apple_pay_cart', array( $this, 'generate_apple_pay_cart' ) );
-			add_action( 'wp_ajax_nopriv_wc_stripe_generate_apple_pay_cart', array( $this, 'generate_apple_pay_cart' ) );
+		if (is_admin()) {
+			add_action('wp_ajax_wc_stripe_apple_pay', array($this, 'process_apple_pay'));
+			add_action('wp_ajax_nopriv_wc_stripe_apple_pay', array($this, 'process_apple_pay'));
+			add_action('wp_ajax_wc_stripe_generate_apple_pay_cart', array($this, 'generate_apple_pay_cart'));
+			add_action('wp_ajax_nopriv_wc_stripe_generate_apple_pay_cart', array($this, 'generate_apple_pay_cart'));
 		}
 	}
 
@@ -76,38 +76,38 @@ 
 	 * @version 3.1.0
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( ! $this->is_supported_product_type() ) {
+		if ( ! $this->is_supported_product_type()) {
 			return;
 		}
 		
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 		
-		wp_enqueue_style( 'stripe_apple_pay', plugins_url( 'assets/css/stripe-apple-pay.css', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION );
+		wp_enqueue_style('stripe_apple_pay', plugins_url('assets/css/stripe-apple-pay.css', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION);
 
-		wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '1.0', true );
-		wp_enqueue_script( 'woocommerce_stripe_apple_pay', plugins_url( 'assets/js/stripe-apple-pay' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '1.0', true);
+		wp_enqueue_script('woocommerce_stripe_apple_pay', plugins_url('assets/js/stripe-apple-pay' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('stripe'), WC_STRIPE_VERSION, true);
 
 		$publishable_key = 'yes' === $this->_gateway_settings['testmode'] ? $this->_gateway_settings['test_publishable_key'] : $this->_gateway_settings['publishable_key'];
 
 		$stripe_params = array(
 			'key'                         => $publishable_key,
 			'currency_code'               => get_woocommerce_currency(),
-			'country_code'                => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
-			'label'                       => get_bloginfo( 'name', 'display' ),
-			'ajaxurl'                     => admin_url( 'admin-ajax.php' ),
-			'stripe_apple_pay_nonce'      => wp_create_nonce( '_wc_stripe_apple_pay_nonce' ),
-			'stripe_apple_pay_cart_nonce' => wp_create_nonce( '_wc_stripe_apple_pay_cart_nonce' ),
+			'country_code'                => substr(get_option('woocommerce_default_country'), 0, 2),
+			'label'                       => get_bloginfo('name', 'display'),
+			'ajaxurl'                     => admin_url('admin-ajax.php'),
+			'stripe_apple_pay_nonce'      => wp_create_nonce('_wc_stripe_apple_pay_nonce'),
+			'stripe_apple_pay_cart_nonce' => wp_create_nonce('_wc_stripe_apple_pay_cart_nonce'),
 			'needs_shipping'              => WC()->cart->needs_shipping() ? 'yes' : 'no',
-			'needs_shipping_msg'          => __( 'Please first calculate your shipping.', 'woocommerce-gateway-stripe' ),
+			'needs_shipping_msg'          => __('Please first calculate your shipping.', 'woocommerce-gateway-stripe'),
 			'is_cart_page'                => is_cart() ? 'yes' : 'no',
 			'chosen_shipping'             => wc_get_chosen_shipping_method_ids(),
 		);
 
-		wp_localize_script( 'woocommerce_stripe_apple_pay', 'wc_stripe_apple_pay_params', apply_filters( 'wc_stripe_apple_pay_params', $stripe_params ) );
+		wp_localize_script('woocommerce_stripe_apple_pay', 'wc_stripe_apple_pay_params', apply_filters('wc_stripe_apple_pay_params', $stripe_params));
 	}
 		
 	/**
@@ -115,8 +115,8 @@ 
 	 *
 	 */
 	public function is_supported_product_type() {
-		foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
-			if ( 'subscription' === $values['data']->product_type ) {
+		foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
+			if ('subscription' === $values['data']->product_type) {
 				return false;
 			}
 		}
@@ -139,19 +139,19 @@ 
 		 */
 		if ( 
 			'yes' !== $this->_gateway_settings['apple_pay']
-			|| ! isset( $gateways['stripe'] ) 
+			|| ! isset($gateways['stripe']) 
 		) {
 			return;
 		}
 
-		if ( ! $this->is_supported_product_type() ) {
+		if ( ! $this->is_supported_product_type()) {
 			return;
 		}
 
-		$apple_pay_button = ! empty( $this->_gateway_settings['apple_pay_button'] ) ? $this->_gateway_settings['apple_pay_button'] : 'black';
-		$country = strtolower( substr( get_option( 'woocommerce_default_country' ), 0, 2 ) );
+		$apple_pay_button = ! empty($this->_gateway_settings['apple_pay_button']) ? $this->_gateway_settings['apple_pay_button'] : 'black';
+		$country = strtolower(substr(get_option('woocommerce_default_country'), 0, 2));
 		?>
-		<button class="apple-pay-button" lang="<?php echo esc_attr( $country ); ?>" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: buy; -apple-pay-button-style: <?php echo esc_attr( $apple_pay_button ); ?>;"></button>
+		<button class="apple-pay-button" lang="<?php echo esc_attr($country); ?>" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: buy; -apple-pay-button-style: <?php echo esc_attr($apple_pay_button); ?>;"></button>
 		<?php
 	}
 
@@ -162,15 +162,15 @@ 
 	 * @version 3.1.0
 	 */
 	public function generate_apple_pay_cart() {
-		if ( ! defined( 'DOING_AJAX' ) ) {
-			define( 'DOING_AJAX', true );
+		if ( ! defined('DOING_AJAX')) {
+			define('DOING_AJAX', true);
 		}
 
-		if ( ! wp_verify_nonce( $_POST['nonce'], '_wc_stripe_apple_pay_cart_nonce' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+		if ( ! wp_verify_nonce($_POST['nonce'], '_wc_stripe_apple_pay_cart_nonce')) {
+			wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 		}
 
-		wp_send_json( array( 'line_items' => $this->build_line_items(), 'total' => WC()->cart->total, 'chosen_shipping' => wc_get_chosen_shipping_method_ids() ) );
+		wp_send_json(array('line_items' => $this->build_line_items(), 'total' => WC()->cart->total, 'chosen_shipping' => wc_get_chosen_shipping_method_ids()));
 	}
 
 	/**
@@ -181,39 +181,39 @@ 
 	 * @version 3.1.0
 	 */
 	public function process_apple_pay() {
-		if ( ! defined( 'DOING_AJAX' ) ) {
-			define( 'DOING_AJAX', true );
+		if ( ! defined('DOING_AJAX')) {
+			define('DOING_AJAX', true);
 		}
 
-		if ( ! wp_verify_nonce( $_POST['nonce'], '_wc_stripe_apple_pay_nonce' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+		if ( ! wp_verify_nonce($_POST['nonce'], '_wc_stripe_apple_pay_nonce')) {
+			wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 		}
 
 		try {
-			$result = array_map( 'wc_clean', $_POST['result'] );
+			$result = array_map('wc_clean', $_POST['result']);
 
-			$order = $this->create_order( $result );
+			$order = $this->create_order($result);
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe::get_minimum_amount() ) {
-					return new WP_Error( 'stripe_error', sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe::get_minimum_amount()) {
+					return new WP_Error('stripe_error', sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100)));
 				}
 
-				WC_Stripe::log( "Info: Begin processing payment for order $order->id for the amount of {$order->get_total()}" );
+				WC_Stripe::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, $result['token']['id'] ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $result['token']['id']));
 
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					$localized_messages = $this->get_localized_messages();
 
-					throw new Exception( ( isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message() ) );
+					throw new Exception((isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message()));
 				}
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -221,23 +221,23 @@ 
 			// Remove cart.
 			WC()->cart->empty_cart();
 
-			update_post_meta( $order->id, '_customer_user', get_current_user_id() );
+			update_post_meta($order->id, '_customer_user', get_current_user_id());
 
 			// Return thank you page redirect.
-			wp_send_json( array(
+			wp_send_json(array(
 				'success'  => 'true',
-				'redirect' => $this->get_return_url( $order ),
-			) );
+				'redirect' => $this->get_return_url($order),
+			));
 
-		} catch ( Exception $e ) {
-			WC()->session->set( 'refresh_totals', true );
-			WC_Stripe::log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) );
+		} catch (Exception $e) {
+			WC()->session->set('refresh_totals', true);
+			WC_Stripe::log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage()));
 
-			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);
 			}
 
-			wp_send_json( array( 'success' => 'false', 'msg' => $e->getMessage() ) );
+			wp_send_json(array('success' => 'false', 'msg' => $e->getMessage()));
 		}
 	}
 
@@ -247,14 +247,14 @@ 
 	 * @param string $source token
 	 * @return array()
 	 */
-	protected function generate_payment_request( $order, $source ) {
+	protected function generate_payment_request($order, $source) {
 		$post_data                = array();
-		$post_data['currency']    = strtolower( $order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency() );
-		$post_data['amount']      = $this->get_stripe_amount( $order->get_total(), $post_data['currency'] );
-		$post_data['description'] = sprintf( __( '%s - Order %s', 'woocommerce-gateway-stripe' ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), $order->get_order_number() );
+		$post_data['currency']    = strtolower($order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency());
+		$post_data['amount']      = $this->get_stripe_amount($order->get_total(), $post_data['currency']);
+		$post_data['description'] = sprintf(__('%s - Order %s', 'woocommerce-gateway-stripe'), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), $order->get_order_number());
 		$post_data['capture']     = 'yes' === $this->_gateway_settings['capture'] ? 'true' : 'false';
 
-		if ( ! empty( $order->billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) {
+		if ( ! empty($order->billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) {
 			$post_data['receipt_email'] = $order->billing_email;
 		}
 
@@ -269,7 +269,7 @@ 
 		 * @param WC_Order $order
 		 * @param object $source
 		 */
-		return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order );
+		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order);
 	}
 
 	/**
@@ -279,49 +279,49 @@ 
 	 * @version 3.1.0
 	 */	
 	public function build_line_items() {
-		$decimals = apply_filters( 'wc_stripe_apple_pay_decimals', 2 );
+		$decimals = apply_filters('wc_stripe_apple_pay_decimals', 2);
 
 		$items = array();
 
-		foreach ( WC()->cart->get_cart() as $cart_item_key => $values ) {
-			$amount         = wc_format_decimal( $values['line_subtotal'], $decimals );
+		foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
+			$amount         = wc_format_decimal($values['line_subtotal'], $decimals);
 			$quantity_label = 1 < $values['quantity'] ? ' (x' . $values['quantity'] . ')' : '';
 
 			$item = array(
 				'type'   => 'final',
 				'label'  => $values['data']->post->post_title . $quantity_label,
-				'amount' => wc_format_decimal( $amount, $decimals ),
+				'amount' => wc_format_decimal($amount, $decimals),
 			);
 
 			$items[] = $item;
 		}
 
-		$discounts   = wc_format_decimal( WC()->cart->get_cart_discount_total(), $decimals );
-		$tax         = wc_format_decimal( WC()->cart->tax_total + WC()->cart->shipping_tax_total, $decimals );
-		$shipping    = wc_format_decimal( WC()->cart->shipping_total, $decimals );
-		$item_total  = wc_format_decimal( WC()->cart->cart_contents_total, $decimals ) + $discounts;
-		$order_total = wc_format_decimal( $item_total + $tax + $shipping, $decimals );
+		$discounts   = wc_format_decimal(WC()->cart->get_cart_discount_total(), $decimals);
+		$tax         = wc_format_decimal(WC()->cart->tax_total + WC()->cart->shipping_tax_total, $decimals);
+		$shipping    = wc_format_decimal(WC()->cart->shipping_total, $decimals);
+		$item_total  = wc_format_decimal(WC()->cart->cart_contents_total, $decimals) + $discounts;
+		$order_total = wc_format_decimal($item_total + $tax + $shipping, $decimals);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
 				'type'   => 'final',
-				'label'  => __( 'Tax', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Tax', 'woocommerce-gateway-stripe'),
 				'amount' => $tax,
 			);
 		}
 
-		if ( WC()->cart->needs_shipping() ) {
+		if (WC()->cart->needs_shipping()) {
 			$items[] = array(
 				'type'   => 'final',
-				'label'  => __( 'Shipping', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Shipping', 'woocommerce-gateway-stripe'),
 				'amount' => $shipping,
 			);
 		}
 
-		if ( WC()->cart->has_discount() ) {
+		if (WC()->cart->has_discount()) {
 			$items[] = array(
 				'type'   => 'final',
-				'label'  => __( 'Discount', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Discount', 'woocommerce-gateway-stripe'),
 				'amount' => $discounts,
 			);
 		}
@@ -337,24 +337,24 @@ 
 	 * @param array $data
 	 * @return object $order
 	 */
-	public function create_order( $data = array() ) {
-		if ( empty( $data ) ) {
-			throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 520 ) );
+	public function create_order($data = array()) {
+		if (empty($data)) {
+			throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 520));
 		}
 
 		$order = wc_create_order();
 
-		if ( is_wp_error( $order ) ) {
-			throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 520 ) );
-		} elseif ( false === $order ) {
-			throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 521 ) );
+		if (is_wp_error($order)) {
+			throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 520));
+		} elseif (false === $order) {
+			throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 521));
 		} else {
 			$order_id = $order->id;
-			do_action( 'woocommerce_new_order', $order_id );
+			do_action('woocommerce_new_order', $order_id);
 		}
 
 		// Store the line items to the new/resumed order
-		foreach ( WC()->cart->get_cart() as $cart_item_key => $values ) {
+		foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
 			$item_id = $order->add_product(
 				$values['data'],
 				$values['quantity'],
@@ -370,47 +370,47 @@ 
 				)
 			);
 
-			if ( ! $item_id ) {
-				throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 525 ) );
+			if ( ! $item_id) {
+				throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 525));
 			}
 
 			// Allow plugins to add order item meta
-			do_action( 'woocommerce_add_order_item_meta', $item_id, $values, $cart_item_key );
+			do_action('woocommerce_add_order_item_meta', $item_id, $values, $cart_item_key);
 		}
 
 		// Store fees
-		foreach ( WC()->cart->get_fees() as $fee_key => $fee ) {
-			$item_id = $order->add_fee( $fee );
+		foreach (WC()->cart->get_fees() as $fee_key => $fee) {
+			$item_id = $order->add_fee($fee);
 
-			if ( ! $item_id ) {
-				throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 526 ) );
+			if ( ! $item_id) {
+				throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 526));
 			}
 
 			// Allow plugins to add order item meta to fees
-			do_action( 'woocommerce_add_order_fee_meta', $order_id, $item_id, $fee, $fee_key );
+			do_action('woocommerce_add_order_fee_meta', $order_id, $item_id, $fee, $fee_key);
 		}
 
 		// Store tax rows
-		foreach ( array_keys( WC()->cart->taxes + WC()->cart->shipping_taxes ) as $tax_rate_id ) {
-			if ( $tax_rate_id && ! $order->add_tax( $tax_rate_id, WC()->cart->get_tax_amount( $tax_rate_id ), WC()->cart->get_shipping_tax_amount( $tax_rate_id ) ) && apply_filters( 'woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated' ) !== $tax_rate_id ) {
-				throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 528 ) );
+		foreach (array_keys(WC()->cart->taxes + WC()->cart->shipping_taxes) as $tax_rate_id) {
+			if ($tax_rate_id && ! $order->add_tax($tax_rate_id, WC()->cart->get_tax_amount($tax_rate_id), WC()->cart->get_shipping_tax_amount($tax_rate_id)) && apply_filters('woocommerce_cart_remove_taxes_zero_rate_id', 'zero-rated') !== $tax_rate_id) {
+				throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 528));
 			}
 		}
 
 		// Store coupons
-		foreach ( WC()->cart->get_coupons() as $code => $coupon ) {
-			if ( ! $order->add_coupon( $code, WC()->cart->get_coupon_discount_amount( $code ), WC()->cart->get_coupon_discount_tax_amount( $code ) ) ) {
-				throw new Exception( sprintf( __( 'Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe' ), 529 ) );
+		foreach (WC()->cart->get_coupons() as $code => $coupon) {
+			if ( ! $order->add_coupon($code, WC()->cart->get_coupon_discount_amount($code), WC()->cart->get_coupon_discount_tax_amount($code))) {
+				throw new Exception(sprintf(__('Error %d: Unable to create order. Please try again.', 'woocommerce-gateway-stripe'), 529));
 			}
 		}
 
 		// Billing address
 		$billing_address = array();
-		if ( ! empty( $data['token']['card'] ) ) {
+		if ( ! empty($data['token']['card'])) {
 			// Name from Stripe is a full name string.
-			$name                          = explode( ' ', $data['token']['card']['name'] );
-			$lastname                      = array_pop( $name );
-			$firstname                     = implode( ' ', $name );
+			$name                          = explode(' ', $data['token']['card']['name']);
+			$lastname                      = array_pop($name);
+			$firstname                     = implode(' ', $name);
 			$billing_address['first_name'] = $firstname;
 			$billing_address['last_name']  = $lastname;
 			$billing_address['email']      = $data['shippingContact']['emailAddress'];
@@ -425,7 +425,7 @@ 
 
 		// Shipping address.
 		$shipping_address = array();
-		if ( WC()->cart->needs_shipping() && ! empty( $data['shippingContact'] ) ) {
+		if (WC()->cart->needs_shipping() && ! empty($data['shippingContact'])) {
 			$shipping_address['first_name'] = $data['shippingContact']['givenName'];
 			$shipping_address['last_name']  = $data['shippingContact']['familyName'];
 			$shipping_address['email']      = $data['shippingContact']['emailAddress'];
@@ -436,7 +436,7 @@ 
 			$shipping_address['city']       = $data['shippingContact']['locality'];
 			$shipping_address['state']      = $data['shippingContact']['administrativeArea'];
 			$shipping_address['postcode']   = $data['shippingContact']['postalCode'];
-		} elseif ( ! empty( $data['shippingContact'] ) ) {
+		} elseif ( ! empty($data['shippingContact'])) {
 			$shipping_address['first_name'] = $firstname;
 			$shipping_address['last_name']  = $lastname;
 			$shipping_address['email']      = $data['shippingContact']['emailAddress'];
@@ -449,34 +449,34 @@ 
 			$shipping_address['postcode']   = $data['token']['card']['address_zip'];
 		}
 
-		$order->set_address( $billing_address, 'billing' );
-		$order->set_address( $shipping_address, 'shipping' );
+		$order->set_address($billing_address, 'billing');
+		$order->set_address($shipping_address, 'shipping');
 
-		WC()->shipping->calculate_shipping( WC()->cart->get_shipping_packages() );
+		WC()->shipping->calculate_shipping(WC()->cart->get_shipping_packages());
 		
 		// Get the rate object selected by user.
-		foreach ( WC()->shipping->get_packages() as $package_key => $package ) {
-			foreach ( $package['rates'] as $key => $rate ) {
+		foreach (WC()->shipping->get_packages() as $package_key => $package) {
+			foreach ($package['rates'] as $key => $rate) {
 				// Loop through user chosen shipping methods.
-				foreach( WC()->session->get( 'chosen_shipping_methods' ) as $method ) {
-					if ( $method === $key ) {
-						$order->add_shipping( $rate );
+				foreach (WC()->session->get('chosen_shipping_methods') as $method) {
+					if ($method === $key) {
+						$order->add_shipping($rate);
 					}
 				}
 			}
 		}
 
 		$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-		$order->set_payment_method( $available_gateways['stripe'] );
-		$order->set_total( WC()->cart->shipping_total, 'shipping' );
-		$order->set_total( WC()->cart->get_cart_discount_total(), 'cart_discount' );
-		$order->set_total( WC()->cart->get_cart_discount_tax_total(), 'cart_discount_tax' );
-		$order->set_total( WC()->cart->tax_total, 'tax' );
-		$order->set_total( WC()->cart->shipping_tax_total, 'shipping_tax' );
-		$order->set_total( WC()->cart->total );
+		$order->set_payment_method($available_gateways['stripe']);
+		$order->set_total(WC()->cart->shipping_total, 'shipping');
+		$order->set_total(WC()->cart->get_cart_discount_total(), 'cart_discount');
+		$order->set_total(WC()->cart->get_cart_discount_tax_total(), 'cart_discount_tax');
+		$order->set_total(WC()->cart->tax_total, 'tax');
+		$order->set_total(WC()->cart->shipping_tax_total, 'shipping_tax');
+		$order->set_total(WC()->cart->total);
 
 		// If we got here, the order was created without problems!
-		wc_transaction_query( 'commit' );
+		wc_transaction_query('commit');
 
 		return $order;
 	}

includes/settings-stripe.php

Spacing +67 added lines, -67 removed lines

@@ -1,170 +1,170 @@
 <?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,
 		),
 		'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_secret_key' => array(
-			'title'       => __( 'Test Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'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_publishable_key' => array(
-			'title'       => __( 'Test Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'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'        => 'text',
-			'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'        => 'text',
-			'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,
 		),
 		'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,
 		),
 		'stripe_checkout' => array(
-			'title'       => __( 'Stripe Checkout', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Checkout', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe 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.', '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.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'allow_remember_me' => array(
-			'title'       => __( 'Allow Remember Me', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Remember Me', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Allow Remember Me', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Remember Me', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, this option shows a "Remember Me" checkbox which when checked by the customer will persist their details.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, this option shows a "Remember Me" checkbox which when checked by the customer will persist their details.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout_locale' => array(
-			'title'       => __( 'Stripe Checkout locale', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Checkout locale', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
 			'class'       => 'wc-enhanced-select',
-			'description' => __( 'Language to display in Stripe Checkout modal. Specify Auto to display Checkout in the user\'s preferred language, if available. English will be used by default.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Language to display in Stripe Checkout modal. Specify Auto to display Checkout in the user\'s preferred language, if available. English will be used by default.', 'woocommerce-gateway-stripe'),
 			'default'     => 'en',
 			'desc_tip'    => true,
 			'options'     => array(
-				'auto' => __( 'Auto', 'woocommerce-gateway-stripe' ),
-				'zh'   => __( 'Simplified Chinese', 'woocommerce-gateway-stripe' ),
-				'da'   => __( 'Danish', 'woocommerce-gateway-stripe' ),
-				'nl'   => __( 'Dutch', 'woocommerce-gateway-stripe' ),
-				'en'   => __( 'English', 'woocommerce-gateway-stripe' ),
-				'fi'   => __( 'Finnish', 'woocommerce-gateway-stripe' ),
-				'fr'   => __( 'French', 'woocommerce-gateway-stripe' ),
-				'de'   => __( 'German', 'woocommerce-gateway-stripe' ),
-				'it'   => __( 'Italian', 'woocommerce-gateway-stripe' ),
-				'ja'   => __( 'Japanese', 'woocommerce-gateway-stripe' ),
-				'no'   => __( 'Norwegian', 'woocommerce-gateway-stripe' ),
-				'es'   => __( 'Spanish', 'woocommerce-gateway-stripe' ),
-				'sv'   => __( 'Swedish', 'woocommerce-gateway-stripe' ),
+				'auto' => __('Auto', 'woocommerce-gateway-stripe'),
+				'zh'   => __('Simplified Chinese', 'woocommerce-gateway-stripe'),
+				'da'   => __('Danish', 'woocommerce-gateway-stripe'),
+				'nl'   => __('Dutch', 'woocommerce-gateway-stripe'),
+				'en'   => __('English', 'woocommerce-gateway-stripe'),
+				'fi'   => __('Finnish', 'woocommerce-gateway-stripe'),
+				'fr'   => __('French', 'woocommerce-gateway-stripe'),
+				'de'   => __('German', 'woocommerce-gateway-stripe'),
+				'it'   => __('Italian', 'woocommerce-gateway-stripe'),
+				'ja'   => __('Japanese', 'woocommerce-gateway-stripe'),
+				'no'   => __('Norwegian', 'woocommerce-gateway-stripe'),
+				'es'   => __('Spanish', 'woocommerce-gateway-stripe'),
+				'sv'   => __('Swedish', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'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,
 		),
 		'request_payment_api' => array(
-			'title'       => __( 'Payment Request API', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Payment Request API', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request API', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Payment Request API', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay using the Payment Request API if supported by the browser.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay using the Payment Request API if supported by the browser.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'apple_pay' => array(
-			'title'       => __( 'Apple Pay', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Apple Pay', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Apple Pay', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Apple Pay', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay with Apple Pay.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay with Apple Pay.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'apple_pay_button' => array(
-			'title'       => __( 'Apple Pay Button Style', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Style', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Apple Pay Button Style', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Style', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button style you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button style you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'black',
 			'desc_tip'    => true,
 			'options'     => array(
-				'black' => __( 'Black', 'woocommerce-gateway-stripe' ),
-				'white' => __( 'White', 'woocommerce-gateway-stripe' ),
+				'black' => __('Black', 'woocommerce-gateway-stripe'),
+				'white' => __('White', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'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,
 		),