woocommerce / woocommerce-gateway-stripe

includes/class-wc-gateway-stripe-addons.php

Doc Comments +3 added lines, -2 removed lines

@@ -96,7 +96,6 @@ 
 	 * process_subscription_payment function.
 	 * @param mixed $order
 	 * @param int $amount (default: 0)
-	 * @param string $stripe_token (default: '')
 	 * @param  bool initial_payment
 	 */
 	public function process_subscription_payment( $order = '', $amount = 0 ) {
@@ -139,6 +138,8 @@ 
 	/**
 	 * Process the pre-order
 	 * @param int $order_id
+	 * @param boolean $retry
+	 * @param boolean $force_customer
 	 * @return array
 	 */
 	public function process_pre_order( $order_id, $retry, $force_customer ) {
@@ -239,7 +240,7 @@ 
 
 	/**
 	 * Don't transfer Stripe fee/ID meta to renewal orders.
-	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
+	 * @param integer $renewal_order
 	 */
 	public function delete_renewal_meta( $renewal_order ) {
 		delete_post_meta( $renewal_order->id, 'Stripe Fee' );

Spacing +129 added lines, -129 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -16,22 +16,22 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		if ( class_exists( 'WC_Subscriptions_Order' ) ) {
-			add_action( 'woocommerce_scheduled_subscription_payment_' . $this->id, array( $this, 'scheduled_subscription_payment' ), 10, 2 );
-			add_action( 'wcs_resubscribe_order_created', array( $this, 'delete_resubscribe_meta' ), 10 );
-			add_action( 'wcs_renewal_order_created', array( $this, 'delete_renewal_meta' ), 10 );
-			add_action( 'woocommerce_subscription_failing_payment_method_updated_stripe', array( $this, 'update_failing_payment_method' ), 10, 2 );
+		if (class_exists('WC_Subscriptions_Order')) {
+			add_action('woocommerce_scheduled_subscription_payment_' . $this->id, array($this, 'scheduled_subscription_payment'), 10, 2);
+			add_action('wcs_resubscribe_order_created', array($this, 'delete_resubscribe_meta'), 10);
+			add_action('wcs_renewal_order_created', array($this, 'delete_renewal_meta'), 10);
+			add_action('woocommerce_subscription_failing_payment_method_updated_stripe', array($this, 'update_failing_payment_method'), 10, 2);
 
 			// display the credit card used for a subscription in the "My Subscriptions" table
-			add_filter( 'woocommerce_my_subscriptions_payment_method', array( $this, 'maybe_render_subscription_payment_method' ), 10, 2 );
+			add_filter('woocommerce_my_subscriptions_payment_method', array($this, 'maybe_render_subscription_payment_method'), 10, 2);
 
 			// allow store managers to manually set Stripe as the payment method on a subscription
-			add_filter( 'woocommerce_subscription_payment_meta', array( $this, 'add_subscription_payment_meta' ), 10, 2 );
-			add_filter( 'woocommerce_subscription_validate_payment_meta', array( $this, 'validate_subscription_payment_meta' ), 10, 2 );
+			add_filter('woocommerce_subscription_payment_meta', array($this, 'add_subscription_payment_meta'), 10, 2);
+			add_filter('woocommerce_subscription_validate_payment_meta', array($this, 'validate_subscription_payment_meta'), 10, 2);
 		}
 
-		if ( class_exists( 'WC_Pre_Orders_Order' ) ) {
-			add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this, 'process_pre_order_release_payment' ) );
+		if (class_exists('WC_Pre_Orders_Order')) {
+			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this, 'process_pre_order_release_payment'));
 		}
 	}
 
@@ -40,8 +40,8 @@ 
 	 * @param  int  $order_id
 	 * @return boolean
 	 */
