woocommerce / woocommerce-gateway-stripe

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

Spacing +69 added lines, -69 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sofort';
-		$this->method_title         = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,9 +98,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sofort_supported_currencies', array(
+		return apply_filters('wc_stripe_sofort_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -132,7 +132,7 @@ 
 
 		$icons_str .= $icons['sofort'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -143,19 +143,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php');
 	}
 
 	/**
@@ -166,25 +166,25 @@ 
 		$total = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-sofort-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ), $this->id );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)), $this->id);
 		}
 
 		echo '</div>';
@@ -198,28 +198,28 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$bank_country          = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'sofort';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 		$post_data['sofort']   = array(
 			'country'            => $bank_country,
 			'preferred_language' => $this->get_locale(),
 		);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating SOFORT source' );
+		WC_Stripe_Logger::log('Info: Begin creating SOFORT source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_sofort_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_sofort_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -233,59 +233,59 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'invalid_sofort_country' === $response->error->code ) {
-					$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('invalid_sofort_country' === $response->error->code) {
+					$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to SOFORT...' );
+			WC_Stripe_Logger::log('Info: Redirecting to SOFORT...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +64 added lines, -64 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_p24';
-		$this->method_title         = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe P24', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,10 +98,10 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_p24_supported_currencies', array(
+		return apply_filters('wc_stripe_p24_supported_currencies', array(
 			'EUR',
 			'PLN',
-		) );
+		));
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -133,7 +133,7 @@ 
 
 		$icons_str .= $icons['p24'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -144,19 +144,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php');
 	}
 
 	/**
@@ -167,25 +167,25 @@ 
 		$total = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-p24-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ), $this->id );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)), $this->id);
 		}
 
 		echo '</div>';
@@ -199,20 +199,20 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id              = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'p24';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		WC_Stripe_Logger::log( 'Info: Begin creating P24 source' );
+		WC_Stripe_Logger::log('Info: Begin creating P24 source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_p24_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_p24_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -226,51 +226,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to P24...' );
+			WC_Stripe_Logger::log('Info: Redirecting to P24...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/class-wc-stripe-customer.php

Spacing +81 added lines, -81 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,10 +32,10 @@ 
 	 * Constructor
 	 * @param int $user_id The WP user ID
 	 */
-	public function __construct( $user_id = 0 ) {
-		if ( $user_id ) {
-			$this->set_user_id( $user_id );
-			$this->set_id( get_user_meta( $user_id, '_stripe_customer_id', true ) );
+	public function __construct($user_id = 0) {
+		if ($user_id) {
+			$this->set_user_id($user_id);
+			$this->set_id(get_user_meta($user_id, '_stripe_customer_id', true));
 		}
 	}
 
@@ -51,15 +51,15 @@ 
 	 * Set Stripe customer ID.
 	 * @param [type] $id [description]
 	 */
-	public function set_id( $id ) {
+	public function set_id($id) {
 		// Backwards compat for customer ID stored in array format. (Pre 3.0)
-		if ( is_array( $id ) && isset( $id['customer_id'] ) ) {
+		if (is_array($id) && isset($id['customer_id'])) {
 			$id = $id['customer_id'];
 
-			update_user_meta( $this->get_user_id(), '_stripe_customer_id', $id );
+			update_user_meta($this->get_user_id(), '_stripe_customer_id', $id);
 		}
 
-		$this->id = wc_clean( $id );
+		$this->id = wc_clean($id);
 	}
 
 	/**
@@ -67,15 +67,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);
 	}
 
 	/**
@@ -83,13 +83,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;
 	}
 
@@ -98,13 +98,13 @@ 
 	 * @param array $args
 	 * @return WP_Error|int
 	 */
-	public function create_customer( $args = array() ) {
-		$billing_email = isset( $_POST['billing_email'] ) ? filter_var( $_POST['billing_email'], FILTER_SANITIZE_EMAIL ) : '';
+	public function create_customer($args = array()) {
+		$billing_email = isset($_POST['billing_email']) ? filter_var($_POST['billing_email'], FILTER_SANITIZE_EMAIL) : '';
 		$user = $this->get_user();
 
-		if ( $user ) {
-			$billing_first_name = get_user_meta( $user->ID, 'billing_first_name', true );
-			$billing_last_name  = get_user_meta( $user->ID, 'billing_last_name', true );
+		if ($user) {
+			$billing_first_name = get_user_meta($user->ID, 'billing_first_name', true);
+			$billing_last_name  = get_user_meta($user->ID, 'billing_last_name', true);
 
 			$defaults = array(
 				'email'       => $user->user_email,
@@ -119,24 +119,24 @@ 
 
 		$metadata = array();
 
-		$defaults['metadata'] = apply_filters( 'wc_stripe_customer_metadata', $metadata, $user );
+		$defaults['metadata'] = apply_filters('wc_stripe_customer_metadata', $metadata, $user);
 
-		$args     = wp_parse_args( $args, $defaults );
-		$response = WC_Stripe_API::request( apply_filters( 'wc_stripe_create_customer_args', $args ), 'customers' );
+		$args     = wp_parse_args($args, $defaults);
+		$response = WC_Stripe_API::request(apply_filters('wc_stripe_create_customer_args', $args), 'customers');
 
-		if ( ! empty( $response->error ) ) {
-			throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+		if ( ! empty($response->error)) {
+			throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 		}
 
-		$this->set_id( $response->id );
+		$this->set_id($response->id);
 		$this->clear_cache();
-		$this->set_customer_data( $response );
+		$this->set_customer_data($response);
 
-		if ( $this->get_user_id() ) {
-			update_user_meta( $this->get_user_id(), '_stripe_customer_id', $response->id );
+		if ($this->get_user_id()) {
+			update_user_meta($this->get_user_id(), '_stripe_customer_id', $response->id);
 		}
 
-		do_action( 'woocommerce_stripe_add_customer', $args, $response );
+		do_action('woocommerce_stripe_add_customer', $args, $response);
 
 		return $response->id;
 	}
@@ -147,74 +147,74 @@ 
 	 * @param bool $retry
 	 * @return WP_Error|int
 	 */
-	public function add_source( $source_id, $retry = true ) {
-		if ( ! $this->get_id() ) {
-			$this->set_id( $this->create_customer() );
+	public function add_source($source_id, $retry = true) {
+		if ( ! $this->get_id()) {
+			$this->set_id($this->create_customer());
 		}
 
-		$response = WC_Stripe_API::request( array(
+		$response = WC_Stripe_API::request(array(
 			'source' => $source_id,
-		), 'customers/' . $this->get_id() . '/sources' );
+		), 'customers/' . $this->get_id() . '/sources');
 
 		$wc_token = false;
 
-		if ( ! empty( $response->error ) ) {
+		if ( ! empty($response->error)) {
 			// It is possible the WC user once was linked to a customer on Stripe
 			// but no longer exists. Instead of failing, lets try to create a
 			// new customer.
-			if ( $this->is_no_such_customer_error( $response->error ) ) {
-				delete_user_meta( $this->get_user_id(), '_stripe_customer_id' );
+			if ($this->is_no_such_customer_error($response->error)) {
+				delete_user_meta($this->get_user_id(), '_stripe_customer_id');
 				$this->create_customer();
-				return $this->add_source( $source_id, false );
+				return $this->add_source($source_id, false);
 			} else {
 				return $response;
 			}
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'error', __( 'Unable to add payment source.', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('error', __('Unable to add payment source.', 'woocommerce-gateway-stripe'));
 		}
 
 		// Add token to WooCommerce.
-		if ( $this->get_user_id() && class_exists( 'WC_Payment_Token_CC' ) ) {
-			if ( ! empty( $response->type ) ) {
-				switch ( $response->type ) {
+		if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) {
+			if ( ! empty($response->type)) {
+				switch ($response->type) {
 					case 'alipay':
 						break;
 					case 'sepa_debit':
 						$wc_token = new WC_Payment_Token_SEPA();
-						$wc_token->set_token( $response->id );
-						$wc_token->set_gateway_id( 'stripe_sepa' );
-						$wc_token->set_last4( $response->sepa_debit->last4 );
+						$wc_token->set_token($response->id);
+						$wc_token->set_gateway_id('stripe_sepa');
+						$wc_token->set_last4($response->sepa_debit->last4);
 						break;
 					default:
-						if ( 'source' === $response->object && 'card' === $response->type ) {
+						if ('source' === $response->object && 'card' === $response->type) {
 							$wc_token = new WC_Payment_Token_CC();
-							$wc_token->set_token( $response->id );
-							$wc_token->set_gateway_id( 'stripe' );
-							$wc_token->set_card_type( strtolower( $response->card->brand ) );
-							$wc_token->set_last4( $response->card->last4 );
-							$wc_token->set_expiry_month( $response->card->exp_month );
-							$wc_token->set_expiry_year( $response->card->exp_year );
+							$wc_token->set_token($response->id);
+							$wc_token->set_gateway_id('stripe');
+							$wc_token->set_card_type(strtolower($response->card->brand));
+							$wc_token->set_last4($response->card->last4);
+							$wc_token->set_expiry_month($response->card->exp_month);
+							$wc_token->set_expiry_year($response->card->exp_year);
 						}
 						break;
 				}
 			} else {
 				// Legacy.
 				$wc_token = new WC_Payment_Token_CC();
-				$wc_token->set_token( $response->id );
-				$wc_token->set_gateway_id( 'stripe' );
-				$wc_token->set_card_type( strtolower( $response->brand ) );
-				$wc_token->set_last4( $response->last4 );
-				$wc_token->set_expiry_month( $response->exp_month );
-				$wc_token->set_expiry_year( $response->exp_year );
+				$wc_token->set_token($response->id);
+				$wc_token->set_gateway_id('stripe');
+				$wc_token->set_card_type(strtolower($response->brand));
+				$wc_token->set_last4($response->last4);
+				$wc_token->set_expiry_month($response->exp_month);
+				$wc_token->set_expiry_year($response->exp_year);
 			}
 
-			$wc_token->set_user_id( $this->get_user_id() );
+			$wc_token->set_user_id($this->get_user_id());
 			$wc_token->save();
 		}
 
 		$this->clear_cache();
 
-		do_action( 'woocommerce_stripe_add_source', $this->get_id(), $wc_token, $response, $source_id );
+		do_action('woocommerce_stripe_add_source', $this->get_id(), $wc_token, $response, $source_id);
 
 		return $response->id;
 	}
@@ -226,42 +226,42 @@ 
 	 * @return array
 	 */
 	public function get_sources() {
-		if ( ! $this->get_id() ) {
+		if ( ! $this->get_id()) {
 			return array();
 		}
 
-		$sources = get_transient( 'stripe_sources_' . $this->get_id() );
+		$sources = get_transient('stripe_sources_' . $this->get_id());
 
-		$response = WC_Stripe_API::request( array(
+		$response = WC_Stripe_API::request(array(
 			'limit'       => 100,
-		), 'customers/' . $this->get_id() . '/sources', 'GET' );
+		), 'customers/' . $this->get_id() . '/sources', 'GET');
 
-		if ( ! empty( $response->error ) ) {
+		if ( ! empty($response->error)) {
 			return array();
 		}
 
-		if ( is_array( $response->data ) ) {
+		if (is_array($response->data)) {
 			$sources = $response->data;
 		}
 
-		return empty( $sources ) ? array() : $sources;
+		return empty($sources) ? array() : $sources;
 	}
 
 	/**
 	 * Delete a source from stripe.
 	 * @param string $source_id
 	 */
-	public function delete_source( $source_id ) {
-		if ( ! $this->get_id() ) {
+	public function delete_source($source_id) {
+		if ( ! $this->get_id()) {
 			return false;
 		}
 
-		$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field( $source_id ), 'DELETE' );
+		$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field($source_id), 'DELETE');
 
 		$this->clear_cache();
 
-		if ( empty( $response->error ) ) {
-			do_action( 'wc_stripe_delete_source', $this->get_id(), $response );
+		if (empty($response->error)) {
+			do_action('wc_stripe_delete_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -273,15 +273,15 @@ 
 	 * Set default source in Stripe
 	 * @param string $source_id
 	 */
-	public function set_default_source( $source_id ) {
-		$response = WC_Stripe_API::request( array(
-			'default_source' => sanitize_text_field( $source_id ),
-		), 'customers/' . $this->get_id(), 'POST' );
+	public function set_default_source($source_id) {
+		$response = WC_Stripe_API::request(array(
+			'default_source' => sanitize_text_field($source_id),
+		), 'customers/' . $this->get_id(), 'POST');
 
 		$this->clear_cache();
 
-		if ( empty( $response->error ) ) {
-			do_action( 'wc_stripe_set_default_source', $this->get_id(), $response );
+		if (empty($response->error)) {
+			do_action('wc_stripe_set_default_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -293,8 +293,8 @@ 
 	 * Deletes caches for this users cards.
 	 */
 	public function clear_cache() {
-		delete_transient( 'stripe_sources_' . $this->get_id() );
-		delete_transient( 'stripe_customer_' . $this->get_id() );
+		delete_transient('stripe_sources_' . $this->get_id());
+		delete_transient('stripe_customer_' . $this->get_id());
 		$this->customer_data = array();
 	}
 }