woocommerce / woocommerce-gateway-stripe

includes/class-wc-stripe-webhook-handler.php

Spacing +141 added lines, -141 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -17,7 +17,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function __construct() {
-		add_action( 'woocommerce_api_wc_stripe', array( $this, 'check_for_webhook' ) );
+		add_action('woocommerce_api_wc_stripe', array($this, 'check_for_webhook'));
 	}
 
 	/**
@@ -27,24 +27,24 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_for_webhook() {
-		if ( ( 'POST' !== $_SERVER['REQUEST_METHOD'] )
-			|| ! isset( $_GET['wc-api'] )
-			|| ( 'wc_stripe' !== $_GET['wc-api'] )
+		if (('POST' !== $_SERVER['REQUEST_METHOD'])
+			|| ! isset($_GET['wc-api'])
+			|| ('wc_stripe' !== $_GET['wc-api'])
 		) {
 			return;
 		}
 
-		$request_body    = file_get_contents( 'php://input' );
-		$request_headers = array_change_key_case( $this->get_request_headers(), CASE_UPPER );
+		$request_body    = file_get_contents('php://input');
+		$request_headers = array_change_key_case($this->get_request_headers(), CASE_UPPER);
 
 		// Validate it to make sure it is legit.
-		if ( $this->is_valid_request( $request_headers, $request_body ) ) {
-			$this->process_webhook( $request_body );
-			status_header( 200 );
+		if ($this->is_valid_request($request_headers, $request_body)) {
+			$this->process_webhook($request_body);
+			status_header(200);
 			exit;
 		} else {
-			WC_Stripe_Logger::log( 'Incoming webhook failed validation: ' . print_r( $request_body, true ) );
-			status_header( 400 );
+			WC_Stripe_Logger::log('Incoming webhook failed validation: ' . print_r($request_body, true));
+			status_header(400);
 			exit;
 		}
 	}
@@ -59,12 +59,12 @@ 
 	 * @param string $request_body The request body from Stripe.
 	 * @return bool
 	 */