-	protected function is_subscription( $order_id ) {
-		return ( function_exists( 'wcs_order_contains_subscription' ) && ( wcs_order_contains_subscription( $order_id ) || wcs_is_subscription( $order_id ) || wcs_order_contains_renewal( $order_id ) ) );
+	protected function is_subscription($order_id) {
+		return (function_exists('wcs_order_contains_subscription') && (wcs_order_contains_subscription($order_id) || wcs_is_subscription($order_id) || wcs_order_contains_renewal($order_id)));
 	}
 
 	/**
@@ -49,8 +49,8 @@ 
 	 * @param  int  $order_id
 	 * @return boolean
 	 */
-	protected function is_pre_order( $order_id ) {
-		return ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Order::order_contains_pre_order( $order_id ) );
+	protected function is_pre_order($order_id) {
+		return (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Order::order_contains_pre_order($order_id));
 	}
 
 	/**
@@ -58,39 +58,39 @@ 
 	 * @param  int $order_id
 	 * @return array
 	 */
-	public function process_payment( $order_id, $retry = true, $force_customer = false ) {
-		if ( $this->is_subscription( $order_id ) ) {
+	public function process_payment($order_id, $retry = true, $force_customer = false) {
+		if ($this->is_subscription($order_id)) {
 			// Regular payment with force customer enabled
-			return parent::process_payment( $order_id, true, true );
+			return parent::process_payment($order_id, true, true);
 
-		} elseif ( $this->is_pre_order( $order_id ) ) {
-			return $this->process_pre_order( $order_id, $retry, $force_customer );
+		} elseif ($this->is_pre_order($order_id)) {
+			return $this->process_pre_order($order_id, $retry, $force_customer);
 
 		} else {
-			return parent::process_payment( $order_id, $retry, $force_customer );
+			return parent::process_payment($order_id, $retry, $force_customer);
 		}
 	}
 
 	/**
 	 * Updates other subscription sources.
 	 */
-	protected function save_source( $order, $source ) {
-		parent::save_source( $order, $source );
+	protected function save_source($order, $source) {
+		parent::save_source($order, $source);
 
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
 		// Also store it on the subscriptions being purchased or paid for in the order
-		if ( function_exists( 'wcs_order_contains_subscription' ) && wcs_order_contains_subscription( $order_id ) ) {
-			$subscriptions = wcs_get_subscriptions_for_order( $order_id );
-		} elseif ( function_exists( 'wcs_order_contains_renewal' ) && wcs_order_contains_renewal( $order_id ) ) {
-			$subscriptions = wcs_get_subscriptions_for_renewal_order( $order_id );
+		if (function_exists('wcs_order_contains_subscription') && wcs_order_contains_subscription($order_id)) {
+			$subscriptions = wcs_get_subscriptions_for_order($order_id);
+		} elseif (function_exists('wcs_order_contains_renewal') && wcs_order_contains_renewal($order_id)) {
+			$subscriptions = wcs_get_subscriptions_for_renewal_order($order_id);
 		} else {
 			$subscriptions = array();
 		}
 
-		foreach ( $subscriptions as $subscription ) {
-			update_post_meta( $subscription->id, '_stripe_customer_id', $source->customer );
-			update_post_meta( $subscription->id, '_stripe_card_id', $source->source );
+		foreach ($subscriptions as $subscription) {
+			update_post_meta($subscription->id, '_stripe_customer_id', $source->customer);
+			update_post_meta($subscription->id, '_stripe_card_id', $source->source);
 		}
 	}
 
@@ -101,39 +101,39 @@ 
 	 * @param string $stripe_token (default: '')
 	 * @param  bool initial_payment
 	 */
-	public function process_subscription_payment( $order = '', $amount = 0 ) {
-		if ( $amount * 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 ) ) );
+	public function process_subscription_payment($order = '', $amount = 0) {
+		if ($amount * 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)));
 		}
 
 		// Get source from order
-		$source = $this->get_order_source( $order );
+		$source = $this->get_order_source($order);
 
 		// If no order source was defined, use user source instead.
-		if ( ! $source->customer ) {
-			$source = $this->get_source( $order->customer_user );
+		if ( ! $source->customer) {
+			$source = $this->get_source($order->customer_user);
 		}
 
 		// Or fail :(
-		if ( ! $source->customer ) {
-			return new WP_Error( 'stripe_error', __( 'Customer not found', 'woocommerce-gateway-stripe' ) );
+		if ( ! $source->customer) {
+			return new WP_Error('stripe_error', __('Customer not found', 'woocommerce-gateway-stripe'));
 		}
 
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
-		$this->log( "Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}" );
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
+		$this->log("Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}");
 
 		// Make the request
-		$request             = $this->generate_payment_request( $order, $source );
+		$request             = $this->generate_payment_request($order, $source);
 		$request['capture']  = 'true';
-		$request['amount']   = $this->get_stripe_amount( $amount, $request['currency'] );
+		$request['amount']   = $this->get_stripe_amount($amount, $request['currency']);
 		$request['metadata'] = array(
 			'payment_type'   => 'recurring',
 		);
-		$response            = WC_Stripe_API::request( $request );
+		$response            = WC_Stripe_API::request($request);
 
 		// Process valid response
-		if ( ! is_wp_error( $response ) ) {
-			$this->process_response( $response, $order );
+		if ( ! is_wp_error($response)) {
+			$this->process_response($response, $order);
 		}
 
 		return $response;
@@ -144,42 +144,42 @@ 
 	 * @param int $order_id
 	 * @return array
 	 */
-	public function process_pre_order( $order_id, $retry, $force_customer ) {
-		if ( WC_Pre_Orders_Order::order_requires_payment_tokenization( $order_id ) ) {
+	public function process_pre_order($order_id, $retry, $force_customer) {
+		if (WC_Pre_Orders_Order::order_requires_payment_tokenization($order_id)) {
 			try {
-				$order = wc_get_order( $order_id );
+				$order = wc_get_order($order_id);
 
-				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)));
 				}
 
-				$source = $this->get_source( get_current_user_id(), true );
+				$source = $this->get_source(get_current_user_id(), true);
 
 				// We need a source on file to continue.
-				if ( empty( $source->customer ) || empty( $source->source ) ) {
-					throw new Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) );
+				if (empty($source->customer) || empty($source->source)) {
+					throw new Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe'));
 				}
 
 				// Store source to order meta
-				$this->save_source( $order, $source );
+				$this->save_source($order, $source);
 
 				// Remove cart
 				WC()->cart->empty_cart();
 
 				// Is pre ordered!
-				WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order );
+				WC_Pre_Orders_Order::mark_order_as_pre_ordered($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' );
+			} catch (Exception $e) {
+				wc_add_notice($e->getMessage(), 'error');
 				return;
 			}
 		} else {
-			return parent::process_payment( $order_id, $retry, $force_customer );
+			return parent::process_payment($order_id, $retry, $force_customer);
 		}
 	}
 
@@ -188,7 +188,7 @@ 
 	 * @param WC_Order $order
 	 * @return void
 	 */
-	public function process_pre_order_release_payment( $order ) {
+	public function process_pre_order_release_payment($order) {
 		try {
 			// Define some callbacks if the first attempt fails.
 			$retry_callbacks = array(
@@ -196,32 +196,32 @@ 
 				'remove_order_customer_before_retry',
 			);
 
-			while ( 1 ) {
-				$source   = $this->get_order_source( $order );
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) );
+			while (1) {
+				$source   = $this->get_order_source($order);
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
 
-				if ( is_wp_error( $response ) ) {
-					if ( 0 === sizeof( $retry_callbacks ) ) {
-						throw new Exception( $response->get_error_message() );
+				if (is_wp_error($response)) {
+					if (0 === sizeof($retry_callbacks)) {
+						throw new Exception($response->get_error_message());
 					} else {
-						$retry_callback = array_shift( $retry_callbacks );
-						call_user_func( array( $this, $retry_callback ), $order );
+						$retry_callback = array_shift($retry_callbacks);
+						call_user_func(array($this, $retry_callback), $order);
 					}
 				} else {
 					// Successful
-					$this->process_response( $response, $order );
+					$this->process_response($response, $order);
 					break;
 				}
 			}
-		} catch ( Exception $e ) {
-			$order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $e->getMessage() );
+		} catch (Exception $e) {
+			$order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $e->getMessage());
 
 			// Mark order as failed if not already set,
 			// otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times
-			if ( ! $order->has_status( 'failed' ) ) {
-				$order->update_status( 'failed', $order_note );
+			if ( ! $order->has_status('failed')) {
+				$order->update_status('failed', $order_note);
 			} else {
-				$order->add_order_note( $order_note );
+				$order->add_order_note($order_note);
 			}
 		}
 	}
@@ -230,20 +230,20 @@ 
 	 * Don't transfer Stripe customer/token meta to resubscribe orders.
 	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
 	 */
-	public function delete_resubscribe_meta( $resubscribe_order ) {
-		delete_post_meta( $resubscribe_order->id, '_stripe_customer_id' );
-		delete_post_meta( $resubscribe_order->id, '_stripe_card_id' );
-		$this->delete_renewal_meta( $resubscribe_order );
+	public function delete_resubscribe_meta($resubscribe_order) {
+		delete_post_meta($resubscribe_order->id, '_stripe_customer_id');
+		delete_post_meta($resubscribe_order->id, '_stripe_card_id');
+		$this->delete_renewal_meta($resubscribe_order);
 	}
 
 	/**
 	 * Don't transfer Stripe fee/ID meta to renewal orders.
 	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
 	 */
-	public function delete_renewal_meta( $renewal_order ) {
-		delete_post_meta( $renewal_order->id, 'Stripe Fee' );
-		delete_post_meta( $renewal_order->id, 'Net Revenue From Stripe' );
-		delete_post_meta( $renewal_order->id, 'Stripe Payment ID' );
+	public function delete_renewal_meta($renewal_order) {
+		delete_post_meta($renewal_order->id, 'Stripe Fee');
+		delete_post_meta($renewal_order->id, 'Net Revenue From Stripe');
+		delete_post_meta($renewal_order->id, 'Stripe Payment ID');
 		return $renewal_order;
 	}
 
@@ -253,11 +253,11 @@ 
 	 * @param $amount_to_charge float The amount to charge.
 	 * @param $renewal_order WC_Order A WC_Order object created to record the renewal payment.
 	 */
-	public function scheduled_subscription_payment( $amount_to_charge, $renewal_order ) {
-		$response = $this->process_subscription_payment( $renewal_order, $amount_to_charge );
+	public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
+		$response = $this->process_subscription_payment($renewal_order, $amount_to_charge);
 
-		if ( is_wp_error( $response ) ) {
-			$renewal_order->update_status( 'failed', sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
+		if (is_wp_error($response)) {
+			$renewal_order->update_status('failed', sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $response->get_error_message()));
 		}
 	}
 
@@ -265,18 +265,18 @@ 
 	 * Remove order meta
 	 * @param  object $order
 	 */
-	public function remove_order_source_before_retry( $order ) {
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_card_id' );
+	public function remove_order_source_before_retry($order) {
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
+		delete_post_meta($order_id, '_stripe_card_id');
 	}
 
 	/**
 	 * Remove order meta
 	 * @param  object $order
 	 */
-	public function remove_order_customer_before_retry( $order ) {
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_customer_id' );
+	public function remove_order_customer_before_retry($order) {
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
+		delete_post_meta($order_id, '_stripe_customer_id');
 	}
 
 	/**
@@ -288,9 +288,9 @@ 
 	 * @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment).
 	 * @return void
 	 */
-	public function update_failing_payment_method( $subscription, $renewal_order ) {
-		update_post_meta( $subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id );
-		update_post_meta( $subscription->id, '_stripe_card_id', $renewal_order->stripe_card_id );
+	public function update_failing_payment_method($subscription, $renewal_order) {
+		update_post_meta($subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id);
+		update_post_meta($subscription->id, '_stripe_card_id', $renewal_order->stripe_card_id);
 	}
 
 	/**
@@ -302,15 +302,15 @@ 
 	 * @param WC_Subscription $subscription An instance of a subscription object
 	 * @return array
 	 */
-	public function add_subscription_payment_meta( $payment_meta, $subscription ) {
-		$payment_meta[ $this->id ] = array(
+	public function add_subscription_payment_meta($payment_meta, $subscription) {
+		$payment_meta[$this->id] = array(
 			'post_meta' => array(
 				'_stripe_customer_id' => array(
-					'value' => get_post_meta( $subscription->id, '_stripe_customer_id', true ),
+					'value' => get_post_meta($subscription->id, '_stripe_customer_id', true),
 					'label' => 'Stripe Customer ID',
 				),
 				'_stripe_card_id' => array(
-					'value' => get_post_meta( $subscription->id, '_stripe_card_id', true ),
+					'value' => get_post_meta($subscription->id, '_stripe_card_id', true),
 					'label' => 'Stripe Card ID',
 				),
 			),
@@ -327,17 +327,17 @@ 
 	 * @param array $payment_meta associative array of meta data required for automatic payments
 	 * @return array
 	 */
-	public function validate_subscription_payment_meta( $payment_method_id, $payment_meta ) {
-		if ( $this->id === $payment_method_id ) {
+	public function validate_subscription_payment_meta($payment_method_id, $payment_meta) {
+		if ($this->id === $payment_method_id) {
 
-			if ( ! isset( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) || empty( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) ) {
-				throw new Exception( 'A "_stripe_customer_id" value is required.' );
-			} elseif ( 0 !== strpos( $payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_' ) ) {
-				throw new Exception( 'Invalid customer ID. A valid "_stripe_customer_id" must begin with "cus_".' );
+			if ( ! isset($payment_meta['post_meta']['_stripe_customer_id']['value']) || empty($payment_meta['post_meta']['_stripe_customer_id']['value'])) {
+				throw new Exception('A "_stripe_customer_id" value is required.');
+			} elseif (0 !== strpos($payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_')) {
+				throw new Exception('Invalid customer ID. A valid "_stripe_customer_id" must begin with "cus_".');
 			}
 
-			if ( ! empty( $payment_meta['post_meta']['_stripe_card_id']['value'] ) && 0 !== strpos( $payment_meta['post_meta']['_stripe_card_id']['value'], 'card_' ) ) {
-				throw new Exception( 'Invalid card ID. A valid "_stripe_card_id" must begin with "card_".' );
+			if ( ! empty($payment_meta['post_meta']['_stripe_card_id']['value']) && 0 !== strpos($payment_meta['post_meta']['_stripe_card_id']['value'], 'card_')) {
+				throw new Exception('Invalid card ID. A valid "_stripe_card_id" must begin with "card_".');
 			}
 		}
 	}
@@ -350,43 +350,43 @@ 
 	 * @param WC_Subscription $subscription the subscription details
 	 * @return string the subscription payment method
 	 */
-	public function maybe_render_subscription_payment_method( $payment_method_to_display, $subscription ) {
+	public function maybe_render_subscription_payment_method($payment_method_to_display, $subscription) {
 		// bail for other payment methods
-		if ( $this->id !== $subscription->payment_method || ! $subscription->customer_user ) {
+		if ($this->id !== $subscription->payment_method || ! $subscription->customer_user) {
 			return $payment_method_to_display;
 		}
 
 		$stripe_customer    = new WC_Stripe_Customer();
-		$stripe_customer_id = get_post_meta( $subscription->id, '_stripe_customer_id', true );
-		$stripe_card_id     = get_post_meta( $subscription->id, '_stripe_card_id', true );
+		$stripe_customer_id = get_post_meta($subscription->id, '_stripe_customer_id', true);
+		$stripe_card_id     = get_post_meta($subscription->id, '_stripe_card_id', true);
 
 		// If we couldn't find a Stripe customer linked to the subscription, fallback to the user meta data.
-		if ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) {
+		if ( ! $stripe_customer_id || ! is_string($stripe_customer_id)) {
 			$user_id            = $subscription->customer_user;
-			$stripe_customer_id = get_user_meta( $user_id, '_stripe_customer_id', true );
-			$stripe_card_id     = get_user_meta( $user_id, '_stripe_card_id', true );
+			$stripe_customer_id = get_user_meta($user_id, '_stripe_customer_id', true);
+			$stripe_card_id     = get_user_meta($user_id, '_stripe_card_id', true);
 		}
 
 		// If we couldn't find a Stripe customer linked to the account, fallback to the order meta data.
-		if ( ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) && false !== $subscription->order ) {
-			$stripe_customer_id = get_post_meta( $subscription->order->id, '_stripe_customer_id', true );
-			$stripe_card_id     = get_post_meta( $subscription->order->id, '_stripe_card_id', true );
+		if (( ! $stripe_customer_id || ! is_string($stripe_customer_id)) && false !== $subscription->order) {
+			$stripe_customer_id = get_post_meta($subscription->order->id, '_stripe_customer_id', true);
+			$stripe_card_id     = get_post_meta($subscription->order->id, '_stripe_card_id', true);
 		}
 
-		$stripe_customer->set_id( $stripe_customer_id );
+		$stripe_customer->set_id($stripe_customer_id);
 		$cards = $stripe_customer->get_cards();
 
-		if ( $cards ) {
+		if ($cards) {
 			$found_card = false;
-			foreach ( $cards as $card ) {
-				if ( $card->id === $stripe_card_id ) {
+			foreach ($cards as $card) {
+				if ($card->id === $stripe_card_id) {
 					$found_card                = true;
-					$payment_method_to_display = sprintf( __( 'Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe' ), ( isset( $card->type ) ? $card->type : $card->brand ), $card->last4 );
+					$payment_method_to_display = sprintf(__('Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe'), (isset($card->type) ? $card->type : $card->brand), $card->last4);
 					break;
 				}
 			}
-			if ( ! $found_card ) {
-				$payment_method_to_display = sprintf( __( 'Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe' ), ( isset( $cards[0]->type ) ? $cards[0]->type : $cards[0]->brand ), $cards[0]->last4 );
+			if ( ! $found_card) {
+				$payment_method_to_display = sprintf(__('Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe'), (isset($cards[0]->type) ? $cards[0]->type : $cards[0]->brand), $cards[0]->last4);
 			}
 		}
 
@@ -401,11 +401,11 @@ 
 	 *
 	 * @param string $message
 	 */
-	public function log( $message ) {
-		$options = get_option( 'woocommerce_stripe_settings' );
+	public function log($message) {
+		$options = get_option('woocommerce_stripe_settings');
 
-		if ( 'yes' === $options['logging'] ) {
-			WC_Stripe::log( $message );
+		if ('yes' === $options['logging']) {
+			WC_Stripe::log($message);
 		}
 	}
 }

includes/class-wc-gateway-stripe.php

Doc Comments +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param float  $total Amount due.
 	 * @param string $currency Accepted currency.
 	 *
-	 * @return float|int
+	 * @return double
 	 */
 	public function get_stripe_amount( $total, $currency = '' ) {
 		if ( ! $currency ) {

Spacing +286 added lines, -286 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -120,8 +120,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(
@@ -149,54 +149,54 @@ 
 		$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->statement_descriptor   = $this->get_option( 'statement_descriptor', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-		$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', 'yes' );
-		$this->apple_pay_domain_set   = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' );
-		$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' );
+		$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->statement_descriptor   = $this->get_option('statement_descriptor', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+		$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', 'yes');
+		$this->apple_pay_domain_set   = 'yes' === $this->get_option('apple_pay_domain_set', 'no');
+		$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');
 
 			// Stripe checkout does not support add payment method.
-			if ( is_add_payment_method_page() ) {
-				if ( false !== ( $key = array_search( 'add_payment_method', $this->supports ) ) ) {
-					unset( $this->supports[ $key ] );
+			if (is_add_payment_method_page()) {
+				if (false !== ($key = array_search('add_payment_method', $this->supports))) {
+					unset($this->supports[$key]);
 				}
 
-				if ( false !== ( $key = array_search( 'tokenization', $this->supports ) ) ) {
-					unset( $this->supports[ $key ] );
+				if (false !== ($key = array_search('tokenization', $this->supports))) {
+					unset($this->supports[$key]);
 				}
 			}
 		}
 
-		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 );
+		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 );
+		WC_Stripe_API::set_secret_key($this->secret_key);
 
 		$this->init_apple_pay();
 
 		// Hooks.
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_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_enqueue_scripts', array($this, 'admin_scripts'));
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 	}
 
 	/**
@@ -206,24 +206,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);
 	}
 
 	/**
@@ -234,11 +234,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' :
@@ -255,10 +255,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;
@@ -273,9 +273,9 @@ 
 	public function init_apple_pay() {
 		if ( 
 			is_admin() && 
-			isset( $_GET['page'] ) && 'wc-settings' === $_GET['page'] && 
-			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
-			isset( $_GET['section'] ) && 'stripe' === $_GET['section']
+			isset($_GET['page']) && 'wc-settings' === $_GET['page'] && 
+			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
+			isset($_GET['section']) && 'stripe' === $_GET['section']
 		) {
 			$this->process_apple_pay_verification();
 		}
@@ -288,9 +288,9 @@ 
 	 * @version 3.1.0
 	 * @param string $secret_key
 	 */
-	private function _register_apple_pay_domain( $secret_key = '' ) {
-		if ( empty( $secret_key ) ) {
-			throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) );
+	private function _register_apple_pay_domain($secret_key = '') {
+		if (empty($secret_key)) {
+			throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe'));
 		}
 
 		$endpoint = 'https://api.stripe.com/v1/apple_pay/domains';
@@ -304,13 +304,13 @@ 
 			'Authorization' => 'Bearer ' . $secret_key,
 		);
 
-		$response = wp_remote_post( $endpoint, array(
+		$response = wp_remote_post($endpoint, array(
 			'headers' => $headers,
-			'body'    => http_build_query( $data ),
-		) );
+			'body'    => http_build_query($data),
+		));
 
-		if ( 200 !== $response['response']['code'] ) {
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response['response']['message'] ) );
+		if (200 !== $response['response']['code']) {
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response['response']['message']));
 		}
 	}
 
@@ -321,48 +321,48 @@ 
 	 * @version 3.1.0
 	 */
 	public function process_apple_pay_verification() {
-		$gateway_settings = get_option( 'woocommerce_stripe_settings', '' );
+		$gateway_settings = get_option('woocommerce_stripe_settings', '');
 
 		try {
-			$path     = untrailingslashit( preg_replace( "!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME'] ) );
+			$path     = untrailingslashit(preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']));
 			$dir      = '.well-known';
 			$file     = 'apple-developer-merchantid-domain-association';
 			$fullpath = $path . '/' . $dir . '/' . $file;
 
-			if ( 'yes' === $gateway_settings['apple_pay_domain_set'] && file_exists( $fullpath ) ) {
+			if ('yes' === $gateway_settings['apple_pay_domain_set'] && file_exists($fullpath)) {
 				return;
 			}
 
-			if ( ! file_exists( $path . '/' . $dir ) ) {
-				if ( ! @mkdir( $path . '/' . $dir, 0755 ) ) {
-					throw new Exception( __( 'Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($path . '/' . $dir)) {
+				if ( ! @mkdir($path . '/' . $dir, 0755)) {
+					throw new Exception(__('Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
-			if ( ! file_exists( $fullpath ) ) {
-				if ( ! @copy( WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath ) ) {
-					throw new Exception( __( 'Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($fullpath)) {
+				if ( ! @copy(WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath)) {
+					throw new Exception(__('Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
 			// At this point then the domain association folder and file should be available.
 			// Proceed to verify/and or verify again.
-			$this->_register_apple_pay_domain( $this->secret_key );
+			$this->_register_apple_pay_domain($this->secret_key);
 
 			// No errors to this point, verification success!
 			$gateway_settings['apple_pay_domain_set'] = 'yes';
 			$this->apple_pay_domain_set = true;
 
-			update_option( 'woocommerce_stripe_settings', $gateway_settings );
+			update_option('woocommerce_stripe_settings', $gateway_settings);
 
-			$this->log( __( 'Your domain has been verified with Apple Pay!', 'woocommerce-gateway-stripe' ) );
+			$this->log(__('Your domain has been verified with Apple Pay!', 'woocommerce-gateway-stripe'));
 
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$gateway_settings['apple_pay_domain_set'] = 'no';
 
-			update_option( 'woocommerce_stripe_settings', $gateway_settings );
+			update_option('woocommerce_stripe_settings', $gateway_settings);
 
-			$this->log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) );
+			$this->log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage()));
 		}
 	}
 
@@ -370,7 +370,7 @@ 
 	 * Check if SSL is enabled and notify the user
 	 */
 	public function admin_notices() {
-		if ( 'no' === $this->enabled ) {
+		if ('no' === $this->enabled) {
 			return;
 		}
 
@@ -379,13 +379,13 @@ 
 		 * when setting screen is displayed. So if domain verification is not set,
 		 * something went wrong so lets notify user.
 		 */
-		if ( ! empty( $this->secret_key ) && $this->apple_pay && ! $this->apple_pay_domain_set ) {
-			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf( __( 'Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue.', 'woocommerce-gateway-stripe' ), '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', '</a>' ) . '</p></div>';
+		if ( ! empty($this->secret_key) && $this->apple_pay && ! $this->apple_pay_domain_set) {
+			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf(__('Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue.', 'woocommerce-gateway-stripe'), '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', '</a>') . '</p></div>';
 		}
 
 		// 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>';
 		}
 	}
 
@@ -393,11 +393,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;
@@ -409,7 +409,7 @@ 
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = include( 'settings-stripe.php' );
+		$this->form_fields = include('settings-stripe.php');
 	}
 
 	/**
@@ -417,54 +417,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( $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 ? '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($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 ? '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();
 			}
 		}
@@ -480,20 +480,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'),
+		));
 	}
 
 	/**
@@ -503,28 +503,28 @@ 
 	 * @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);
 
 		$stripe_admin_params = array(
 			'localized_messages' => array(
-				'not_valid_live_key_msg' => __( 'This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe' ),
-				'not_valid_test_key_msg' => __( 'This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe' ),
-				're_verify_button_text'  => __( 'Re-verify Domain', 'woocommerce-gateway-stripe' ),
-				'missing_secret_key'     => __( 'Missing Secret Key. Please set the secret key field above and re-try.', 'woocommerce-gateway-stripe' ),
+				'not_valid_live_key_msg' => __('This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe'),
+				'not_valid_test_key_msg' => __('This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe'),
+				're_verify_button_text'  => __('Re-verify Domain', 'woocommerce-gateway-stripe'),
+				'missing_secret_key'     => __('Missing Secret Key. Please set the secret key field above and re-try.', 'woocommerce-gateway-stripe'),
 			),
-			'ajaxurl'            => admin_url( 'admin-ajax.php' ),
+			'ajaxurl'            => admin_url('admin-ajax.php'),
 			'nonce'              => array( 
-				'apple_pay_domain_nonce' => wp_create_nonce( '_wc_stripe_apple_pay_domain_nonce' ),
+				'apple_pay_domain_nonce' => wp_create_nonce('_wc_stripe_apple_pay_domain_nonce'),
 			),
 		);
 
-		wp_localize_script( 'woocommerce_stripe_admin', 'wc_stripe_admin_params', apply_filters( 'wc_stripe_admin_params', $stripe_admin_params ) );
+		wp_localize_script('woocommerce_stripe_admin', 'wc_stripe_admin_params', apply_filters('wc_stripe_admin_params', $stripe_admin_params));
 	}
 
 	/**
@@ -535,49 +535,49 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		$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'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name();
-			$stripe_params['billing_last_name']  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name();
-			$stripe_params['billing_address_1']  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_1 : $order->get_billing_address_1();
-			$stripe_params['billing_address_2']  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_2 : $order->get_billing_address_2();
-			$stripe_params['billing_state']      = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_state : $order->get_billing_state();
-			$stripe_params['billing_city']       = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_city : $order->get_billing_city();
-			$stripe_params['billing_postcode']   = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_postcode : $order->get_billing_postcode();
-			$stripe_params['billing_country']    = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_country : $order->get_billing_country();
+			$stripe_params['billing_first_name'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name();
+			$stripe_params['billing_last_name']  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name();
+			$stripe_params['billing_address_1']  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_1 : $order->get_billing_address_1();
+			$stripe_params['billing_address_2']  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_2 : $order->get_billing_address_2();
+			$stripe_params['billing_state']      = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_state : $order->get_billing_state();
+			$stripe_params['billing_city']       = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_city : $order->get_billing_city();
+			$stripe_params['billing_postcode']   = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_postcode : $order->get_billing_postcode();
+			$stripe_params['billing_country']    = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_country : $order->get_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));
 	}
 
 	/**
@@ -586,35 +586,35 @@ 
 	 * @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( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->get_order_currency() : $order->get_currency() );
-		$post_data['amount']      = $this->get_stripe_amount( $order->get_total(), $post_data['currency'] );
-		$post_data['description'] = sprintf( __( '%1$s - Order %2$s', 'woocommerce-gateway-stripe' ), $this->statement_descriptor, $order->get_order_number() );
+		$post_data['currency']    = strtolower(version_compare(WC_VERSION, '3.0.0', '<') ? $order->get_order_currency() : $order->get_currency());
+		$post_data['amount']      = $this->get_stripe_amount($order->get_total(), $post_data['currency']);
+		$post_data['description'] = sprintf(__('%1$s - Order %2$s', 'woocommerce-gateway-stripe'), $this->statement_descriptor, $order->get_order_number());
 		$post_data['capture']     = $this->capture ? 'true' : 'false';
 
-		$billing_email      = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_email : $order->get_billing_email();
-		$billing_first_name = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name();
-		$billing_last_name  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name();
+		$billing_email      = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_email : $order->get_billing_email();
+		$billing_first_name = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name();
+		$billing_last_name  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name();
 
-		if ( ! empty( $billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) {
+		if ( ! empty($billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) {
 			$post_data['receipt_email'] = $billing_email;
 		}
 
-		$post_data['expand[]']    = 'balance_transaction';
+		$post_data['expand[]'] = 'balance_transaction';
 
 		$metadata = array(
-			__( 'Customer Name', 'woocommerce-gateway-stripe' ) => sanitize_text_field( $billing_first_name ) . ' ' . sanitize_text_field( $billing_last_name ),
-			__( 'Customer Email', 'woocommerce-gateway-stripe' ) => sanitize_email( $billing_email ),
+			__('Customer Name', 'woocommerce-gateway-stripe') => sanitize_text_field($billing_first_name) . ' ' . sanitize_text_field($billing_last_name),
+			__('Customer Email', 'woocommerce-gateway-stripe') => sanitize_email($billing_email),
 		);
 
-		$post_data['metadata'] = apply_filters( 'wc_stripe_payment_metadata', $metadata, $order, $source );
+		$post_data['metadata'] = apply_filters('wc_stripe_payment_metadata', $metadata, $order, $source);
 
-		if ( $source->customer ) {
+		if ($source->customer) {
 			$post_data['customer'] = $source->customer;
 		}
 
-		if ( $source->source ) {
+		if ($source->source) {
 			$post_data['source'] = $source->source;
 		}
 
@@ -626,7 +626,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);
 	}
 
 	/**
@@ -638,37 +638,37 @@ 
 	 * @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 {
 				// Not saving token, so don't define customer either.
 				$stripe_source   = $stripe_token;
 				$stripe_customer = false;
 			}
-		} elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) {
+		} elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) {
 			// Use an existing token, and then process the payment
 
-			$token_id = wc_clean( $_POST['wc-stripe-payment-token'] );
-			$token    = WC_Payment_Tokens::get( $token_id );
+			$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();
@@ -692,19 +692,19 @@ 
 	 * @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 ) {
-			$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+		if ($order) {
+			$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
-			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_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;
 			}
 		}
@@ -727,57 +727,57 @@ 
 	 *
 	 * @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)));
 				}
 
-				$this->log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				$this->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();
-						$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $message );
-						throw new Exception( $message );
+						$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($message);
+						throw new Exception($message);
 					}
 
 					$localized_messages = $this->get_localized_messages();
 
-					$message = isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message();
+					$message = isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message();
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($message);
 				}
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -785,23 +785,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' );
-			$this->log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			$this->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',
@@ -816,56 +816,56 @@ 
 	 * @param WC_Order $order For to which the source applies.
 	 * @param stdClass $source Source information.
 	 */
-	protected function save_source( $order, $source ) {
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+	protected function save_source($order, $source) {
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
 		// 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 ) {
-		$this->log( 'Processing response: ' . print_r( $response, true ) );
+	public function process_response($response, $order) {
+		$this->log('Processing response: ' . print_r($response, true));
 
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
 		// 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 ) ? WC_Stripe::format_number( $response->balance_transaction, 'fee' ) : 0;
-			$net = ! empty( $response->balance_transaction->net ) ? WC_Stripe::format_number( $response->balance_transaction, 'net' ) : 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) ? WC_Stripe::format_number($response->balance_transaction, 'fee') : 0;
+			$net = ! empty($response->balance_transaction->net) ? WC_Stripe::format_number($response->balance_transaction, 'net') : 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 );
-			$this->log( 'Success: ' . $message );
+			$message = sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $response->id);
+			$order->add_order_note($message);
+			$this->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' ) ) ) {
-				version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->reduce_order_stock() : wc_reduce_stock_levels( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				version_compare(WC_VERSION, '3.0.0', '<') ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_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 ) );
-			$this->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));
+			$this->log("Successful auth: $response->id");
 		}
 
 		return $response;
@@ -877,32 +877,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'),
 		);
 	}
 
@@ -912,36 +912,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,
 			);
 		}
 
-		$this->log( "Info: Beginning refund for order $order_id for the amount of {$amount}" );
+		$this->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 ) ) {
-			$this->log( 'Error: ' . $response->get_error_message() );
+		if (is_wp_error($response)) {
+			$this->log('Error: ' . $response->get_error_message());
 			return $response;
-		} elseif ( ! empty( $response->id ) ) {
-			$refund_message = sprintf( __( 'Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe' ), wc_price( $response->amount / 100 ), $response->id, $reason );
-			$order->add_order_note( $refund_message );
-			$this->log( 'Success: ' . html_entity_decode( strip_tags( $refund_message ) ) );
+		} elseif ( ! empty($response->id)) {
+			$refund_message = sprintf(__('Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe'), wc_price($response->amount / 100), $response->id, $reason);
+			$order->add_order_note($refund_message);
+			$this->log('Success: ' . html_entity_decode(strip_tags($refund_message)));
 			return true;
 		}
 	}
@@ -954,10 +954,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);
 		}
 	}
 
@@ -969,9 +969,9 @@ 
 	 *
 	 * @param string $message
 	 */
-	public function log( $message ) {
-		if ( $this->logging ) {
-			WC_Stripe::log( $message );
+	public function log($message) {
+		if ($this->logging) {
+			WC_Stripe::log($message);
 		}
 	}
 }

includes/class-wc-stripe-api.php

Doc Comments -1 removed lines

@@ -23,7 +23,6 @@
 
 	/**
 	 * Set secret API Key.
-	 * @param string $key
 	 */
 	public static function set_secret_key( $secret_key ) {
 		self::$secret_key = $secret_key;

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	 * Set secret API Key.
 	 * @param string $key
 	 */
-	public static function set_secret_key( $secret_key ) {
+	public static function set_secret_key($secret_key) {
 		self::$secret_key = $secret_key;
 	}
 
@@ -34,11 +34,11 @@ 
 	 * @return string
 	 */
 	public static function get_secret_key() {
-		if ( ! self::$secret_key ) {
-			$options = get_option( 'woocommerce_stripe_settings' );
+		if ( ! self::$secret_key) {
+			$options = get_option('woocommerce_stripe_settings');
 
-			if ( isset( $options['testmode'], $options['secret_key'], $options['test_secret_key'] ) ) {
-				self::set_secret_key( 'yes' === $options['testmode'] ? $options['test_secret_key'] : $options['secret_key'] );
+			if (isset($options['testmode'], $options['secret_key'], $options['test_secret_key'])) {
+				self::set_secret_key('yes' === $options['testmode'] ? $options['test_secret_key'] : $options['secret_key']);
 			}
 		}
 		return self::$secret_key;
@@ -51,39 +51,39 @@ 
 	 * @param string $api
 	 * @return array|WP_Error
 	 */
-	public static function request( $request, $api = 'charges', $method = 'POST' ) {
-		self::log( "{$api} request: " . print_r( $request, true ) );
+	public static function request($request, $api = 'charges', $method = 'POST') {
+		self::log("{$api} request: " . print_r($request, true));
 
 		$response = wp_safe_remote_post(
 			self::ENDPOINT . $api,
 			array(
 				'method'        => $method,
 				'headers'       => array(
-					'Authorization'  => 'Basic ' . base64_encode( self::get_secret_key() . ':' ),
+					'Authorization'  => 'Basic ' . base64_encode(self::get_secret_key() . ':'),
 					'Stripe-Version' => '2016-03-07',
 				),
-				'body'       => apply_filters( 'woocommerce_stripe_request_body', $request, $api ),
+				'body'       => apply_filters('woocommerce_stripe_request_body', $request, $api),
 				'timeout'    => 70,
 				'user-agent' => 'WooCommerce ' . WC()->version,
 			)
 		);
 
-		if ( is_wp_error( $response ) || empty( $response['body'] ) ) {
-			self::log( 'Error Response: ' . print_r( $response, true ) );
-			return new WP_Error( 'stripe_error', __( 'There was a problem connecting to the payment gateway.', 'woocommerce-gateway-stripe' ) );
+		if (is_wp_error($response) || empty($response['body'])) {
+			self::log('Error Response: ' . print_r($response, true));
+			return new WP_Error('stripe_error', __('There was a problem connecting to the payment gateway.', 'woocommerce-gateway-stripe'));
 		}
 
-		$parsed_response = json_decode( $response['body'] );
+		$parsed_response = json_decode($response['body']);
 		// Handle response
-		if ( ! empty( $parsed_response->error ) ) {
-			if ( ! empty( $parsed_response->error->param ) ) {
+		if ( ! empty($parsed_response->error)) {
+			if ( ! empty($parsed_response->error->param)) {
 				$code = $parsed_response->error->param;
-			} elseif ( ! empty( $parsed_response->error->code ) ) {
+			} elseif ( ! empty($parsed_response->error->code)) {
 				$code = $parsed_response->error->code;
 			} else {
 				$code = 'stripe_error';
 			}
-			return new WP_Error( $code, $parsed_response->error->message );
+			return new WP_Error($code, $parsed_response->error->message);
 		} else {
 			return $parsed_response;
 		}
@@ -97,11 +97,11 @@ 
 	 *
 	 * @param string $message
 	 */
-	public static function log( $message ) {
-		$options = get_option( 'woocommerce_stripe_settings' );
+	public static function log($message) {
+		$options = get_option('woocommerce_stripe_settings');
 
-		if ( 'yes' === $options['logging'] ) {
-			WC_Stripe::log( $message );
+		if ('yes' === $options['logging']) {
+			WC_Stripe::log($message);
 		}
 	}
 }

includes/class-wc-stripe-customer.php

Doc Comments -1 removed lines

@@ -210,7 +210,6 @@
 	/**
 	 * Get a customers saved cards using their Stripe ID. Cached.
 	 *
-	 * @param  string $customer_id
 	 * @return array
 	 */
 	public function get_cards() {

Spacing +70 added lines, -70 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,10 +32,10 @@ 
 	 * Constructor
 	 * @param integer $user_id
 	 */
-	public function __construct( $user_id = 0 ) {
-		if ( $user_id ) {
-			$this->set_user_id( $user_id );
-			$this->set_id( get_user_meta( $user_id, '_stripe_customer_id', true ) );
+	public function __construct($user_id = 0) {
+		if ($user_id) {
+			$this->set_user_id($user_id);
+			$this->set_id(get_user_meta($user_id, '_stripe_customer_id', true));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 	 * Set Stripe customer ID.
 	 * @param [type] $id [description]
 	 */
-	public function set_id( $id ) {
-		$this->id = wc_clean( $id );
+	public function set_id($id) {
+		$this->id = wc_clean($id);
 	}
 
 	/**
@@ -60,15 +60,15 @@ 
 	 * @return int
 	 */
 	public function get_user_id() {
-		return absint( $this->user_id );
+		return absint($this->user_id);
 	}
 
 	/**
 	 * Set User ID used by WordPress.
 	 * @param int $user_id
 	 */
-	public function set_user_id( $user_id ) {
-		$this->user_id = absint( $user_id );
+	public function set_user_id($user_id) {
+		$this->user_id = absint($user_id);
 	}
 
 	/**
@@ -76,13 +76,13 @@ 
 	 * @return WP_User
 	 */
 	protected function get_user() {
-		return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
+		return $this->get_user_id() ? get_user_by('id', $this->get_user_id()) : false;
 	}
 
 	/**
 	 * Store data from the Stripe API about this customer
 	 */
-	public function set_customer_data( $data ) {
+	public function set_customer_data($data) {
 		$this->customer_data = $data;
 	}
 
@@ -90,12 +90,12 @@ 
 	 * Get data from the Stripe API about this customer
 	 */
 	public function get_customer_data() {
-		if ( empty( $this->customer_data ) && $this->get_id() && false === ( $this->customer_data = get_transient( 'stripe_customer_' . $this->get_id() ) ) ) {
-			$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() );
+		if (empty($this->customer_data) && $this->get_id() && false === ($this->customer_data = get_transient('stripe_customer_' . $this->get_id()))) {
+			$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id());
 
-			if ( ! is_wp_error( $response ) ) {
-				$this->set_customer_data( $response );
-				set_transient( 'stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48 );
+			if ( ! is_wp_error($response)) {
+				$this->set_customer_data($response);
+				set_transient('stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48);
 			}
 		}
 		return $this->customer_data;
@@ -109,7 +109,7 @@ 
 		$data   = $this->get_customer_data();
 		$source = '';
 
-		if ( $data ) {
+		if ($data) {
 			$source = $data->default_source;
 		}
 
@@ -121,10 +121,10 @@ 
 	 * @param array $args
 	 * @return WP_Error|int
 	 */
-	public function create_customer( $args = array() ) {
-		if ( $user = $this->get_user() ) {
-			$billing_first_name = get_user_meta( $user->ID, 'billing_first_name', true );
-			$billing_last_name  = get_user_meta( $user->ID, 'billing_last_name', true );
+	public function create_customer($args = array()) {
+		if ($user = $this->get_user()) {
+			$billing_first_name = get_user_meta($user->ID, 'billing_first_name', true);
+			$billing_last_name  = get_user_meta($user->ID, 'billing_last_name', true);
 
 			$defaults = array(
 				'email'       => $user->user_email,
@@ -139,26 +139,26 @@ 
 
 		$metadata = array();
 
-		$defaults['metadata'] = apply_filters( 'wc_stripe_customer_metadata', $metadata, $user );
+		$defaults['metadata'] = apply_filters('wc_stripe_customer_metadata', $metadata, $user);
 
-		$args     = wp_parse_args( $args, $defaults );
-		$response = WC_Stripe_API::request( $args, 'customers' );
+		$args     = wp_parse_args($args, $defaults);
+		$response = WC_Stripe_API::request($args, 'customers');
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'stripe_error', __( 'Could not create Stripe customer.', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('stripe_error', __('Could not create Stripe customer.', 'woocommerce-gateway-stripe'));
 		}
 
-		$this->set_id( $response->id );
+		$this->set_id($response->id);
 		$this->clear_cache();
-		$this->set_customer_data( $response );
+		$this->set_customer_data($response);
 
-		if ( $this->get_user_id() ) {
-			update_user_meta( $this->get_user_id(), '_stripe_customer_id', $response->id );
+		if ($this->get_user_id()) {
+			update_user_meta($this->get_user_id(), '_stripe_customer_id', $response->id);
 		}
 
-		do_action( 'woocommerce_stripe_add_customer', $args, $response );
+		do_action('woocommerce_stripe_add_customer', $args, $response);
 
 		return $response->id;
 	}
@@ -169,44 +169,44 @@ 
 	 * @param bool $retry
 	 * @return WP_Error|int
 	 */
-	public function add_card( $token, $retry = true ) {
-		if ( ! $this->get_id() ) {
-			if ( ( $response = $this->create_customer() ) && is_wp_error( $response ) ) {
+	public function add_card($token, $retry = true) {
+		if ( ! $this->get_id()) {
+			if (($response = $this->create_customer()) && is_wp_error($response)) {
 				return $response;
 			}
 		}
 
-		$response = WC_Stripe_API::request( array(
+		$response = WC_Stripe_API::request(array(
 			'source' => $token,
-		), 'customers/' . $this->get_id() . '/sources' );
+		), 'customers/' . $this->get_id() . '/sources');
 
-		if ( is_wp_error( $response ) ) {
-			if ( 'customer' === $response->get_error_code() && $retry ) {
+		if (is_wp_error($response)) {
+			if ('customer' === $response->get_error_code() && $retry) {
 				$this->create_customer();
-				return $this->add_card( $token, false );
+				return $this->add_card($token, false);
 			} else {
 				return $response;
 			}
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'error', __( 'Unable to add card', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('error', __('Unable to add card', 'woocommerce-gateway-stripe'));
 		}
 
 		// Add token to WooCommerce
-		if ( $this->get_user_id() && class_exists( 'WC_Payment_Token_CC' ) ) {
+		if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) {
 			$token = new WC_Payment_Token_CC();
-			$token->set_token( $response->id );
-			$token->set_gateway_id( 'stripe' );
-			$token->set_card_type( strtolower( $response->brand ) );
-			$token->set_last4( $response->last4 );
-			$token->set_expiry_month( $response->exp_month );
-			$token->set_expiry_year( $response->exp_year );
-			$token->set_user_id( $this->get_user_id() );
+			$token->set_token($response->id);
+			$token->set_gateway_id('stripe');
+			$token->set_card_type(strtolower($response->brand));
+			$token->set_last4($response->last4);
+			$token->set_expiry_month($response->exp_month);
+			$token->set_expiry_year($response->exp_year);
+			$token->set_user_id($this->get_user_id());
 			$token->save();
 		}
 
 		$this->clear_cache();
 
-		do_action( 'woocommerce_stripe_add_card', $this->get_id(), $token, $response );
+		do_action('woocommerce_stripe_add_card', $this->get_id(), $token, $response);
 
 		return $response->id;
 	}
@@ -220,20 +220,20 @@ 
 	public function get_cards() {
 		$cards = array();
 
-		if ( $this->get_id() && false === ( $cards = get_transient( 'stripe_cards_' . $this->get_id() ) ) ) {
-			$response = WC_Stripe_API::request( array(
+		if ($this->get_id() && false === ($cards = get_transient('stripe_cards_' . $this->get_id()))) {
+			$response = WC_Stripe_API::request(array(
 				'limit'       => 100,
-			), 'customers/' . $this->get_id() . '/sources', 'GET' );
+			), 'customers/' . $this->get_id() . '/sources', 'GET');
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return array();
 			}
 
-			if ( is_array( $response->data ) ) {
+			if (is_array($response->data)) {
 				$cards = $response->data;
 			}
 
-			set_transient( 'stripe_cards_' . $this->get_id(), $cards, HOUR_IN_SECONDS * 48 );
+			set_transient('stripe_cards_' . $this->get_id(), $cards, HOUR_IN_SECONDS * 48);
 		}
 
 		return $cards;
@@ -243,13 +243,13 @@ 
 	 * Delete a card from stripe.
 	 * @param string $card_id
 	 */
-	public function delete_card( $card_id ) {
-		$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field( $card_id ), 'DELETE' );
+	public function delete_card($card_id) {
+		$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field($card_id), 'DELETE');
 
 		$this->clear_cache();
 
-		if ( ! is_wp_error( $response ) ) {
-			do_action( 'wc_stripe_delete_card', $this->get_id(), $response );
+		if ( ! is_wp_error($response)) {
+			do_action('wc_stripe_delete_card', $this->get_id(), $response);
 
 			return true;
 		}
@@ -261,15 +261,15 @@ 
 	 * Set default card in Stripe
 	 * @param string $card_id
 	 */
-	public function set_default_card( $card_id ) {
-		$response = WC_Stripe_API::request( array(
-			'default_source' => sanitize_text_field( $card_id ),
-		), 'customers/' . $this->get_id(), 'POST' );
+	public function set_default_card($card_id) {
+		$response = WC_Stripe_API::request(array(
+			'default_source' => sanitize_text_field($card_id),
+		), 'customers/' . $this->get_id(), 'POST');
 
 		$this->clear_cache();
 
-		if ( ! is_wp_error( $response ) ) {
-			do_action( 'wc_stripe_set_default_card', $this->get_id(), $response );
+		if ( ! is_wp_error($response)) {
+			do_action('wc_stripe_set_default_card', $this->get_id(), $response);
 
 			return true;
 		}
@@ -281,8 +281,8 @@ 
 	 * Deletes caches for this users cards.
 	 */
 	public function clear_cache() {
-		delete_transient( 'stripe_cards_' . $this->get_id() );
-		delete_transient( 'stripe_customer_' . $this->get_id() );
+		delete_transient('stripe_cards_' . $this->get_id());
+		delete_transient('stripe_customer_' . $this->get_id());
 		$this->customer_data = array();
 	}
 }

includes/legacy/class-wc-gateway-stripe-saved-cards.php

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -12,25 +12,25 @@ 
 	 * Constructor
 	 */
 	public function __construct() {
-		add_action( 'wp', array( $this, 'delete_card' ) );
-		add_action( 'woocommerce_after_my_account', array( $this, 'output' ) );
-		add_action( 'wp', array( $this, 'default_card' ) );
+		add_action('wp', array($this, 'delete_card'));
+		add_action('woocommerce_after_my_account', array($this, 'output'));
+		add_action('wp', array($this, 'default_card'));
 	}
 
 	/**
 	 * Display saved cards
 	 */
 	public function output() {
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			return;
 		}
 
-		$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
+		$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
 		$stripe_cards    = $stripe_customer->get_cards();
 		$default_card    = $stripe_customer->get_default_card();
 
-		if ( $stripe_cards ) {
-			wc_get_template( 'saved-cards.php', array( 'cards' => $stripe_cards, 'default_card' => $default_card ), 'woocommerce-gateway-stripe/', untrailingslashit( plugin_dir_path( WC_STRIPE_MAIN_FILE ) ) . '/includes/legacy/templates/' );
+		if ($stripe_cards) {
+			wc_get_template('saved-cards.php', array('cards' => $stripe_cards, 'default_card' => $default_card), 'woocommerce-gateway-stripe/', untrailingslashit(plugin_dir_path(WC_STRIPE_MAIN_FILE)) . '/includes/legacy/templates/');
 		}
 	}
 
@@ -38,22 +38,22 @@ 
 	 * Delete a card
 	 */
 	public function delete_card() {
-		if ( ! isset( $_POST['stripe_delete_card'] ) || ! is_account_page() ) {
+		if ( ! isset($_POST['stripe_delete_card']) || ! is_account_page()) {
 			return;
 		}
 
-		$stripe_customer    = new WC_Stripe_Customer( get_current_user_id() );
+		$stripe_customer    = new WC_Stripe_Customer(get_current_user_id());
 		$stripe_customer_id = $stripe_customer->get_id();
-		$delete_card        = sanitize_text_field( $_POST['stripe_delete_card'] );
+		$delete_card        = sanitize_text_field($_POST['stripe_delete_card']);
 
-		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce( $_POST['_wpnonce'], "stripe_del_card" ) ) {
-			wp_die( __( 'Unable to make default card, please try again', 'woocommerce-gateway-stripe' ) );
+		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce($_POST['_wpnonce'], "stripe_del_card")) {
+			wp_die(__('Unable to make default card, please try again', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( ! $stripe_customer->delete_card( $delete_card ) ) {
-			wc_add_notice( __( 'Unable to delete card.', 'woocommerce-gateway-stripe' ), 'error' );
+		if ( ! $stripe_customer->delete_card($delete_card)) {
+			wc_add_notice(__('Unable to delete card.', 'woocommerce-gateway-stripe'), 'error');
 		} else {
-			wc_add_notice( __( 'Card deleted.', 'woocommerce-gateway-stripe' ), 'success' );
+			wc_add_notice(__('Card deleted.', 'woocommerce-gateway-stripe'), 'success');
 		}
 	}
 
@@ -61,22 +61,22 @@ 
 	 * Make a card as default method
 	 */
 	public function default_card() {
-		if ( ! isset( $_POST['stripe_default_card'] ) || ! is_account_page() ) {
+		if ( ! isset($_POST['stripe_default_card']) || ! is_account_page()) {
 			return;
 		}
 
-		$stripe_customer    = new WC_Stripe_Customer( get_current_user_id() );
+		$stripe_customer    = new WC_Stripe_Customer(get_current_user_id());
 		$stripe_customer_id = $stripe_customer->get_id();
-		$default_source     = sanitize_text_field( $_POST['stripe_default_card'] );
+		$default_source     = sanitize_text_field($_POST['stripe_default_card']);
 
-		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce( $_POST['_wpnonce'], "stripe_default_card" ) ) {
-			wp_die( __( 'Unable to make default card, please try again', 'woocommerce-gateway-stripe' ) );
+		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce($_POST['_wpnonce'], "stripe_default_card")) {
+			wp_die(__('Unable to make default card, please try again', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( ! $stripe_customer->set_default_card( $default_source ) ) {
-			wc_add_notice( __( 'Unable to update default card.', 'woocommerce-gateway-stripe' ), 'error' );
+		if ( ! $stripe_customer->set_default_card($default_source)) {
+			wc_add_notice(__('Unable to update default card.', 'woocommerce-gateway-stripe'), 'error');
 		} else {
-			wc_add_notice( __( 'Default card updated.', 'woocommerce-gateway-stripe' ), 'success' );
+			wc_add_notice(__('Default card updated.', 'woocommerce-gateway-stripe'), 'success');
 		}
 	}
 }

includes/legacy/templates/saved-cards.php

Spacing +15 added lines, -15 removed lines

@@ -1,37 +1,37 @@
-<h2 id="saved-cards" style="margin-top:40px;"><?php _e( 'Saved cards', 'woocommerce-gateway-stripe' ); ?></h2>
+<h2 id="saved-cards" style="margin-top:40px;"><?php _e('Saved cards', 'woocommerce-gateway-stripe'); ?></h2>
 <table class="shop_table">
 	<thead>
 		<tr>
-			<th><?php esc_html_e( 'Card', 'woocommerce-gateway-stripe' ); ?></th>
-			<th><?php esc_html_e( 'Expires', 'woocommerce-gateway-stripe' ); ?></th>
+			<th><?php esc_html_e('Card', 'woocommerce-gateway-stripe'); ?></th>
+			<th><?php esc_html_e('Expires', 'woocommerce-gateway-stripe'); ?></th>
 			<th></th>
 		</tr>
 	</thead>
 	<tbody>
-		<?php foreach ( $cards as $card ) :
-			if ( 'card' !== $card->object ) {
+		<?php foreach ($cards as $card) :
+			if ('card' !== $card->object) {
 				continue;
 			}
 
 			$is_default_card = $card->id === $default_card ? true : false;
 		?>
 		<tr>
-            <td><?php printf( __( '%s card ending in %s', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4 ); ?>
-            	<?php if ( $is_default_card ) echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' ); ?>
+            <td><?php printf(__('%s card ending in %s', 'woocommerce-gateway-stripe'), $card->brand, $card->last4); ?>
+            	<?php if ($is_default_card) echo '<br />' . __('(Default)', 'woocommerce-gateway-stripe'); ?>
             </td>
-            <td><?php printf( __( 'Expires %s/%s', 'woocommerce-gateway-stripe' ), $card->exp_month, $card->exp_year ); ?></td>
+            <td><?php printf(__('Expires %s/%s', 'woocommerce-gateway-stripe'), $card->exp_month, $card->exp_year); ?></td>
 			<td>
                 <form action="" method="POST">
-                    <?php wp_nonce_field ( 'stripe_del_card' ); ?>
-                    <input type="hidden" name="stripe_delete_card" value="<?php echo esc_attr( $card->id ); ?>">
-                    <input type="submit" class="button" value="<?php esc_attr_e( 'Delete card', 'woocommerce-gateway-stripe' ); ?>">
+                    <?php wp_nonce_field('stripe_del_card'); ?>
+                    <input type="hidden" name="stripe_delete_card" value="<?php echo esc_attr($card->id); ?>">
+                    <input type="submit" class="button" value="<?php esc_attr_e('Delete card', 'woocommerce-gateway-stripe'); ?>">
                 </form>
 
-                <?php if ( ! $is_default_card ) { ?>
+                <?php if ( ! $is_default_card) { ?>
 	                <form action="" method="POST" style="margin-top:10px;">
-	                    <?php wp_nonce_field ( 'stripe_default_card' ); ?>
-	                    <input type="hidden" name="stripe_default_card" value="<?php echo esc_attr( $card->id ); ?>">
-	                    <input type="submit" class="button" value="<?php esc_attr_e( 'Make Default', 'woocommerce-gateway-stripe' ); ?>">
+	                    <?php wp_nonce_field('stripe_default_card'); ?>
+	                    <input type="hidden" name="stripe_default_card" value="<?php echo esc_attr($card->id); ?>">
+	                    <input type="submit" class="button" value="<?php esc_attr_e('Make Default', 'woocommerce-gateway-stripe'); ?>">
 	                </form>
                 <?php } ?>
 			</td>

Braces +4 added lines, -1 removed lines

@@ -17,7 +17,10 @@
 		?>
 		<tr>
             <td><?php printf( __( '%s card ending in %s', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4 ); ?>
-            	<?php if ( $is_default_card ) echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' ); ?>
+            	<?php if ( $is_default_card ) {
+	echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' );
+}
+?>
             </td>
             <td><?php printf( __( 'Expires %s/%s', 'woocommerce-gateway-stripe' ), $card->exp_month, $card->exp_year ); ?></td>
 			<td>

includes/legacy/class-wc-gateway-stripe.php

Spacing +186 added lines, -186 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -15,8 +15,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(
@@ -42,35 +42,35 @@ 
 		$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->logging                = 'yes' === $this->get_option( 'logging' );
-
-		if ( $this->stripe_checkout ) {
-			$this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' );
+		$this->title                  = $this->get_option('title');
+		$this->description            = $this->get_option('description');
+		$this->enabled                = $this->get_option('enabled');
+		$this->testmode               = 'yes' === $this->get_option('testmode');
+		$this->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->logging                = 'yes' === $this->get_option('logging');
+
+		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 );
+		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 );
+		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'));
 	}
 
 	/**
@@ -80,35 +80,35 @@ 
 	 * @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 ) {
-			$icon .= '<img src="' . WC_HTTPS::force_https_url( plugins_url( '/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE ) ) . '" alt="Bitcoin" width="32" ' . $style . ' />';
+		if ($this->bitcoin) {
+			$icon .= '<img src="' . WC_HTTPS::force_https_url(plugins_url('/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE)) . '" alt="Bitcoin" width="32" ' . $style . ' />';
 		}
 
-		return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icon, $this->id);
 	}
 
 	/**
 	 * Get Stripe amount to pay
 	 * @return float
 	 */
-	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' :
@@ -125,10 +125,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;
@@ -138,31 +138,31 @@ 
 	 * Check if SSL is enabled and notify the user
 	 */
 	public function admin_notices() {
-		if ( $this->enabled == 'no' ) {
+		if ($this->enabled == 'no') {
 			return;
 		}
 
-		$addons = ( class_exists( 'WC_Subscriptions_Order' ) || class_exists( 'WC_Pre_Orders_Order' ) ) ? '_addons' : '';
+		$addons = (class_exists('WC_Subscriptions_Order') || class_exists('WC_Pre_Orders_Order')) ? '_addons' : '';
 
 		// Check required fields
-		if ( ! $this->secret_key ) {
-			echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Please enter your secret key <a href="%s">here</a>', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons ) ) . '</p></div>';
+		if ( ! $this->secret_key) {
+			echo '<div class="error"><p>' . sprintf(__('Stripe error: Please enter your secret key <a href="%s">here</a>', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons)) . '</p></div>';
 			return;
 
-		} elseif ( ! $this->publishable_key ) {
-			echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Please enter your publishable key <a href="%s">here</a>', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons ) ) . '</p></div>';
+		} elseif ( ! $this->publishable_key) {
+			echo '<div class="error"><p>' . sprintf(__('Stripe error: Please enter your publishable key <a href="%s">here</a>', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons)) . '</p></div>';
 			return;
 		}
 
 		// Simple check for duplicate keys
-		if ( $this->secret_key == $this->publishable_key ) {
-			echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Your secret and publishable keys match. Please check and re-enter.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons ) ) . '</p></div>';
+		if ($this->secret_key == $this->publishable_key) {
+			echo '<div class="error"><p>' . sprintf(__('Stripe error: Your secret and publishable keys match. Please check and re-enter.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=wc_gateway_stripe' . $addons)) . '</p></div>';
 			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"><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"><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>';
 		}
 	}
 
@@ -170,11 +170,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;
@@ -186,9 +186,9 @@ 
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = include( untrailingslashit( plugin_dir_path( WC_STRIPE_MAIN_FILE ) ) . '/includes/settings-stripe.php' );
+		$this->form_fields = include(untrailingslashit(plugin_dir_path(WC_STRIPE_MAIN_FILE)) . '/includes/settings-stripe.php');
 
-		wc_enqueue_js( "
+		wc_enqueue_js("
 			jQuery( function( $ ) {
 				$( '#woocommerce_stripe_stripe_checkout' ).change(function(){
 					if ( $( this ).is( ':checked' ) ) {
@@ -208,25 +208,25 @@ 
 		?>
 		<fieldset class="stripe-legacy-payment-fields">
 			<?php
-				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 ( $this->saved_cards && is_user_logged_in() ) {
-					$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
+				if ($this->saved_cards && is_user_logged_in()) {
+					$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
 					?>
 					<p class="form-row form-row-wide">
-						<a class="<?php echo apply_filters( 'wc_stripe_manage_saved_cards_class', 'button' ); ?>" style="float:right;" href="<?php echo apply_filters( 'wc_stripe_manage_saved_cards_url', get_permalink( get_option( 'woocommerce_myaccount_page_id' ) ) ); ?>#saved-cards"><?php esc_html_e( 'Manage cards', 'woocommerce-gateway-stripe' ); ?></a>
+						<a class="<?php echo apply_filters('wc_stripe_manage_saved_cards_class', 'button'); ?>" style="float:right;" href="<?php echo apply_filters('wc_stripe_manage_saved_cards_url', get_permalink(get_option('woocommerce_myaccount_page_id'))); ?>#saved-cards"><?php esc_html_e('Manage cards', 'woocommerce-gateway-stripe'); ?></a>
 						<?php
-						if ( $cards = $stripe_customer->get_cards() ) {
+						if ($cards = $stripe_customer->get_cards()) {
 							$default_card = $cards[0]->id;
-							foreach ( (array) $cards as $card ) {
-								if ( 'card' !== $card->object ) {
+							foreach ((array) $cards as $card) {
+								if ('card' !== $card->object) {
 									continue;
 								}
 								?>
-								<label for="stripe_card_<?php echo $card->id; ?>" class="brand-<?php echo esc_attr( strtolower( $card->brand ) ); ?>">
-									<input type="radio" id="stripe_card_<?php echo $card->id; ?>" name="wc-stripe-payment-token" value="<?php echo $card->id; ?>" <?php checked( $default_card, $card->id ) ?> />
-									<?php printf( __( '%s card ending in %s (Expires %s/%s)', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4, $card->exp_month, $card->exp_year ); ?>
+								<label for="stripe_card_<?php echo $card->id; ?>" class="brand-<?php echo esc_attr(strtolower($card->brand)); ?>">
+									<input type="radio" id="stripe_card_<?php echo $card->id; ?>" name="wc-stripe-payment-token" value="<?php echo $card->id; ?>" <?php checked($default_card, $card->id) ?> />
+									<?php printf(__('%s card ending in %s (Expires %s/%s)', 'woocommerce-gateway-stripe'), $card->brand, $card->last4, $card->exp_month, $card->exp_year); ?>
 								</label>
 								<?php
 							}
@@ -234,7 +234,7 @@ 
 						?>
 						<label for="new">
 							<input type="radio" id="new" name="wc-stripe-payment-token" value="new" />
-							<?php _e( 'Use a new credit card', 'woocommerce-gateway-stripe' ); ?>
+							<?php _e('Use a new credit card', 'woocommerce-gateway-stripe'); ?>
 						</label>
 					</p>
 					<?php
@@ -242,8 +242,8 @@ 
 
 				$user = wp_get_current_user();
 
-				if ( $user ) {
-					$user_email = get_user_meta( $user->ID, 'billing_email', true );
+				if ($user) {
+					$user_email = get_user_meta($user->ID, 'billing_email', true);
 					$user_email = $user_email ? $user_email : $user->user_email;
 				} else {
 					$user_email = '';
@@ -251,22 +251,22 @@ 
 
 				$display = '';
 
-				if ( $this->stripe_checkout || $this->saved_cards && ! empty( $cards ) ) {
+				if ($this->stripe_checkout || $this->saved_cards && ! empty($cards)) {
 					$display = 'style="display:none;"';
 				}
 
 				echo '<div ' . $display . ' id="stripe-payment-data"
 					data-description=""
-					data-email="' . esc_attr( $user_email ) . '"
-					data-amount="' . esc_attr( $this->get_stripe_amount( WC()->cart->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' ) . '">';
-
-				if ( ! $this->stripe_checkout ) {
-					$this->credit_card_form( array( 'fields_have_names' => false ) );
+					data-email="' . esc_attr($user_email) . '"
+					data-amount="' . esc_attr($this->get_stripe_amount(WC()->cart->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') . '">';
+
+				if ( ! $this->stripe_checkout) {
+					$this->credit_card_form(array('fields_have_names' => false));
 				}
 
 				echo '</div>';
@@ -283,27 +283,27 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( $this->stripe_checkout ) {
-			wp_enqueue_script( 'stripe', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true );
-			wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe_checkout.js', WC_STRIPE_MAIN_FILE ), array( 'stripe' ), WC_STRIPE_VERSION, true );
+		if ($this->stripe_checkout) {
+			wp_enqueue_script('stripe', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true);
+			wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe_checkout.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.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.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 ( is_checkout_pay_page() && isset( $_GET['order'] ) && isset( $_GET['order_id'] ) ) {
-			$order_key = urldecode( $_GET['order'] );
-			$order_id  = absint( $_GET['order_id'] );
-			$order     = wc_get_order( $order_id );
+		if (is_checkout_pay_page() && isset($_GET['order']) && isset($_GET['order_id'])) {
+			$order_key = urldecode($_GET['order']);
+			$order_id  = absint($_GET['order_id']);
+			$order     = wc_get_order($order_id);
 
-			if ( $order->id === $order_id && $order->order_key === $order_key ) {
+			if ($order->id === $order_id && $order->order_key === $order_key) {
 				$stripe_params['billing_first_name'] = $order->billing_first_name;
 				$stripe_params['billing_last_name']  = $order->billing_last_name;
 				$stripe_params['billing_address_1']  = $order->billing_address_1;
@@ -315,7 +315,7 @@ 
 			}
 		}
 
-		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));
 	}
 
 	/**
@@ -324,28 +324,28 @@ 
 	 * @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;
 		}
 
-		return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source );
+		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source);
 	}
 
 	/**
@@ -353,22 +353,22 @@ 
 	 * @param  bool $force_customer Should we force customer creation?
 	 * @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 {
@@ -379,8 +379,8 @@ 
 		}
 
 		// Use an existing token, and then process the payment
-		elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) {
-			$stripe_source = wc_clean( $_POST['wc-stripe-payment-token'] );
+		elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) {
+			$stripe_source = wc_clean($_POST['wc-stripe-payment-token']);
 		}
 
 		return (object) array(
@@ -401,16 +401,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;
 			}
 		}
@@ -425,43 +425,43 @@ 
 	/**
 	 * Process the payment
 	 */
-	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);
 					}
-					throw new Exception( $response->get_error_code() . ': ' . $response->get_error_message() );
+					throw new Exception($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();
 			}
@@ -472,13 +472,13 @@ 
 			// 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()->session->set( 'refresh_totals', true );
-			WC_Stripe::log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC()->session->set('refresh_totals', true);
+			WC_Stripe::log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage()));
 			return;
 		}
 	}
@@ -486,45 +486,45 @@ 
 	/**
 	 * Save source to order.
 	 */
-	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->id );
+		if ($source->source) {
+			update_post_meta($order->id, '_stripe_card_id', $source->source->id);
 		}
 	}
 
 	/**
 	 * 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 ) ) {
-			$fee = number_format( $response->balance_transaction->fee / 100, 2, '.', '' );
-			update_post_meta( $order->id, 'Stripe Fee', $fee );
-			update_post_meta( $order->id, 'Net Revenue From Stripe', $order->get_total() - $fee );
+		if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) {
+			$fee = number_format($response->balance_transaction->fee / 100, 2, '.', '');
+			update_post_meta($order->id, 'Stripe Fee', $fee);
+			update_post_meta($order->id, 'Net Revenue From Stripe', $order->get_total() - $fee);
 		}
 
-		if ( $response->captured ) {
-			$order->payment_complete( $response->id );
-			WC_Stripe::log( "Successful charge: $response->id" );
+		if ($response->captured) {
+			$order->payment_complete($response->id);
+			WC_Stripe::log("Successful charge: $response->id");
 		} 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;
@@ -536,21 +536,21 @@ 
 	 * @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() );
-		$result          = $stripe_customer->add_card( wc_clean( $_POST['stripe_token'] ) );
+		$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+		$result          = $stripe_customer->add_card(wc_clean($_POST['stripe_token']));
 
-		if ( is_wp_error( $result ) ) {
-			throw new Exception( $result->get_error_message() );
+		if (is_wp_error($result)) {
+			throw new Exception($result->get_error_message());
 		}
 
 		return array(
 			'result'   => 'success',
-			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
+			'redirect' => wc_get_endpoint_url('payment-methods'),
 		);
 	}
 
@@ -560,36 +560,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;
 		}
 	}

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

Spacing +84 added lines, -84 removed lines

@@ -7,7 +7,7 @@ 
  * @version 3.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,12 +20,12 @@ 
 	 * Initialize class actions.
 	 */
 	public function __construct() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 
-		add_action( 'wc_ajax_wc_stripe_get_cart_details', array( $this, 'ajax_get_cart_details' ) );
-		add_action( 'wc_ajax_wc_stripe_get_shipping_options', array( $this, 'ajax_get_shipping_options' ) );
-		add_action( 'wc_ajax_wc_stripe_update_shipping_method', array( $this, 'ajax_update_shipping_method' ) );
-		add_action( 'wc_ajax_wc_stripe_create_order', array( $this, 'ajax_create_order' ) );
+		add_action('wc_ajax_wc_stripe_get_cart_details', array($this, 'ajax_get_cart_details'));
+		add_action('wc_ajax_wc_stripe_get_shipping_options', array($this, 'ajax_get_shipping_options'));
+		add_action('wc_ajax_wc_stripe_update_shipping_method', array($this, 'ajax_update_shipping_method'));
+		add_action('wc_ajax_wc_stripe_create_order', array($this, 'ajax_create_order'));
 	}
 
 	/**
@@ -34,10 +34,10 @@ 
 	 * @return bool
 	 */
 	protected function is_activated() {
-		$options             = get_option( 'woocommerce_stripe_settings', array() );
-		$enabled             = isset( $options['enabled'] ) && 'yes' === $options['enabled'];
-		$stripe_checkout     = isset( $options['stripe_checkout'] ) && 'yes' !== $options['stripe_checkout'];
-		$request_payment_api = isset( $options['request_payment_api'] ) && 'yes' === $options['request_payment_api'];
+		$options             = get_option('woocommerce_stripe_settings', array());
+		$enabled             = isset($options['enabled']) && 'yes' === $options['enabled'];
+		$stripe_checkout     = isset($options['stripe_checkout']) && 'yes' !== $options['stripe_checkout'];
+		$request_payment_api = isset($options['request_payment_api']) && 'yes' === $options['request_payment_api'];
 
 		return $enabled && $stripe_checkout && $request_payment_api && is_ssl();
 	}
@@ -48,9 +48,9 @@ 
 	 * @return string
 	 */
 	protected function get_publishable_key() {
-		$options = get_option( 'woocommerce_stripe_settings', array() );
+		$options = get_option('woocommerce_stripe_settings', array());
 
-		if ( empty( $options ) ) {
+		if (empty($options)) {
 			return '';
 		}
 
@@ -62,39 +62,39 @@ 
 	 */
 	public function scripts() {
 		// Load PaymentRequest only on cart for now.
-		if ( ! is_cart() ) {
+		if ( ! is_cart()) {
 			return;
 		}
 
-		if ( ! $this->is_activated() ) {
+		if ( ! $this->is_activated()) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '1.0', true );
-		wp_enqueue_script( 'google-payment-request-shim', 'https://storage.googleapis.com/prshim/v1/payment-shim.js', '', '1.0', false );
-		wp_enqueue_script( 'wc-stripe-payment-request', plugins_url( 'assets/js/payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '1.0', true);
+		wp_enqueue_script('google-payment-request-shim', 'https://storage.googleapis.com/prshim/v1/payment-shim.js', '', '1.0', false);
+		wp_enqueue_script('wc-stripe-payment-request', plugins_url('assets/js/payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery', 'stripe'), WC_STRIPE_VERSION, true);
 
 		wp_localize_script(
 			'wc-stripe-payment-request',
 			'wcStripePaymentRequestParams',
 			array(
-				'ajax_url' => WC_AJAX::get_endpoint( '%%endpoint%%' ),
+				'ajax_url' => WC_AJAX::get_endpoint('%%endpoint%%'),
 				'stripe'   => array(
 					'key'                => $this->get_publishable_key(),
-					'allow_prepaid_card' => apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no',
+					'allow_prepaid_card' => apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no',
 				),
 				'nonce'    => array(
-					'payment'         => wp_create_nonce( 'wc-stripe-payment-request' ),
-					'shipping'        => wp_create_nonce( 'wc-stripe-payment-request-shipping' ),
-					'update_shipping' => wp_create_nonce( 'wc-stripe-update-shipping-method' ),
-					'checkout'        => wp_create_nonce( 'woocommerce-process_checkout' ),
+					'payment'         => wp_create_nonce('wc-stripe-payment-request'),
+					'shipping'        => wp_create_nonce('wc-stripe-payment-request-shipping'),
+					'update_shipping' => wp_create_nonce('wc-stripe-update-shipping-method'),
+					'checkout'        => wp_create_nonce('woocommerce-process_checkout'),
 				),
 				'i18n'     => array(
-					'no_prepaid_card'  => __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ),
+					'no_prepaid_card'  => __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'),
 					/* translators: Do not translate the [option] placeholder */
-					'unknown_shipping' => __( 'Unknown shipping option "[option]".', 'woocommerce-gateway-stripe' ),
+					'unknown_shipping' => __('Unknown shipping option "[option]".', 'woocommerce-gateway-stripe'),
 				),
 			)
 		);
@@ -104,10 +104,10 @@ 
 	 * Get cart details.
 	 */
 	public function ajax_get_cart_details() {
-		check_ajax_referer( 'wc-stripe-payment-request', 'security' );
+		check_ajax_referer('wc-stripe-payment-request', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		WC()->cart->calculate_totals();
@@ -119,18 +119,18 @@ 
 			'shipping_required' => WC()->cart->needs_shipping(),
 			'order_data'        => array(
 				'total' => array(
-					'label'  => __( 'Total', 'woocommerce-gateway-stripe' ),
+					'label'  => __('Total', 'woocommerce-gateway-stripe'),
 					'amount' => array(
-						'value'    => max( 0, apply_filters( 'woocommerce_calculated_total', round( WC()->cart->cart_contents_total + WC()->cart->fee_total + WC()->cart->tax_total, WC()->cart->dp ), WC()->cart ) ),
+						'value'    => max(0, apply_filters('woocommerce_calculated_total', round(WC()->cart->cart_contents_total + WC()->cart->fee_total + WC()->cart->tax_total, WC()->cart->dp), WC()->cart)),
 						'currency' => $currency,
 					),
 				),
 				// Include line items such as subtotal, fees and taxes. No shipping option is provided here because it is not chosen yet.
-				'displayItems' => $this->compute_display_items( null ),
+				'displayItems' => $this->compute_display_items(null),
 			),
 		);
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @version 3.1.0
 	 * @param array $address
 	 */
-	public function calculate_shipping( $address = array() ) {
+	public function calculate_shipping($address = array()) {
 		$country   = $address['country'];
 		$state     = $address['state'];
 		$postcode  = $address['postcode'];
@@ -150,19 +150,19 @@ 
 
 		WC()->shipping->reset_shipping();
 
-		if ( $postcode && WC_Validation::is_postcode( $postcode, $country ) ) {
-			$postcode = wc_format_postcode( $postcode, $country );
+		if ($postcode && WC_Validation::is_postcode($postcode, $country)) {
+			$postcode = wc_format_postcode($postcode, $country);
 		}
 
-		if ( $country ) {
-			WC()->customer->set_location( $country, $state, $postcode, $city );
-			WC()->customer->set_shipping_location( $country, $state, $postcode, $city );
+		if ($country) {
+			WC()->customer->set_location($country, $state, $postcode, $city);
+			WC()->customer->set_shipping_location($country, $state, $postcode, $city);
 		} else {
 			WC()->customer->set_to_base();
 			WC()->customer->set_shipping_to_base();
 		}
 
-		WC()->customer->calculated_shipping( true );
+		WC()->customer->calculated_shipping(true);
 
 		$packages = array();
 
@@ -177,17 +177,17 @@ 
 		$packages[0]['destination']['address']   = $address_1;
 		$packages[0]['destination']['address_2'] = $address_2;
 
-		foreach ( WC()->cart->get_cart() as $item ) {
-			if ( $item['data']->needs_shipping() ) {
-				if ( isset( $item['line_total'] ) ) {
+		foreach (WC()->cart->get_cart() as $item) {
+			if ($item['data']->needs_shipping()) {
+				if (isset($item['line_total'])) {
 					$packages[0]['contents_cost'] += $item['line_total'];
 				}
 			}
 		}
 
-		$packages = apply_filters( 'woocommerce_cart_shipping_packages', $packages );
+		$packages = apply_filters('woocommerce_cart_shipping_packages', $packages);
 
-		WC()->shipping->calculate_shipping( $packages );
+		WC()->shipping->calculate_shipping($packages);
 	}
 
 	/**
@@ -198,19 +198,19 @@ 
 	 * @see WC_Shipping::get_packages().
 	 */
 	public function ajax_get_shipping_options() {
-		check_ajax_referer( 'wc-stripe-payment-request-shipping', 'security' );
+		check_ajax_referer('wc-stripe-payment-request-shipping', 'security');
 
 		// Set the shipping package.
-		$posted   = filter_input_array( INPUT_POST, array(
+		$posted = filter_input_array(INPUT_POST, array(
 			'country'   => FILTER_SANITIZE_STRING,
 			'state'     => FILTER_SANITIZE_STRING,
 			'postcode'  => FILTER_SANITIZE_STRING,
 			'city'      => FILTER_SANITIZE_STRING,
 			'address'   => FILTER_SANITIZE_STRING,
 			'address_2' => FILTER_SANITIZE_STRING,
-		) );
+		));
 
-		$this->calculate_shipping( $posted );
+		$this->calculate_shipping($posted);
 
 		// Set the shipping options.
 		$currency = get_woocommerce_currency();
@@ -218,13 +218,13 @@ 
 
 		$packages = WC()->shipping->get_packages();
 
-		if ( ! empty( $packages ) && WC()->customer->has_calculated_shipping() ) {
-			foreach ( $packages as $package_key => $package ) {
-				if ( empty( $package['rates'] ) ) {
+		if ( ! empty($packages) && WC()->customer->has_calculated_shipping()) {
+			foreach ($packages as $package_key => $package) {
+				if (empty($package['rates'])) {
 					break;
 				}
 
-				foreach ( $package['rates'] as $key => $rate ) {
+				foreach ($package['rates'] as $key => $rate) {
 					$data[] = array(
 						'id'       => $rate->id,
 						'label'    => $rate->label,
@@ -239,60 +239,60 @@ 
 		}
 
 		// Auto select when have only one shipping method available.
-		if ( 1 === count( $data ) ) {
+		if (1 === count($data)) {
 			$data[0]['selected'] = true;
 		}
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
 	 * Update shipping method.
 	 */
 	public function ajax_update_shipping_method() {
-		check_ajax_referer( 'wc-stripe-update-shipping-method', 'security' );
+		check_ajax_referer('wc-stripe-update-shipping-method', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
-		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-		$shipping_method         = filter_input( INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+		$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
+		$shipping_method         = filter_input(INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
 
-		if ( is_array( $shipping_method ) ) {
-			foreach ( $shipping_method as $i => $value ) {
-				$chosen_shipping_methods[ $i ] = wc_clean( $value );
+		if (is_array($shipping_method)) {
+			foreach ($shipping_method as $i => $value) {
+				$chosen_shipping_methods[$i] = wc_clean($value);
 			}
 		}
 
-		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+		WC()->session->set('chosen_shipping_methods', $chosen_shipping_methods);
 
 		WC()->cart->calculate_totals();
 
 		// Send back the new cart total and line items to be displayed, such as subtotal, shipping rate(s), fees and taxes.
-		$data      = array(
+		$data = array(
 			'total' => WC()->cart->total,
-			'items' => $this->compute_display_items( $shipping_method[0] ),
+			'items' => $this->compute_display_items($shipping_method[0]),
 		);
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
 	 * Create order.
 	 */
 	public function ajax_create_order() {
-		if ( WC()->cart->is_empty() ) {
-			wp_send_json_error( __( 'Empty cart', 'woocommerce-gateway-stripe' ) );
+		if (WC()->cart->is_empty()) {
+			wp_send_json_error(__('Empty cart', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
+		if ( ! defined('WOOCOMMERCE_CHECKOUT')) {
+			define('WOOCOMMERCE_CHECKOUT', true);
 		}
 
 		WC()->checkout()->process_checkout();
 
-		die( 0 );
+		die(0);
 	}
 
 	/**
@@ -300,26 +300,26 @@ 
 	 *
 	 * @param string shipping_method_id If shipping method ID is provided, will include display items about shipping.
 	 */
-	protected function compute_display_items( $shipping_method_id ) {
+	protected function compute_display_items($shipping_method_id) {
 		$currency = get_woocommerce_currency();
 		$items = array(
 			// Subtotal excluding tax, because taxes is a separate item, below.
 			array(
-				'label' => __( 'Subtotal', 'woocommerce-gateway-stripe' ),
+				'label' => __('Subtotal', 'woocommerce-gateway-stripe'),
 				'amount' => array(
-					'value'    => max( 0, round( WC()->cart->subtotal_ex_tax, WC()->cart->dp ) ),
+					'value'    => max(0, round(WC()->cart->subtotal_ex_tax, WC()->cart->dp)),
 					'currency' => $currency,
 				),
 			),
 		);
 		// If a chosen shipping option was provided, add line item(s) for it and include the shipping tax.
-		$tax_total = max( 0, round( WC()->cart->tax_total, WC()->cart->dp ) );
-		if ( $shipping_method_id ) {
-			$tax_total = max( 0, round( WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp ) );
+		$tax_total = max(0, round(WC()->cart->tax_total, WC()->cart->dp));
+		if ($shipping_method_id) {
+			$tax_total = max(0, round(WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp));
 			// Look through the package rates for $shipping_method_id, and when found, add a line item.
-			foreach ( WC()->shipping->get_packages() as $package_key => $package ) {
-				foreach ( $package['rates'] as $key => $rate ) {
-					if ( $rate->id  == $shipping_method_id ) {
+			foreach (WC()->shipping->get_packages() as $package_key => $package) {
+				foreach ($package['rates'] as $key => $rate) {
+					if ($rate->id == $shipping_method_id) {
 						$items[] = array(
 							'label' => $rate->label,
 							'amount' => array(
@@ -333,7 +333,7 @@ 
 			}
 		}
 		// Include fees and taxes as display items.
-		foreach ( WC()->cart->fees as $key => $fee ) {
+		foreach (WC()->cart->fees as $key => $fee) {
 			$items[] = array(
 				'label'  => $fee->name,
 				'amount' => array(
@@ -343,9 +343,9 @@ 
 			);
 		}
 		// The tax total may include the shipping taxes if a shipping option is provided.
-		if ( 0 < $tax_total ) {
+		if (0 < $tax_total) {
 			$items[] = array(
-				'label'  => __( 'Tax', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Tax', 'woocommerce-gateway-stripe'),
 				'amount' => array(
 					'currency' => $currency,
 					'value'    => $tax_total,

includes/settings-stripe.php

Spacing +71 added lines, -71 removed lines

@@ -1,184 +1,184 @@
 <?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,
 		),
 		'statement_descriptor' => array(
-			'title'       => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Statement Descriptor', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Extra information about a charge. This will appear on your customer’s credit card statement.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Extra information about a charge. This will appear on your customer’s credit card statement.', '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'       => sprintf( __( 'Enable Apple Pay. %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>' ),
+			'title'       => __('Apple Pay', 'woocommerce-gateway-stripe'),
+			'label'       => sprintf(__('Enable Apple Pay. %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 with Apple Pay.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay with Apple Pay.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'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'),
 			),
 		),
 		'apple_pay_button_lang' => array(
-			'title'       => __( 'Apple Pay Button Language', 'woocommerce-gateway-stripe' ),
-			'description' => __( 'Enter the 2 letter ISO code for the language you would like your Apple Pay Button to display in. Reference available ISO codes here <code>http://www.w3schools.com/tags/ref_language_codes.asp</code>', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Apple Pay Button Language', 'woocommerce-gateway-stripe'),
+			'description' => __('Enter the 2 letter ISO code for the language you would like your Apple Pay Button to display in. Reference available ISO codes here <code>http://www.w3schools.com/tags/ref_language_codes.asp</code>', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
 			'default'     => 'en',
 			'desc_tip'    => false,
 		),
 		'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,
 		),