-	public function is_valid_request( $request_headers = null, $request_body = null ) {
-		if ( null === $request_headers || null === $request_body ) {
+	public function is_valid_request($request_headers = null, $request_body = null) {
+		if (null === $request_headers || null === $request_body) {
 			return false;
 		}
 
-		if ( ! empty( $request_headers['USER-AGENT'] ) && ! preg_match( '/Stripe/', $request_headers['USER-AGENT'] ) ) {
+		if ( ! empty($request_headers['USER-AGENT']) && ! preg_match('/Stripe/', $request_headers['USER-AGENT'])) {
 			return false;
 		}
 
@@ -80,11 +80,11 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_request_headers() {
-		if ( ! function_exists( 'getallheaders' ) ) {
+		if ( ! function_exists('getallheaders')) {
 			$headers = [];
-			foreach ( $_SERVER as $name => $value ) {
-				if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-					$headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			foreach ($_SERVER as $name => $value) {
+				if ('HTTP_' === substr($name, 0, 5)) {
+					$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 				}
 			}
 
@@ -103,30 +103,30 @@ 
 	 * @param object $notification
 	 * @param bool $retry
 	 */
-	public function process_webhook_payment( $notification, $retry = true ) {
+	public function process_webhook_payment($notification, $retry = true) {
 		// The following 2 payment methods are synchronous so does not need to be handle via webhook.
-		if ( 'card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type ) {
+		if ('card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_source_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_source_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via source ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via source ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id  = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 		$source_id = $notification->data->object->id;
 
-		$is_pending_receiver = ( 'receiver' === $notification->data->object->flow );
+		$is_pending_receiver = ('receiver' === $notification->data->object->flow);
 
 		try {
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status()) {
 				return;
 			}
 
-			if ( 'on-hold' === $order->get_status() && ! $is_pending_receiver ) {
+			if ('on-hold' === $order->get_status() && ! $is_pending_receiver) {
 				return;
 			}
 
@@ -134,73 +134,73 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_id;
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ) );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object));
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// If it is an API error such connection or server, let's retry.
-				if ( 'api_connection_error' === $response->error->type || 'api_error' === $response->error->type ) {
-					if ( $retry ) {
-						sleep( 5 );
-						return $this->process_payment( $order_id, false );
+				if ('api_connection_error' === $response->error->type || 'api_error' === $response->error->type) {
+					if ($retry) {
+						sleep(5);
+						return $this->process_payment($order_id, false);
 					} else {
 						$message = 'API connection error and retries exhausted.';
-						$order->add_order_note( $message );
-						throw new Exception( $message );
+						$order->add_order_note($message);
+						throw new Exception($message);
 					}
 				}
 
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( preg_match( '/No such customer/i', $response->error->message ) && $retry ) {
-					delete_user_meta( WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id' );
+				if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+					delete_user_meta(WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id');
 
-					return $this->process_payment( $order_id, false );
+					return $this->process_payment($order_id, false);
 
-				} elseif ( preg_match( '/No such token/i', $response->error->message ) && $source_object->token_id ) {
+				} elseif (preg_match('/No such token/i', $response->error->message) && $source_object->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $source_object->token_id );
+					$wc_token = WC_Payment_Tokens::get($source_object->token_id);
 					$wc_token->delete();
-					$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $message );
-					throw new Exception( $message );
+					$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($message);
+					throw new Exception($message);
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				$order->add_order_note( $message );
+				$order->add_order_note($message);
 
-				throw new Exception( $message );
+				throw new Exception($message);
 			}
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_webhook_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_webhook_payment_error', $e, $order);
 
-			$statuses = array( 'pending', 'failed' );
+			$statuses = array('pending', 'failed');
 
-			if ( $order->has_status( $statuses ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status($statuses)) {
+				$this->send_failed_order_email($order_id);
 			}
 		}
 	}
@@ -214,18 +214,18 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_dispute( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_dispute($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
-		$order->update_status( 'on-hold', __( 'A dispute was created for this order. Response is needed. Please go to your Stripe Dashboard to review this dispute.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('on-hold', __('A dispute was created for this order. Response is needed. Please go to your Stripe Dashboard to review this dispute.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
-		$this->send_failed_order_email( $order_id );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
+		$this->send_failed_order_email($order_id);
 	}
 
 	/**
@@ -236,41 +236,41 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_capture( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_capture($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+			if ($charge && 'no' === $captured) {
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 				// Store other data such as fees
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-				if ( isset( $notification->data->object->balance_transaction ) ) {
-					$this->update_fees( $order, $notification->data->object->balance_transaction );
+				if (isset($notification->data->object->balance_transaction)) {
+					$this->update_fees($order, $notification->data->object->balance_transaction);
 				}
 
-				if ( is_callable( array( $order, 'save' ) ) ) {
+				if (is_callable(array($order, 'save'))) {
 					$order->save();
 				}
 
 				/* translators: transaction id */
-				$order->update_status( $order->needs_processing() ? 'processing' : 'completed', sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+				$order->update_status($order->needs_processing() ? 'processing' : 'completed', sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 
 				// Check and see if capture is partial.
-				if ( $this->is_partial_capture( $notification ) ) {
-					$order->set_total( $this->get_partial_amount_to_charge( $notification ) );
-					$order->add_note( __( 'This charge was partially captured via Stripe Dashboard', 'woocommerce-gateway-stripe' ) );
+				if ($this->is_partial_capture($notification)) {
+					$order->set_total($this->get_partial_amount_to_charge($notification));
+					$order->add_note(__('This charge was partially captured via Stripe Dashboard', 'woocommerce-gateway-stripe'));
 					$order->save();
 				}
 			}
@@ -285,38 +285,38 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_succeeded( $notification ) {
+	public function process_webhook_charge_succeeded($notification) {
 		// The following payment methods are synchronous so does not need to be handle via webhook.
-		if ( ( isset( $notification->data->object->source->type ) && 'card' === $notification->data->object->source->type ) || ( isset( $notification->data->object->source->type ) && 'three_d_secure' === $notification->data->object->source->type ) ) {
+		if ((isset($notification->data->object->source->type) && 'card' === $notification->data->object->source->type) || (isset($notification->data->object->source->type) && 'three_d_secure' === $notification->data->object->source->type)) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status()) {
 			return;
 		}
 
 		// Store other data such as fees
-		WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+		WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-		if ( isset( $notification->data->object->balance_transaction ) ) {
-			$this->update_fees( $order, $notification->data->object->balance_transaction );
+		if (isset($notification->data->object->balance_transaction)) {
+			$this->update_fees($order, $notification->data->object->balance_transaction);
 		}
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 
 		/* translators: transaction id */
-		$order->update_status( $order->needs_processing() ? 'processing' : 'completed', sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+		$order->update_status($order->needs_processing() ? 'processing' : 'completed', sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 	}
 
 	/**
@@ -327,23 +327,23 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_failed( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_charge_failed($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status()) {
 			return;
 		}
 
-		$order->update_status( 'failed', __( 'This payment failed to clear.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('failed', __('This payment failed to clear.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -354,23 +354,23 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_source_canceled( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_source_canceled($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() || 'cancelled' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status() || 'cancelled' !== $order->get_status()) {
 			return;
 		}
 
-		$order->update_status( 'cancelled', __( 'This payment has cancelled.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('cancelled', __('This payment has cancelled.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -381,31 +381,31 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_refund( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_refund($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
 			// Only refund captured charge.
-			if ( $charge && 'yes' === $captured ) {
+			if ($charge && 'yes' === $captured) {
 				// Create the refund.
-				$refund = wc_create_refund( array(
+				$refund = wc_create_refund(array(
 					'order_id'       => $order_id,
-					'amount'         => $this->get_refund_amount( $notification ),
-					'reason'         => __( 'Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe' ),
-				) );
+					'amount'         => $this->get_refund_amount($notification),
+					'reason'         => __('Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe'),
+				));
 
-				if ( is_wp_error( $refund ) ) {
-					WC_Stripe_Logger::log( $refund->get_error_message() );
+				if (is_wp_error($refund)) {
+					WC_Stripe_Logger::log($refund->get_error_message());
 				}
 			}
 		}
@@ -418,7 +418,7 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function is_partial_capture( $notification ) {
+	public function is_partial_capture($notification) {
 		return 0 < $notification->data->object->amount_refunded;
 	}
 
@@ -429,11 +429,11 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_refund_amount( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
+	public function get_refund_amount($notification) {
+		if ($this->is_partial_capture($notification)) {
 			$amount = $notification->data->object->amount_refunded / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
 				$amount = $notification->data->object->amount_refunded;
 			}
 
@@ -450,12 +450,12 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_partial_amount_to_charge( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
-			$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded ) / 100;
+	public function get_partial_amount_to_charge($notification) {
+		if ($this->is_partial_capture($notification)) {
+			$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded) / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-				$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded );
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
+				$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded);
 			}
 
 			return $amount;
@@ -471,36 +471,36 @@ 
 	 * @version 4.0.0
 	 * @param string $request_body
 	 */
-	public function process_webhook( $request_body ) {
-		$notification = json_decode( $request_body );
+	public function process_webhook($request_body) {
+		$notification = json_decode($request_body);
 
-		switch ( $notification->type ) {
+		switch ($notification->type) {
 			case 'source.chargeable':
-				$this->process_webhook_payment( $notification );
+				$this->process_webhook_payment($notification);
 				break;
 
 			case 'source.canceled':
-				$this->process_webhook_source_canceled( $notification );
+				$this->process_webhook_source_canceled($notification);
 				break;
 
 			case 'charge.succeeded':
-				$this->process_webhook_charge_succeeded( $notification );
+				$this->process_webhook_charge_succeeded($notification);
 				break;
 
 			case 'charge.failed':
-				$this->process_webhook_charge_failed( $notification );
+				$this->process_webhook_charge_failed($notification);
 				break;
 
 			case 'charge.captured':
-				$this->process_webhook_capture( $notification );
+				$this->process_webhook_capture($notification);
 				break;
 
 			case 'charge.dispute.created':
-				$this->process_webhook_dispute( $notification );
+				$this->process_webhook_dispute($notification);
 				break;
 
 			case 'charge.refunded':
-				$this->process_webhook_refund( $notification );
+				$this->process_webhook_refund($notification);
 				break;
 
 		}

includes/class-wc-stripe-customer.php

Spacing +85 added lines, -85 removed lines

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

includes/class-wc-stripe-api.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,7 +26,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;
 	}
 
@@ -35,11 +35,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;
@@ -78,12 +78,12 @@ 
 		$user_agent = self::get_user_agent();
 		$app_info   = $user_agent['application'];
 
-		return apply_filters( 'woocommerce_stripe_request_headers', array(
-			'Authorization'              => 'Basic ' . base64_encode( self::get_secret_key() . ':' ),
+		return apply_filters('woocommerce_stripe_request_headers', array(
+			'Authorization'              => 'Basic ' . base64_encode(self::get_secret_key() . ':'),
 			'Stripe-Version'             => self::STRIPE_API_VERSION,
 			'User-Agent'                 => $app_info['name'] . '/' . $app_info['version'] . ' (' . $app_info['url'] . ')',
-			'X-Stripe-Client-User-Agent' => json_encode( $user_agent ),
-		) );
+			'X-Stripe-Client-User-Agent' => json_encode($user_agent),
+		));
 	}
 
 	/**
@@ -95,13 +95,13 @@ 
 	 * @param string $api
 	 * @return array|WP_Error
 	 */
-	public static function request( $request, $api = 'charges', $method = 'POST' ) {
-		WC_Stripe_Logger::log( "{$api} request: " . print_r( $request, true ) );
+	public static function request($request, $api = 'charges', $method = 'POST') {
+		WC_Stripe_Logger::log("{$api} request: " . print_r($request, true));
 
 		$headers = self::get_headers();
 
-		if ( 'charges' === $api && 'POST' === $method ) {
-			$headers['Idempotency-Key'] = uniqid( 'stripe_' );
+		if ('charges' === $api && 'POST' === $method) {
+			$headers['Idempotency-Key'] = uniqid('stripe_');
 		}
 
 		$response = wp_safe_remote_post(
@@ -109,17 +109,17 @@ 
 			array(
 				'method'  => $method,
 				'headers' => $headers,
-				'body'    => apply_filters( 'woocommerce_stripe_request_body', $request, $api ),
+				'body'    => apply_filters('woocommerce_stripe_request_body', $request, $api),
 				'timeout' => 70,
 			)
 		);
 
-		if ( is_wp_error( $response ) || empty( $response['body'] ) ) {
-			WC_Stripe_Logger::log( 'Error Response: ' . print_r( $response, true ) );
-			throw new Exception( __( 'There was a problem connecting to the Stripe API endpoint.', 'woocommerce-gateway-stripe' ) );
+		if (is_wp_error($response) || empty($response['body'])) {
+			WC_Stripe_Logger::log('Error Response: ' . print_r($response, true));
+			throw new Exception(__('There was a problem connecting to the Stripe API endpoint.', 'woocommerce-gateway-stripe'));
 		}
 
-		return json_decode( $response['body'] );
+		return json_decode($response['body']);
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @version 4.0.0
 	 * @param string $api
 	 */
-	public static function retrieve( $api ) {
-		WC_Stripe_Logger::log( "{$api}" );
+	public static function retrieve($api) {
+		WC_Stripe_Logger::log("{$api}");
 
 		$ua = self::get_user_agent();
 
@@ -143,11 +143,11 @@ 
 			)
 		);
 
-		if ( is_wp_error( $response ) || empty( $response['body'] ) ) {
-			WC_Stripe_Logger::log( 'Error Response: ' . print_r( $response, true ) );
-			return new WP_Error( 'stripe_error', __( 'There was a problem connecting to the Stripe API endpoint.', 'woocommerce-gateway-stripe' ) );
+		if (is_wp_error($response) || empty($response['body'])) {
+			WC_Stripe_Logger::log('Error Response: ' . print_r($response, true));
+			return new WP_Error('stripe_error', __('There was a problem connecting to the Stripe API endpoint.', 'woocommerce-gateway-stripe'));
 		}
 
-		return json_decode( $response['body'] );
+		return json_decode($response['body']);
 	}
 }

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

Spacing +88 added lines, -88 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -64,9 +64,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_bitcoin';
-		$this->method_title         = __( 'Stripe Bitcoin', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Bitcoin', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -78,29 +78,29 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'woocommerce_thankyou_stripe_bitcoin', array( $this, 'thankyou_page' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('woocommerce_thankyou_stripe_bitcoin', array($this, 'thankyou_page'));
 
 		// Customer Emails
-		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
+		add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 3);
 	}
 
 	/**
@@ -110,19 +110,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -135,8 +135,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'Bitcoin is enabled - it requires store currency to be set to USD.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('Bitcoin is enabled - it requires store currency to be set to USD.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -152,9 +152,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_bitcoin_supported_currencies', array(
+		return apply_filters('wc_stripe_bitcoin_supported_currencies', array(
 			'USD',
-		) );
+		));
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -186,7 +186,7 @@ 
 
 		$icons_str .= $icons['bitcoin'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -197,19 +197,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bitcoin-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bitcoin-settings.php');
 	}
 
 	/**
@@ -220,25 +220,25 @@ 
 		$total                = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-bitcoin-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -249,8 +249,8 @@ 
 	 *
 	 * @param int $order_id
 	 */
-	public function thankyou_page( $order_id ) {
-		$this->get_instructions( $order_id );
+	public function thankyou_page($order_id) {
+		$this->get_instructions($order_id);
 	}
 
 	/**
@@ -262,13 +262,13 @@ 
 	 * @param bool $sent_to_admin
 	 * @param bool $plain_text
 	 */
-	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
+	public function email_instructions($order, $sent_to_admin, $plain_text = false) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
 		$payment_method = WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method();
 
-		if ( ! $sent_to_admin && 'stripe_bitcoin' === $payment_method && $order->has_status( 'on-hold' ) ) {
-			$this->get_instructions( $order_id, $plain_text );
+		if ( ! $sent_to_admin && 'stripe_bitcoin' === $payment_method && $order->has_status('on-hold')) {
+			$this->get_instructions($order_id, $plain_text);
 		}
 	}
 
@@ -279,38 +279,38 @@ 
 	 * @version 4.0.0
 	 * @param int $order_id
 	 */
-	public function get_instructions( $order_id, $plain_text = false ) {
-		$data = get_post_meta( $order_id, '_stripe_bitcoin', true );
+	public function get_instructions($order_id, $plain_text = false) {
+		$data = get_post_meta($order_id, '_stripe_bitcoin', true);
 
-		if ( $plain_text ) {
-			esc_html_e( 'Please pay the following:', 'woocommerce-gateway-stripe' ) . "\n\n";
+		if ($plain_text) {
+			esc_html_e('Please pay the following:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Bitcoin Amount:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Bitcoin Amount:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['amount'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Receiver:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Receiver:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['address'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'URI:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('URI:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['uri'] . "\n\n";
 		} else {
 			?>
-			<h3><?php esc_html_e( 'Please pay the following:', 'woocommerce-gateway-stripe' ); ?></h3>
+			<h3><?php esc_html_e('Please pay the following:', 'woocommerce-gateway-stripe'); ?></h3>
 			<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Bitcoin Amount:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Bitcoin Amount:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['amount']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Receiver:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Receiver:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['address']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'URI:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('URI:', 'woocommerce-gateway-stripe'); ?>
 				<strong>
 				<?php
 				/* translators: link */
-				printf( __( '<a href="%s">Pay Bitcoin</a>', 'woocommerce-gateway-stripe' ), $data['uri'] );
+				printf(__('<a href="%s">Pay Bitcoin</a>', 'woocommerce-gateway-stripe'), $data['uri']);
 				?>
 				</strong>
 			</li>
@@ -327,7 +327,7 @@ 
 	 * @param object $order
 	 * @param object $source_object
 	 */
-	public function save_instructions( $order, $source_object ) {
+	public function save_instructions($order, $source_object) {
 		$data = array(
 			'amount'  => $source_object->bitcoin->amount,
 			'address' => $source_object->bitcoin->address,
@@ -336,7 +336,7 @@ 
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		update_post_meta( $order_id, '_stripe_bitcoin', $data );
+		update_post_meta($order_id, '_stripe_bitcoin', $data);
 	}
 
 	/**
@@ -350,40 +350,40 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
-			$source_object = ! empty( $_POST['stripe_source'] ) ? json_decode( stripslashes( $_POST['stripe_source'] ) ) : false;
+			$order = wc_get_order($order_id);
+			$source_object = ! empty($_POST['stripe_source']) ? json_decode(stripslashes($_POST['stripe_source'])) : false;
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
-			if ( empty( $prepared_source->source ) ) {
-				$error_msg = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new Exception( $error_msg );
+			if (empty($prepared_source->source)) {
+				$error_msg = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new Exception($error_msg);
 			}
 
 			// Store source to order meta.
-			$this->save_source( $order, $prepared_source );
+			$this->save_source($order, $prepared_source);
 
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			$this->save_instructions( $order, $source_object );
+			$this->save_instructions($order, $source_object);
 
 			// Mark as on-hold (we're awaiting the payment)
-			$order->update_status( 'on-hold', __( 'Awaiting Bitcoin payment', 'woocommerce-gateway-stripe' ) );
+			$order->update_status('on-hold', __('Awaiting Bitcoin payment', 'woocommerce-gateway-stripe'));
 
-			wc_reduce_stock_levels( $order_id );
+			wc_reduce_stock_levels($order_id);
 
 			// Remove cart
 			WC()->cart->empty_cart();
@@ -391,16 +391,16 @@ 
 			// Return thankyou redirect
 			return array(
 				'result'    => 'success',
-				'redirect'  => $this->get_return_url( $order ),
+				'redirect'  => $this->get_return_url($order),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_ideal';
-		$this->method_title         = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe iDeal', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'iDeal is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('iDeal is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_ideal_supported_currencies', array(
+		return apply_filters('wc_stripe_ideal_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['ideal'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-ideal-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-ideal-settings.php');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total                = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-ideal-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,24 +241,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                          = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                          = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url                        = $this->get_stripe_return_url( $order );
+		$return_url                        = $this->get_stripe_return_url($order);
 		$post_data                         = array();
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']             = strtolower( $currency );
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']             = strtolower($currency);
 		$post_data['type']                 = 'ideal';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating iDeal source' );
+		WC_Stripe_Logger::log('Info: Begin creating iDeal source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -272,51 +272,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to iDeal...' );
+			WC_Stripe_Logger::log('Info: Redirecting to iDeal...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +85 added lines, -85 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sofort';
-		$this->method_title         = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sofort_supported_currencies', array(
+		return apply_filters('wc_stripe_sofort_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -175,7 +175,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);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php');
 	}
 
 	/**
@@ -217,24 +217,24 @@ 
 			'IT' => 'Italy',
 		);
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<label for="stripe-bank-country">
-				<?php _e( 'Country origin of your bank.', 'woocommerce-gateway-stripe' ); ?>
+				<?php _e('Country origin of your bank.', 'woocommerce-gateway-stripe'); ?>
 			</label>
 			<br />
 			<p class="form-row form-row-wide validate-required">
 			<select id="stripe-bank-country" class="wc-enhanced-select" name="stripe_sofort_bank_country">
-				<option value="-1"><?php esc_html_e( 'Choose Bank Country', 'woocommerce-gateway-stripe' ); ?></option>
-				<?php foreach ( $supported_countries as $code => $country ) { ?>
-				<option value="<?php echo esc_attr( $code ); ?>"><?php echo esc_html( $country ); ?></option>
+				<option value="-1"><?php esc_html_e('Choose Bank Country', 'woocommerce-gateway-stripe'); ?></option>
+				<?php foreach ($supported_countries as $code => $country) { ?>
+				<option value="<?php echo esc_attr($code); ?>"><?php echo esc_html($country); ?></option>
 				<?php } ?>
 			</select>
 			</p>
 
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -248,25 +248,25 @@ 
 		$total                = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-sofort-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		$this->form();
@@ -282,26 +282,26 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                          = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                          = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$bank_country                      = wc_clean( $_POST['stripe_sofort_bank_country'] );
-		$return_url                        = $this->get_stripe_return_url( $order );
+		$bank_country                      = wc_clean($_POST['stripe_sofort_bank_country']);
+		$return_url                        = $this->get_stripe_return_url($order);
 		$post_data                         = array();
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']             = strtolower( $currency );
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']             = strtolower($currency);
 		$post_data['type']                 = 'sofort';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
-		$post_data['sofort']               = array( 'country' => $bank_country );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
+		$post_data['sofort']               = array('country' => $bank_country);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating SOFORT source' );
+		WC_Stripe_Logger::log('Info: Begin creating SOFORT source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -315,51 +315,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to SOFORT...' );
+			WC_Stripe_Logger::log('Info: Redirecting to SOFORT...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_giropay';
-		$this->method_title         = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Giropay', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'Giropay is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('Giropay is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_giropay_supported_currencies', array(
+		return apply_filters('wc_stripe_giropay_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['giropay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total                = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-giropay-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,24 +241,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                          = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                          = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url                        = $this->get_stripe_return_url( $order );
+		$return_url                        = $this->get_stripe_return_url($order);
 		$post_data                         = array();
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']             = strtolower( $currency );
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']             = strtolower($currency);
 		$post_data['type']                 = 'giropay';
-		$post_data['owner']                = $this->get_owner_details( $order );
-		$post_data['redirect']             = array( 'return_url' => $return_url );
+		$post_data['owner']                = $this->get_owner_details($order);
+		$post_data['redirect']             = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Giropay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Giropay source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -272,51 +272,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Giropay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Giropay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +97 added lines, -97 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sepa';
-		$this->method_title         = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -84,25 +84,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -112,19 +112,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -137,8 +137,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'SEPA is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('SEPA is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -154,9 +154,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sepa_supported_currencies', array(
+		return apply_filters('wc_stripe_sepa_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -188,7 +188,7 @@ 
 
 		$icons_str .= $icons['sepa'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -199,19 +199,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php');
 	}
 
 	/**
@@ -223,7 +223,7 @@ 
 	 */
 	public function mandate_display() {
 		/* translators: statement descriptor */
-		printf( __( 'By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe' ), WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor ) );
+		printf(__('By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe'), WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor));
 	}
 
 	/**
@@ -234,24 +234,24 @@ 
 	 */
 	public function form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<p class="wc-stripe-sepa-mandate" style="margin-bottom:40px;"><?php $this->mandate_display(); ?></p>
 			<p class="form-row form-row-wide validate-required">
 				<label for="stripe-sepa-owner">
-					<?php esc_html_e( 'IBAN Account Name.', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('IBAN Account Name.', 'woocommerce-gateway-stripe'); ?>
 				</label>
 				<input id="stripe-sepa-owner" name="stripe_sepa_owner" value="" style="border:1px solid #ddd;margin:5px 0;padding:10px 5px;background-color:#fff;outline:0;" />
 			</p>
 			<p class="form-row form-row-wide validate-required">
 				<label for="stripe-sepa-iban">
-					<?php esc_html_e( 'IBAN Account Number.', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('IBAN Account Number.', 'woocommerce-gateway-stripe'); ?>
 				</label>
 				<input id="stripe-sepa-iban" name="stripe_sepa_iban" value="" style="border:1px solid #ddd;margin:5px 0;padding:10px 5px;background-color:#fff;outline:0;" />
 			</p>
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -263,42 +263,42 @@ 
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
 		$total                = WC()->cart->total;
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-sepa_debit-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			if ( $this->testmode ) {
-				$this->description .= ' ' . __( 'TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe' );
-				$this->description  = trim( $this->description );
+		if ($this->description) {
+			if ($this->testmode) {
+				$this->description .= ' ' . __('TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe');
+				$this->description  = trim($this->description);
 			}
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
 		$this->form();
 
-		if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			$this->save_payment_method_checkbox();
 		}
 
@@ -316,80 +316,80 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
 			// Store source to order meta.
-			$this->save_source( $order, $prepared_source );
+			$this->save_source($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// If it is an API error such connection or server, let's retry.
-					if ( 'api_connection_error' === $response->error->type || 'api_error' === $response->error->type ) {
-						if ( $retry ) {
-							sleep( 5 );
-							return $this->process_payment( $order_id, false, $force_save_source );
+					if ('api_connection_error' === $response->error->type || 'api_error' === $response->error->type) {
+						if ($retry) {
+							sleep(5);
+							return $this->process_payment($order_id, false, $force_save_source);
 						} else {
 							$message = 'API connection error and retries exhausted.';
-							$order->add_order_note( $message );
-							throw new Exception( $message );
+							$order->add_order_note($message);
+							throw new Exception($message);
 						}
 					}
 
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( preg_match( '/No such customer/i', $response->error->message ) && $retry ) {
-						delete_user_meta( WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id' );
+					if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+						delete_user_meta(WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id');
 
-						return $this->process_payment( $order_id, false, $force_save_source );
-					} elseif ( preg_match( '/No such token/i', $response->error->message ) && $prepared_source->token_id ) {
+						return $this->process_payment($order_id, false, $force_save_source);
+					} elseif (preg_match('/No such token/i', $response->error->message) && $prepared_source->token_id) {
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-						$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+						$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 						$wc_token->delete();
-						$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $message );
-						throw new Exception( $message );
+						$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($message);
+						throw new Exception($message);
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					if ( 'card_error' === $response->error->type ) {
-						$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+					if ('card_error' === $response->error->type) {
+						$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 					} else {
-						$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+						$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 					}
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($message);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -400,17 +400,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +74 added lines, -74 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,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'P24 is enabled - it requires store currency to be set to Euros or Polish Zloty.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('P24 is enabled - it requires store currency to be set to Euros or Polish Zloty.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,10 +141,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',
-		) );
+		));
 	}
 
 	/**
@@ -155,7 +155,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;
 		}
 
@@ -176,7 +176,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);
 	}
 
 	/**
@@ -187,19 +187,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php');
 	}
 
 	/**
@@ -210,25 +210,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 ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -242,20 +242,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( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -269,51 +269,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to 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 ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(