woocommerce / woocommerce-gateway-stripe

includes/abstracts/abstract-wc-stripe-payment-gateway.php

Doc Comments +2 added lines

@@ -32,6 +32,8 @@
 	 *
 	 * @since 4.0.0
 	 * @version 4.0.0
+	 * @param string $slug
+	 * @param string $class
 	 */
 	public function add_admin_notice( $slug, $class, $message ) {
 		$this->notices[ $slug ] = array(

Spacing +123 added lines, -123 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -15,11 +15,11 @@ 
 	 * Check if this gateway is enabled
 	 */
 	public function is_available() {
-		if ( 'yes' === $this->enabled ) {
-			if ( ! $this->testmode && is_checkout() && ! is_ssl() ) {
+		if ('yes' === $this->enabled) {
+			if ( ! $this->testmode && is_checkout() && ! is_ssl()) {
 				return false;
 			}
-			if ( ! $this->secret_key || ! $this->publishable_key ) {
+			if ( ! $this->secret_key || ! $this->publishable_key) {
 				return false;
 			}
 			return true;
@@ -33,8 +33,8 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function add_admin_notice( $slug, $class, $message ) {
-		$this->notices[ $slug ] = array(
+	public function add_admin_notice($slug, $class, $message) {
+		$this->notices[$slug] = array(
 			'class'   => $class,
 			'message' => $message,
 		);
@@ -46,14 +46,14 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function get_transaction_url( $order ) {
-		if ( $this->testmode ) {
+	public function get_transaction_url($order) {
+		if ($this->testmode) {
 			$this->view_transaction_url = 'https://dashboard.stripe.com/test/payments/%s';
 		} else {
 			$this->view_transaction_url = 'https://dashboard.stripe.com/payments/%s';
 		}
 
-		return parent::get_transaction_url( $order );
+		return parent::get_transaction_url($order);
 	}
 
 	/**
@@ -64,18 +64,18 @@ 
 	 * @param object $order
 	 * @param int $id Stripe session id.
 	 */
-	public function get_stripe_return_url( $order = null, $id = null ) {
-		if ( is_object( $order ) ) {
-			if ( empty( $id ) ) {
+	public function get_stripe_return_url($order = null, $id = null) {
+		if (is_object($order)) {
+			if (empty($id)) {
 				$id = uniqid();
 			}
 
-			$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+			$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
-			return esc_url_raw( add_query_arg( array( 'utm_nooverride' => '1', 'stripe_session_id' => $id, 'order_id' => $order_id ), $this->get_return_url( $order ) ) );
+			return esc_url_raw(add_query_arg(array('utm_nooverride' => '1', 'stripe_session_id' => $id, 'order_id' => $order_id), $this->get_return_url($order)));
 		}
 
-		return esc_url_raw( add_query_arg( array( 'utm_nooverride' => '1' ), $this->get_return_url() ) );
+		return esc_url_raw(add_query_arg(array('utm_nooverride' => '1'), $this->get_return_url()));
 	}
 
 	/**
@@ -87,44 +87,44 @@ 
 	 * @param  object $source
 	 * @return array()
 	 */
-	public function generate_payment_request( $order, $source ) {
-		$settings                          = get_option( 'woocommerce_stripe_settings', array() );
-		$statement_descriptor              = ! empty( $settings['statement_descriptor'] ) ? $settings['statement_descriptor'] : '';
-		$capture                           = ! empty( $settings['capture'] ) && 'yes' === $settings['capture'] ? true : false; 
+	public function generate_payment_request($order, $source) {
+		$settings                          = get_option('woocommerce_stripe_settings', array());
+		$statement_descriptor              = ! empty($settings['statement_descriptor']) ? $settings['statement_descriptor'] : '';
+		$capture                           = ! empty($settings['capture']) && 'yes' === $settings['capture'] ? true : false; 
 		$post_data                         = array();
-		$post_data['currency']             = strtolower( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->get_order_currency() : $order->get_currency() );
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $post_data['currency'] );
-		$post_data['description']          = sprintf( __( '%1$s - Order %2$s', 'woocommerce-gateway-stripe' ), $statement_descriptor, $order->get_order_number() );
+		$post_data['currency']             = strtolower(version_compare(WC_VERSION, '3.0.0', '<') ? $order->get_order_currency() : $order->get_currency());
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $post_data['currency']);
+		$post_data['description']          = sprintf(__('%1$s - Order %2$s', 'woocommerce-gateway-stripe'), $statement_descriptor, $order->get_order_number());
 		$post_data['capture']              = $capture ? 'true' : 'false';
 
-		$billing_email      = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_email : $order->get_billing_email();
-		$billing_first_name = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name();
-		$billing_last_name  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name();
+		$billing_email      = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_email : $order->get_billing_email();
+		$billing_first_name = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name();
+		$billing_last_name  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name();
 
-		if ( ! empty( $billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) {
+		if ( ! empty($billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) {
 			$post_data['receipt_email'] = $billing_email;
 		}
 
-		switch ( $order->get_payment_method() ) {
+		switch ($order->get_payment_method()) {
 			case 'stripe':
-				$post_data['statement_descriptor'] = substr( str_replace( "'", '', $statement_descriptor ), 0, 22 );
+				$post_data['statement_descriptor'] = substr(str_replace("'", '', $statement_descriptor), 0, 22);
 				break;
 		}
 
 		$post_data['expand[]'] = 'balance_transaction';
 
 		$metadata = array(
-			__( 'Customer Name', 'woocommerce-gateway-stripe' ) => sanitize_text_field( $billing_first_name ) . ' ' . sanitize_text_field( $billing_last_name ),
-			__( 'Customer Email', 'woocommerce-gateway-stripe' ) => sanitize_email( $billing_email ),
+			__('Customer Name', 'woocommerce-gateway-stripe') => sanitize_text_field($billing_first_name) . ' ' . sanitize_text_field($billing_last_name),
+			__('Customer Email', 'woocommerce-gateway-stripe') => sanitize_email($billing_email),
 		);
 
-		$post_data['metadata'] = apply_filters( 'wc_stripe_payment_metadata', $metadata, $order, $source );
+		$post_data['metadata'] = apply_filters('wc_stripe_payment_metadata', $metadata, $order, $source);
 
-		if ( $source->customer ) {
+		if ($source->customer) {
 			$post_data['customer'] = $source->customer;
 		}
 
-		if ( $source->source ) {
+		if ($source->source) {
 			$post_data['source'] = $source->source;
 		}
 
@@ -136,50 +136,50 @@ 
 		 * @param WC_Order $order
 		 * @param object $source
 		 */
-		return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source );
+		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source);
 	}
 
 	/**
 	 * Store extra meta data for an order from a Stripe Response.
 	 */
-	public function process_response( $response, $order ) {
-		WC_Stripe_Logger::log( 'Processing response: ' . print_r( $response, true ) );
+	public function process_response($response, $order) {
+		WC_Stripe_Logger::log('Processing response: ' . print_r($response, true));
 
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
 		// Store charge data
-		update_post_meta( $order_id, '_stripe_charge_id', $response->id );
-		update_post_meta( $order_id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no' );
+		update_post_meta($order_id, '_stripe_charge_id', $response->id);
+		update_post_meta($order_id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no');
 
 		// Store other data such as fees
-		if ( isset( $response->balance_transaction ) && isset( $response->balance_transaction->fee ) ) {
+		if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) {
 			// Fees and Net needs to both come from Stripe to be accurate as the returned
 			// values are in the local currency of the Stripe account, not from WC.
-			$fee = ! empty( $response->balance_transaction->fee ) ? WC_Stripe_Helper::format_number( $response->balance_transaction, 'fee' ) : 0;
-			$net = ! empty( $response->balance_transaction->net ) ? WC_Stripe_Helper::format_number( $response->balance_transaction, 'net' ) : 0;
-			update_post_meta( $order_id, 'Stripe Fee', $fee );
-			update_post_meta( $order_id, 'Net Revenue From Stripe', $net );
+			$fee = ! empty($response->balance_transaction->fee) ? WC_Stripe_Helper::format_number($response->balance_transaction, 'fee') : 0;
+			$net = ! empty($response->balance_transaction->net) ? WC_Stripe_Helper::format_number($response->balance_transaction, 'net') : 0;
+			update_post_meta($order_id, 'Stripe Fee', $fee);
+			update_post_meta($order_id, 'Net Revenue From Stripe', $net);
 		}
 
-		if ( $response->captured ) {
-			$order->payment_complete( $response->id );
+		if ($response->captured) {
+			$order->payment_complete($response->id);
 
-			$message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id );
-			$order->add_order_note( $message );
-			WC_Stripe_Logger::log( 'Success: ' . $message );
+			$message = sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $response->id);
+			$order->add_order_note($message);
+			WC_Stripe_Logger::log('Success: ' . $message);
 
 		} else {
-			update_post_meta( $order_id, '_transaction_id', $response->id, true );
+			update_post_meta($order_id, '_transaction_id', $response->id, true);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->reduce_order_stock() : wc_reduce_stock_levels( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				version_compare(WC_VERSION, '3.0.0', '<') ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id);
 			}
 
-			$order->update_status( 'on-hold', sprintf( __( 'Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe' ), $response->id ) );
-			WC_Stripe_Logger::log( "Successful auth: $response->id" );
+			$order->update_status('on-hold', sprintf(__('Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe'), $response->id));
+			WC_Stripe_Logger::log("Successful auth: $response->id");
 		}
 
-		do_action( 'wc_gateway_stripe_process_response', $response, $order );
+		do_action('wc_gateway_stripe_process_response', $response, $order);
 
 		return $response;
 	}
@@ -192,10 +192,10 @@ 
 	 * @param int $order_id
 	 * @return null
 	 */
-	public function send_failed_order_email( $order_id ) {
+	public function send_failed_order_email($order_id) {
 		$emails = WC()->mailer()->get_emails();
-		if ( ! empty( $emails ) && ! empty( $order_id ) ) {
-			$emails['WC_Email_Failed_Order']->trigger( $order_id );
+		if ( ! empty($emails) && ! empty($order_id)) {
+			$emails['WC_Email_Failed_Order']->trigger($order_id);
 		}
 	}
 
@@ -207,21 +207,21 @@ 
 	 * @param object $order
 	 * @return object $details
 	 */
-	public function get_owner_details( $order ) {
-		$billing_first_name = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name();
-		$billing_last_name  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name();
+	public function get_owner_details($order) {
+		$billing_first_name = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name();
+		$billing_last_name  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name();
 
 		$details = array();
 
 		$details['name']                   = $billing_first_name . ' ' . $billing_last_name;
-		$details['email']                  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_email : $order->get_billing_email();
-		$details['phone']                  = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_phone : $order->get_billing_phone();
-		$details['address']['line1']       = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_1 : $order->get_billing_address_1();
-		$details['address']['line2']       = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_2 : $order->get_billing_address_2();
-		$details['address']['state']       = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_state : $order->get_billing_state();
-		$details['address']['city']        = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_city : $order->get_billing_city();
-		$details['address']['postal_code'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_postcode : $order->get_billing_postcode();
-		$details['address']['country']     = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_country : $order->get_billing_country();
+		$details['email']                  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_email : $order->get_billing_email();
+		$details['phone']                  = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_phone : $order->get_billing_phone();
+		$details['address']['line1']       = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_1 : $order->get_billing_address_1();
+		$details['address']['line2']       = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_2 : $order->get_billing_address_2();
+		$details['address']['state']       = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_state : $order->get_billing_state();
+		$details['address']['city']        = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_city : $order->get_billing_city();
+		$details['address']['postal_code'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_postcode : $order->get_billing_postcode();
+		$details['address']['country']     = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_country : $order->get_billing_country();
 
 		return (object) $details;
 	}
@@ -235,38 +235,38 @@ 
 	 * @throws Exception When card was not added or for and invalid card.
 	 * @return object
 	 */
-	public function get_source( $user_id, $force_customer = false ) {
-		$stripe_customer = new WC_Stripe_Customer( $user_id );
-		$force_customer  = apply_filters( 'wc_stripe_force_customer_creation', $force_customer, $stripe_customer );
+	public function get_source($user_id, $force_customer = false) {
+		$stripe_customer = new WC_Stripe_Customer($user_id);
+		$force_customer  = apply_filters('wc_stripe_force_customer_creation', $force_customer, $stripe_customer);
 		$stripe_source   = false;
 		$token_id        = false;
 
 		// New CC info was entered and we have a new token to process
-		if ( isset( $_POST['stripe_source'] ) ) {
-			$stripe_source     = wc_clean( $_POST['stripe_source'] );
-			$maybe_saved_card = isset( $_POST['wc-stripe-new-payment-method'] ) && ! empty( $_POST['wc-stripe-new-payment-method'] );
+		if (isset($_POST['stripe_source'])) {
+			$stripe_source = wc_clean($_POST['stripe_source']);
+			$maybe_saved_card = isset($_POST['wc-stripe-new-payment-method']) && ! empty($_POST['wc-stripe-new-payment-method']);
 
 			// This is true if the user wants to store the card to their account.
-			if ( ( $user_id && $this->saved_cards && $maybe_saved_card ) || $force_customer ) {
-				$stripe_source = $stripe_customer->add_source( $stripe_source );
+			if (($user_id && $this->saved_cards && $maybe_saved_card) || $force_customer) {
+				$stripe_source = $stripe_customer->add_source($stripe_source);
 
-				if ( is_wp_error( $stripe_source ) ) {
-					throw new Exception( $stripe_source->get_error_message() );
+				if (is_wp_error($stripe_source)) {
+					throw new Exception($stripe_source->get_error_message());
 				}
 			} else {
 				// Not saving token, so don't define customer either.
 				$stripe_source   = $stripe_source;
 				$stripe_customer = false;
 			}
-		} elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) {
+		} elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) {
 			// Use an existing token, and then process the payment
 
-			$token_id = wc_clean( $_POST['wc-stripe-payment-token'] );
-			$token    = WC_Payment_Tokens::get( $token_id );
+			$token_id = wc_clean($_POST['wc-stripe-payment-token']);
+			$token    = WC_Payment_Tokens::get($token_id);
 
-			if ( ! $token || $token->get_user_id() !== get_current_user_id() ) {
-				WC()->session->set( 'refresh_totals', true );
-				throw new Exception( __( 'Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe' ) );
+			if ( ! $token || $token->get_user_id() !== get_current_user_id()) {
+				WC()->session->set('refresh_totals', true);
+				throw new Exception(__('Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe'));
 			}
 
 			$stripe_source = $token->get_token();
@@ -287,18 +287,18 @@ 
 	 * @param WC_Order $order For to which the source applies.
 	 * @param stdClass $source Source information.
 	 */
-	public function save_source( $order, $source ) {
-		$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+	public function save_source($order, $source) {
+		$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
 		// Store source in the order.
-		if ( $source->customer ) {
-			version_compare( WC_VERSION, '3.0.0', '<' ) ? update_post_meta( $order_id, '_stripe_customer_id', $source->customer ) : $order->update_meta_data( '_stripe_customer_id', $source->customer );
+		if ($source->customer) {
+			version_compare(WC_VERSION, '3.0.0', '<') ? update_post_meta($order_id, '_stripe_customer_id', $source->customer) : $order->update_meta_data('_stripe_customer_id', $source->customer);
 		}
-		if ( $source->source ) {
-			version_compare( WC_VERSION, '3.0.0', '<' ) ? update_post_meta( $order_id, '_stripe_card_id', $source->source ) : $order->update_meta_data( '_stripe_card_id', $source->source );
+		if ($source->source) {
+			version_compare(WC_VERSION, '3.0.0', '<') ? update_post_meta($order_id, '_stripe_card_id', $source->source) : $order->update_meta_data('_stripe_card_id', $source->source);
 		}
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 	}
@@ -316,19 +316,19 @@ 
 	 * @param object $order
 	 * @return object
 	 */
-	public function get_order_source( $order = null ) {
+	public function get_order_source($order = null) {
 		$stripe_customer = new WC_Stripe_Customer();
 		$stripe_source   = false;
 		$token_id        = false;
 
-		if ( $order ) {
-			$order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+		if ($order) {
+			$order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 
-			if ( $meta_value = get_post_meta( $order_id, '_stripe_customer_id', true ) ) {
-				$stripe_customer->set_id( $meta_value );
+			if ($meta_value = get_post_meta($order_id, '_stripe_customer_id', true)) {
+				$stripe_customer->set_id($meta_value);
 			}
 
-			if ( $meta_value = get_post_meta( $order_id, '_stripe_card_id', true ) ) {
+			if ($meta_value = get_post_meta($order_id, '_stripe_card_id', true)) {
 				$stripe_source = $meta_value;
 			}
 		}
@@ -349,36 +349,36 @@ 
 	 * @param  float $amount
 	 * @return bool
 	 */
-	public function process_refund( $order_id, $amount = null, $reason = '' ) {
-		$order = wc_get_order( $order_id );
+	public function process_refund($order_id, $amount = null, $reason = '') {
+		$order = wc_get_order($order_id);
 
-		if ( ! $order || ! $order->get_transaction_id() ) {
+		if ( ! $order || ! $order->get_transaction_id()) {
 			return false;
 		}
 
 		$body = array();
 
-		if ( ! is_null( $amount ) ) {
-			$body['amount']	= WC_Stripe_Helper::get_stripe_amount( $amount );
+		if ( ! is_null($amount)) {
+			$body['amount'] = WC_Stripe_Helper::get_stripe_amount($amount);
 		}
 
-		if ( $reason ) {
+		if ($reason) {
 			$body['metadata'] = array(
 				'reason'	=> $reason,
 			);
 		}
 
-		WC_Stripe_Logger::log( "Info: Beginning refund for order $order_id for the amount of {$amount}" );
+		WC_Stripe_Logger::log("Info: Beginning refund for order $order_id for the amount of {$amount}");
 
-		$response = WC_Stripe_API::request( $body, 'charges/' . $order->get_transaction_id() . '/refunds' );
+		$response = WC_Stripe_API::request($body, 'charges/' . $order->get_transaction_id() . '/refunds');
 
-		if ( is_wp_error( $response ) ) {
-			WC_Stripe_Logger::log( 'Error: ' . $response->get_error_message() );
+		if (is_wp_error($response)) {
+			WC_Stripe_Logger::log('Error: ' . $response->get_error_message());
 			return $response;
-		} elseif ( ! empty( $response->id ) ) {
-			$refund_message = sprintf( __( 'Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe' ), wc_price( $response->amount / 100 ), $response->id, $reason );
-			$order->add_order_note( $refund_message );
-			WC_Stripe_Logger::log( 'Success: ' . html_entity_decode( strip_tags( $refund_message ) ) );
+		} elseif ( ! empty($response->id)) {
+			$refund_message = sprintf(__('Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe'), wc_price($response->amount / 100), $response->id, $reason);
+			$order->add_order_note($refund_message);
+			WC_Stripe_Logger::log('Success: ' . html_entity_decode(strip_tags($refund_message)));
 			return true;
 		}
 	}
@@ -391,32 +391,32 @@ 
 	 * @version 4.0.0
 	 */
 	public function add_payment_method() {
-		if ( empty( $_POST['stripe_token'] ) || ! is_user_logged_in() ) {
-			wc_add_notice( __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' ), 'error' );
+		if (empty($_POST['stripe_token']) || ! is_user_logged_in()) {
+			wc_add_notice(__('There was a problem adding the card.', 'woocommerce-gateway-stripe'), 'error');
 			return;
 		}
 
-		$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-		$card            = $stripe_customer->add_source( wc_clean( $_POST['stripe_token'] ) );
+		$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+		$card            = $stripe_customer->add_source(wc_clean($_POST['stripe_token']));
 
-		if ( is_wp_error( $card ) ) {
+		if (is_wp_error($card)) {
 			$localized_messages = WC_Stripe_Helper::get_localized_messages();
-			$error_msg = __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' );
+			$error_msg = __('There was a problem adding the card.', 'woocommerce-gateway-stripe');
 
 			// loop through the errors to find matching localized message
-			foreach ( $card->errors as $error => $msg ) {
-				if ( isset( $localized_messages[ $error ] ) ) {
-					$error_msg = $localized_messages[ $error ];
+			foreach ($card->errors as $error => $msg) {
+				if (isset($localized_messages[$error])) {
+					$error_msg = $localized_messages[$error];
 				}
 			}
 
-			wc_add_notice( $error_msg, 'error' );
+			wc_add_notice($error_msg, 'error');
 			return;
 		}
 
 		return array(
 			'result'   => 'success',
-			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
+			'redirect' => wc_get_endpoint_url('payment-methods'),
 		);
 	}
 }

includes/class-wc-stripe-customer.php

Doc Comments -1 removed lines

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

Spacing +77 added lines, -77 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,10 +32,10 @@ 
 	 * Constructor
 	 * @param integer $user_id
 	 */
-	public function __construct( $user_id = 0 ) {
-		if ( $user_id ) {
-			$this->set_user_id( $user_id );
-			$this->set_id( get_user_meta( $user_id, '_stripe_customer_id', true ) );
+	public function __construct($user_id = 0) {
+		if ($user_id) {
+			$this->set_user_id($user_id);
+			$this->set_id(get_user_meta($user_id, '_stripe_customer_id', true));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 	 * Set Stripe customer ID.
 	 * @param [type] $id [description]
 	 */
-	public function set_id( $id ) {
-		$this->id = wc_clean( $id );
+	public function set_id($id) {
+		$this->id = wc_clean($id);
 	}
 
 	/**
@@ -60,15 +60,15 @@ 
 	 * @return int
 	 */
 	public function get_user_id() {
-		return absint( $this->user_id );
+		return absint($this->user_id);
 	}
 
 	/**
 	 * Set User ID used by WordPress.
 	 * @param int $user_id
 	 */
-	public function set_user_id( $user_id ) {
-		$this->user_id = absint( $user_id );
+	public function set_user_id($user_id) {
+		$this->user_id = absint($user_id);
 	}
 
 	/**
@@ -76,13 +76,13 @@ 
 	 * @return WP_User
 	 */
 	protected function get_user() {
-		return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
+		return $this->get_user_id() ? get_user_by('id', $this->get_user_id()) : false;
 	}
 
 	/**
 	 * Store data from the Stripe API about this customer
 	 */
-	public function set_customer_data( $data ) {
+	public function set_customer_data($data) {
 		$this->customer_data = $data;
 	}
 
@@ -90,12 +90,12 @@ 
 	 * Get data from the Stripe API about this customer
 	 */
 	public function get_customer_data() {
-		if ( empty( $this->customer_data ) && $this->get_id() && false === ( $this->customer_data = get_transient( 'stripe_customer_' . $this->get_id() ) ) ) {
-			$response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() );
+		if (empty($this->customer_data) && $this->get_id() && false === ($this->customer_data = get_transient('stripe_customer_' . $this->get_id()))) {
+			$response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id());
 
-			if ( ! is_wp_error( $response ) ) {
-				$this->set_customer_data( $response );
-				set_transient( 'stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48 );
+			if ( ! is_wp_error($response)) {
+				$this->set_customer_data($response);
+				set_transient('stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48);
 			}
 		}
 		return $this->customer_data;
@@ -109,7 +109,7 @@ 
 		$data   = $this->get_customer_data();
 		$source = '';
 
-		if ( $data ) {
+		if ($data) {
 			$source = $data->default_source;
 		}
 
@@ -121,12 +121,12 @@ 
 	 * @param array $args
 	 * @return WP_Error|int
 	 */
-	public function create_customer( $args = array() ) {
-		$billing_email = filter_var( $_POST['billing_email'], FILTER_SANITIZE_EMAIL );
+	public function create_customer($args = array()) {
+		$billing_email = filter_var($_POST['billing_email'], FILTER_SANITIZE_EMAIL);
 
-		if ( $user = $this->get_user() ) {
-			$billing_first_name = get_user_meta( $user->ID, 'billing_first_name', true );
-			$billing_last_name  = get_user_meta( $user->ID, 'billing_last_name', true );
+		if ($user = $this->get_user()) {
+			$billing_first_name = get_user_meta($user->ID, 'billing_first_name', true);
+			$billing_last_name  = get_user_meta($user->ID, 'billing_last_name', true);
 
 			$defaults = array(
 				'email'       => $user->user_email,
@@ -134,33 +134,33 @@ 
 			);
 		} else {
 			$defaults = array(
-				'email'       => ! empty( $billing_email ) ? $billing_email : '',
+				'email'       => ! empty($billing_email) ? $billing_email : '',
 				'description' => '',
 			);
 		}
 
 		$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 ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'stripe_error', __( 'Could not create Stripe customer.', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('stripe_error', __('Could not create Stripe customer.', 'woocommerce-gateway-stripe'));
 		}
 
-		$this->set_id( $response->id );
+		$this->set_id($response->id);
 		$this->clear_cache();
-		$this->set_customer_data( $response );
+		$this->set_customer_data($response);
 
-		if ( $this->get_user_id() ) {
-			update_user_meta( $this->get_user_id(), '_stripe_customer_id', $response->id );
+		if ($this->get_user_id()) {
+			update_user_meta($this->get_user_id(), '_stripe_customer_id', $response->id);
 		}
 
-		do_action( 'woocommerce_stripe_add_customer', $args, $response );
+		do_action('woocommerce_stripe_add_customer', $args, $response);
 
 		return $response->id;
 	}
@@ -171,61 +171,61 @@ 
 	 * @param bool $retry
 	 * @return WP_Error|int
 	 */
-	public function add_source( $token, $retry = true ) {
-		if ( ! $this->get_id() ) {
-			if ( ( $response = $this->create_customer() ) && is_wp_error( $response ) ) {
+	public function add_source($token, $retry = true) {
+		if ( ! $this->get_id()) {
+			if (($response = $this->create_customer()) && is_wp_error($response)) {
 				return $response;
 			}
 		}
 
-		$response = WC_Stripe_API::request( array(
+		$response = WC_Stripe_API::request(array(
 			'source' => $token,
-		), 'customers/' . $this->get_id() . '/sources' );
+		), 'customers/' . $this->get_id() . '/sources');
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			// 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:/', $response->get_error_message() ) ) {
-				delete_user_meta( $this->get_user_id(), '_stripe_customer_id' );
+			if (preg_match('/No such customer:/', $response->get_error_message())) {
+				delete_user_meta($this->get_user_id(), '_stripe_customer_id');
 				$this->create_customer();
-				return $this->add_source( $token, false );
-			} elseif ( 'customer' === $response->get_error_code() && $retry ) {
+				return $this->add_source($token, false);
+			} elseif ('customer' === $response->get_error_code() && $retry) {
 				$this->create_customer();
-				return $this->add_source( $token, false );
+				return $this->add_source($token, false);
 			} else {
 				return $response;
 			}
-		} elseif ( empty( $response->id ) ) {
-			return new WP_Error( 'error', __( 'Unable to add card', 'woocommerce-gateway-stripe' ) );
+		} elseif (empty($response->id)) {
+			return new WP_Error('error', __('Unable to add card', 'woocommerce-gateway-stripe'));
 		}
 
 		// Add token to WooCommerce
-		if ( $this->get_user_id() && class_exists( 'WC_Payment_Token_CC' ) ) {
+		if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) {
 			$token = new WC_Payment_Token_CC();
-			$token->set_token( $response->id );
-			$token->set_gateway_id( 'stripe' );
+			$token->set_token($response->id);
+			$token->set_gateway_id('stripe');
 
-			if ( 'source' === $response->object ) {
+			if ('source' === $response->object) {
 				// Check if it is a 3d secure source.
-				if ( 'three_d_secure' === $response->type ) {
+				if ('three_d_secure' === $response->type) {
 					$card = $response->three_d_secure->card;
 				} else {
 					$card = $response->card;
 				}
 			}
 
-			$token->set_card_type( strtolower( $card->brand ) );
-			$token->set_last4( $card->last4 );
-			$token->set_expiry_month( $card->exp_month );
-			$token->set_expiry_year( $card->exp_year );
-			$token->set_user_id( $this->get_user_id() );
+			$token->set_card_type(strtolower($card->brand));
+			$token->set_last4($card->last4);
+			$token->set_expiry_month($card->exp_month);
+			$token->set_expiry_year($card->exp_year);
+			$token->set_user_id($this->get_user_id());
 			$token->save();
 		}
 
 		$this->clear_cache();
 
-		do_action( 'woocommerce_stripe_add_source', $this->get_id(), $token, $response );
+		do_action('woocommerce_stripe_add_source', $this->get_id(), $token, $response);
 
 		return $response->id;
 	}
@@ -239,20 +239,20 @@ 
 	public function get_sources() {
 		$sources = array();
 
-		if ( $this->get_id() && false === ( $sources = get_transient( 'stripe_sources_' . $this->get_id() ) ) ) {
-			$response = WC_Stripe_API::request( array(
+		if ($this->get_id() && false === ($sources = get_transient('stripe_sources_' . $this->get_id()))) {
+			$response = WC_Stripe_API::request(array(
 				'limit'       => 100,
-			), 'customers/' . $this->get_id() . '/sources', 'GET' );
+			), 'customers/' . $this->get_id() . '/sources', 'GET');
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return array();
 			}
 
-			if ( is_array( $response->data ) ) {
+			if (is_array($response->data)) {
 				$sources = $response->data;
 			}
 
-			set_transient( 'stripe_sources_' . $this->get_id(), $sources, HOUR_IN_SECONDS * 48 );
+			set_transient('stripe_sources_' . $this->get_id(), $sources, HOUR_IN_SECONDS * 48);
 		}
 
 		return $sources;
@@ -262,13 +262,13 @@ 
 	 * 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 ( ! is_wp_error( $response ) ) {
-			do_action( 'wc_stripe_delete_source', $this->get_id(), $response );
+		if ( ! is_wp_error($response)) {
+			do_action('wc_stripe_delete_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -280,15 +280,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 ( ! is_wp_error( $response ) ) {
-			do_action( 'wc_stripe_set_default_source', $this->get_id(), $response );
+		if ( ! is_wp_error($response)) {
+			do_action('wc_stripe_set_default_source', $this->get_id(), $response);
 
 			return true;
 		}
@@ -300,8 +300,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();
 	}
 }

woocommerce-gateway-stripe.php

Doc Comments +2 added lines

@@ -144,6 +144,8 @@
 		 *
 		 * @since 1.0.0
 		 * @version 1.0.0
+		 * @param string $slug
+		 * @param string $class
 		 */
 		public function add_admin_notice( $slug, $class, $message ) {
 			$this->notices[ $slug ] = array(

Spacing +96 added lines, -96 removed lines

@@ -11,20 +11,20 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe' ) ) :
+if ( ! class_exists('WC_Stripe')) :
 	/**
 	 * Required minimums and constants
 	 */
-	define( 'WC_STRIPE_VERSION', '3.2.2' );
-	define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-	define( 'WC_STRIPE_MIN_WC_VER', '2.5.0' );
-	define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
-	define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-	define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+	define('WC_STRIPE_VERSION', '3.2.2');
+	define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+	define('WC_STRIPE_MIN_WC_VER', '2.5.0');
+	define('WC_STRIPE_MAIN_FILE', __FILE__);
+	define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+	define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 
 	class WC_Stripe {
 
@@ -44,7 +44,7 @@ 
 		 * @return Singleton The *Singleton* instance.
 		 */
 		public static function get_instance() {
-			if ( null === self::$instance ) {
+			if (null === self::$instance) {
 				self::$instance = new self();
 			}
 			return self::$instance;
@@ -93,9 +93,9 @@ 
 		 * *Singleton* via the `new` operator from outside of this class.
 		 */
 		private function __construct() {
-			add_action( 'admin_init', array( $this, 'check_environment' ) );
-			add_action( 'admin_notices', array( $this, 'admin_notices' ), 15 );
-			add_action( 'plugins_loaded', array( $this, 'init' ) );
+			add_action('admin_init', array($this, 'check_environment'));
+			add_action('admin_notices', array($this, 'admin_notices'), 15);
+			add_action('plugins_loaded', array($this, 'init'));
 		}
 
 		/**
@@ -105,38 +105,38 @@ 
 		 * @version 4.0.0
 		 */
 		public function init() {
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php');
 
 			// Don't hook anything else in the plugin if we're in an incompatible environment
-			if ( self::get_environment_warning() ) {
+			if (self::get_environment_warning()) {
 				return;
 			}
 
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php' );
-			require_once( dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bitcoin.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-order-handler.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-tokens.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-logger.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-helper.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php');
+			require_once(dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bitcoin.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-order-handler.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-payment-tokens.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-customer.php');
 
 			// Init the gateway itself
 			$this->init_gateways();
 
-			add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-			add_action( 'wp_ajax_stripe_dismiss_request_api_notice', array( $this, 'dismiss_request_api_notice' ) );
-			add_action( 'wp_ajax_stripe_dismiss_apple_pay_notice', array( $this, 'dismiss_apple_pay_notice' ) );
-			add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+			add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+			add_action('wp_ajax_stripe_dismiss_request_api_notice', array($this, 'dismiss_request_api_notice'));
+			add_action('wp_ajax_stripe_dismiss_apple_pay_notice', array($this, 'dismiss_apple_pay_notice'));
+			add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-request.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-payment-request.php');
 		}
 
 		/**
@@ -145,8 +145,8 @@ 
 		 * @since 1.0.0
 		 * @version 1.0.0
 		 */
-		public function add_admin_notice( $slug, $class, $message ) {
-			$this->notices[ $slug ] = array(
+		public function add_admin_notice($slug, $class, $message) {
+			$this->notices[$slug] = array(
 				'class'   => $class,
 				'message' => $message,
 			);
@@ -160,23 +160,23 @@ 
 		 * @version 4.0.0
 		 */
 		public function check_environment() {
-			if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
+			if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
 				$this->install();
 
-				do_action( 'woocommerce_stripe_updated' );
+				do_action('woocommerce_stripe_updated');
 			}
 
 			$environment_warning = self::get_environment_warning();
 
-			if ( $environment_warning && is_plugin_active( plugin_basename( __FILE__ ) ) ) {
-				$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+			if ($environment_warning && is_plugin_active(plugin_basename(__FILE__))) {
+				$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 			}
 
 			$secret = WC_Stripe_API::get_secret_key();
 
-			if ( empty( $secret ) && ! ( isset( $_GET['page'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'] ) ) {
+			if (empty($secret) && ! (isset($_GET['page'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'])) {
 				$setting_link = $this->get_setting_link();
-				$this->add_admin_notice( 'prompt_connect', 'notice notice-warning', sprintf( __( 'Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ) );
+				$this->add_admin_notice('prompt_connect', 'notice notice-warning', sprintf(__('Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link));
 			}
 		}
 
@@ -188,8 +188,8 @@ 
 		 * @return bool
 		 */
 		private static function _update_plugin_version() {
-			delete_option( 'wc_stripe_version' );
-			update_option( 'wc_stripe_version', WC_STRIPE_VERSION );
+			delete_option('wc_stripe_version');
+			update_option('wc_stripe_version', WC_STRIPE_VERSION);
 
 			return true;
 		}
@@ -201,7 +201,7 @@ 
 		 * @version 3.1.0
 		 */
 		public function dismiss_request_api_notice() {
-			update_option( 'wc_stripe_show_request_api_notice', 'no' );
+			update_option('wc_stripe_show_request_api_notice', 'no');
 		}
 
 		/**
@@ -211,7 +211,7 @@ 
 		 * @version 3.1.0
 		 */
 		public function dismiss_apple_pay_notice() {
-			update_option( 'wc_stripe_show_apple_pay_notice', 'no' );
+			update_option('wc_stripe_show_apple_pay_notice', 'no');
 		}
 
 		/**
@@ -221,8 +221,8 @@ 
 		 * @version 3.1.0
 		 */
 		public function install() {
-			if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-				define( 'WC_STRIPE_INSTALLING', true );
+			if ( ! defined('WC_STRIPE_INSTALLING')) {
+				define('WC_STRIPE_INSTALLING', true);
 			}
 
 			$this->_update_plugin_version();
@@ -236,24 +236,24 @@ 
 		 * @version 3.1.0
 		 */
 		public static function get_environment_warning() {
-			if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
-				$message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+			if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) {
+				$message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-				return sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() );
+				return sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion());
 			}
 
-			if ( ! defined( 'WC_VERSION' ) ) {
-				return __( 'WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe' );
+			if ( ! defined('WC_VERSION')) {
+				return __('WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe');
 			}
 
-			if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
-				$message = __( 'WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+			if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
+				$message = __('WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-				return sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION );
+				return sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION);
 			}
 
-			if ( ! function_exists( 'curl_init' ) ) {
-				return __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' );
+			if ( ! function_exists('curl_init')) {
+				return __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe');
 			}
 
 			return false;
@@ -264,15 +264,15 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		public function plugin_action_links( $links ) {
+		public function plugin_action_links($links) {
 			$setting_link = $this->get_setting_link();
 
 			$plugin_links = array(
-				'<a href="' . $setting_link . '">' . __( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://docs.woocommerce.com/document/stripe/">' . __( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://woocommerce.com/contact-us/">' . __( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+				'<a href="' . $setting_link . '">' . __('Settings', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://docs.woocommerce.com/document/stripe/">' . __('Docs', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://woocommerce.com/contact-us/">' . __('Support', 'woocommerce-gateway-stripe') . '</a>',
 			);
-			return array_merge( $plugin_links, $links );
+			return array_merge($plugin_links, $links);
 		}
 
 		/**
@@ -283,24 +283,24 @@ 
 		 * @return string Setting link
 		 */
 		public function get_setting_link() {
-			$use_id_as_section = function_exists( 'WC' ) ? version_compare( WC()->version, '2.6', '>=' ) : false;
+			$use_id_as_section = function_exists('WC') ? version_compare(WC()->version, '2.6', '>=') : false;
 
-			$section_slug = $use_id_as_section ? 'stripe' : strtolower( 'WC_Gateway_Stripe' );
+			$section_slug = $use_id_as_section ? 'stripe' : strtolower('WC_Gateway_Stripe');
 
-			return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . $section_slug );
+			return admin_url('admin.php?page=wc-settings&tab=checkout&section=' . $section_slug);
 		}
 
 		/**
 		 * Display any notices we've collected thus far (e.g. for connection, disconnection)
 		 */
 		public function admin_notices() {
-			$show_request_api_notice = get_option( 'wc_stripe_show_request_api_notice' );
-			$show_apple_pay_notice   = get_option( 'wc_stripe_show_apple_pay_notice' );
+			$show_request_api_notice = get_option('wc_stripe_show_request_api_notice');
+			$show_apple_pay_notice   = get_option('wc_stripe_show_apple_pay_notice');
 
-			if ( empty( $show_apple_pay_notice ) ) {
+			if (empty($show_apple_pay_notice)) {
 				// @TODO remove this notice in the future.
 				?>
-				<div class="notice notice-warning wc-stripe-apple-pay-notice is-dismissible"><p><?php echo sprintf( esc_html__( 'New Feature! Stripe now supports %s. Your customers can now purchase your products even faster. Apple Pay has been enabled by default.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/apple-pay/">Apple Pay</a>'); ?></p></div>
+				<div class="notice notice-warning wc-stripe-apple-pay-notice is-dismissible"><p><?php echo sprintf(esc_html__('New Feature! Stripe now supports %s. Your customers can now purchase your products even faster. Apple Pay has been enabled by default.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/apple-pay/">Apple Pay</a>'); ?></p></div>
 
 				<script type="application/javascript">
 					jQuery( '.wc-stripe-apple-pay-notice' ).on( 'click', '.notice-dismiss', function() {
@@ -308,17 +308,17 @@ 
 							action: 'stripe_dismiss_apple_pay_notice'
 						};
 
-						jQuery.post( '<?php echo admin_url( 'admin-ajax.php' ); ?>', data );
+						jQuery.post( '<?php echo admin_url('admin-ajax.php'); ?>', data );
 					});
 				</script>
 
 				<?php
 			}
 
-			if ( empty( $show_request_api_notice ) ) {
+			if (empty($show_request_api_notice)) {
 				// @TODO remove this notice in the future.
 				?>
-				<div class="notice notice-warning wc-stripe-request-api-notice is-dismissible"><p><?php esc_html_e( 'New Feature! Stripe now supports Google Payment Request. Your customers can now use mobile phones with supported browsers such as Chrome to make purchases easier and faster.', 'woocommerce-gateway-stripe' ); ?></p></div>
+				<div class="notice notice-warning wc-stripe-request-api-notice is-dismissible"><p><?php esc_html_e('New Feature! Stripe now supports Google Payment Request. Your customers can now use mobile phones with supported browsers such as Chrome to make purchases easier and faster.', 'woocommerce-gateway-stripe'); ?></p></div>
 
 				<script type="application/javascript">
 					jQuery( '.wc-stripe-request-api-notice' ).on( 'click', '.notice-dismiss', function() {
@@ -326,16 +326,16 @@ 
 							action: 'stripe_dismiss_request_api_notice'
 						};
 
-						jQuery.post( '<?php echo admin_url( 'admin-ajax.php' ); ?>', data );
+						jQuery.post( '<?php echo admin_url('admin-ajax.php'); ?>', data );
 					});
 				</script>
 
 				<?php
 			}
 
-			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>';
 			}
 		}
@@ -347,22 +347,22 @@ 
 		 * @version 4.0.0
 		 */
 		public function init_gateways() {
-			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 				$this->subscription_support_enabled = true;
 			}
 
-			if ( class_exists( 'WC_Pre_Orders_Order' ) ) {
+			if (class_exists('WC_Pre_Orders_Order')) {
 				$this->pre_order_enabled = true;
 			}
 
-			if ( ! class_exists( 'WC_Payment_Gateway' ) ) {
+			if ( ! class_exists('WC_Payment_Gateway')) {
 				return;
 			}
 
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay.php');
 
-			load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
-			add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
+			load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
+			add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
 
 			$load_addons = (
 				$this->subscription_support_enabled
@@ -370,8 +370,8 @@ 
 				$this->pre_order_enabled
 			);
 
-			if ( $load_addons ) {
-				require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-gateway-stripe-addons.php' );
+			if ($load_addons) {
+				require_once(dirname(__FILE__) . '/includes/compat/class-wc-gateway-stripe-addons.php');
 			}
 		}
 
@@ -381,8 +381,8 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function add_gateways( $methods ) {
-			if ( $this->subscription_support_enabled || $this->pre_order_enabled ) {
+		public function add_gateways($methods) {
+			if ($this->subscription_support_enabled || $this->pre_order_enabled) {
 				$methods[] = 'WC_Gateway_Stripe_Addons';
 			} else {
 				$methods[] = 'WC_Gateway_Stripe';
@@ -403,15 +403,15 @@ 
 		 * @since 4.0.0
 		 * @version 4.0.0
 		 */
-		public function filter_gateway_order_admin( $sections ) {
-			unset( $sections['stripe'] );
-			unset( $sections['stripe_bancontact'] );
-			unset( $sections['stripe_sofort'] );
-			unset( $sections['stripe_giropay'] );
-			unset( $sections['stripe_ideal'] );
-			unset( $sections['stripe_alipay'] );
-			unset( $sections['stripe_sepa'] );
-			unset( $sections['stripe_bitcoin'] );
+		public function filter_gateway_order_admin($sections) {
+			unset($sections['stripe']);
+			unset($sections['stripe_bancontact']);
+			unset($sections['stripe_sofort']);
+			unset($sections['stripe_giropay']);
+			unset($sections['stripe_ideal']);
+			unset($sections['stripe_alipay']);
+			unset($sections['stripe_sepa']);
+			unset($sections['stripe_bitcoin']);
 
 			$sections['stripe']            = 'Stripe';
 			$sections['stripe_bancontact'] = 'Stripe Bancontact';

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

Spacing +126 added lines, -126 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,12 +20,12 @@ 
 	public function __construct() {
 		self::$_this = $this;
 
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'cancel_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'cancel_payment' ) );
-		add_action( 'wc_ajax_wc_stripe_validate_checkout', array( $this, 'validate_checkout' ) );
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
+		add_action('woocommerce_order_status_on-hold_to_processing', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_completed', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'cancel_payment'));
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'cancel_payment'));
+		add_action('wc_ajax_wc_stripe_validate_checkout', array($this, 'validate_checkout'));
 	}
 
 	/**
@@ -44,8 +44,8 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function get_stripe_customer_id( $order ) {
-		return get_user_meta( $order->get_customer_id(), '_stripe_customer_id', true );
+	public function get_stripe_customer_id($order) {
+		return get_user_meta($order->get_customer_id(), '_stripe_customer_id', true);
 	}
 
 	/**
@@ -56,11 +56,11 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function process_redirect_payment( $order_id, $retry = true, $source ) {
+	public function process_redirect_payment($order_id, $retry = true, $source) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status()) {
 				return;
 			}
 
@@ -68,73 +68,73 @@ 
 			$response = null;
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
-					throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe_Helper::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
+					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe_Helper::get_minimum_amount() / 100)));
 				}
 
-				WC_Stripe_Logger::log( "Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: (Redirect) 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;
 
 				// 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 ( is_wp_error( $response ) ) {
-					$this->delete_stripe_session_id( $order_id );
+				if (is_wp_error($response)) {
+					$this->delete_stripe_session_id($order_id);
 
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( 'customer' === $response->get_error_code() && $retry ) {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
+					if ('customer' === $response->get_error_code() && $retry) {
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
 
-						return $this->process_redirect_payment( $order_id, false, $source );
-					} elseif ( preg_match( '/No such customer/i', $response->get_error_message() ) && $retry ) {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
+						return $this->process_redirect_payment($order_id, false, $source);
+					} elseif (preg_match('/No such customer/i', $response->get_error_message()) && $retry) {
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
 
-						return $this->process_redirect_payment( $order_id, false, $source );
+						return $this->process_redirect_payment($order_id, false, $source);
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					} elseif ( 'source' === $response->get_error_code() && $source->token_id ) {
-						$token = WC_Payment_Tokens::get( $source->token_id );
+					} elseif ('source' === $response->get_error_code() && $source->token_id) {
+						$token = WC_Payment_Tokens::get($source->token_id);
 						$token->delete();
-						$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $message );
+						$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($message);
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					$message = isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message();
+					$message = isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message();
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					wc_add_notice( __( 'Payment failed, please try another payment method.', 'woocommerce-gateway-stripe' ), 'error' );
+					wc_add_notice(__('Payment failed, please try another payment method.', 'woocommerce-gateway-stripe'), 'error');
 					// Everything failed so send customer back to checkout page to pay via another source.
-					wp_safe_redirect( wc_get_checkout_url() );
+					wp_safe_redirect(wc_get_checkout_url());
 					exit;
 				}
 
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 				
 			} else {
 				$order->payment_complete();
 			}
 
-			$this->delete_stripe_session_id( $order_id );
-			do_action( 'wc_gateway_stripe_process_redirect_payment', $response, $order );
+			$this->delete_stripe_session_id($order_id);
+			do_action('wc_gateway_stripe_process_redirect_payment', $response, $order);
 
-		} catch ( Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
-			$this->delete_stripe_session_id( $order_id );
-			do_action( 'wc_gateway_stripe_process_redirect_payment_error', $e, $order );
+			$this->delete_stripe_session_id($order_id);
+			do_action('wc_gateway_stripe_process_redirect_payment_error', $e, $order);
 		}
 	}
 
@@ -145,8 +145,8 @@ 
 	 * @version 4.0.0
 	 * @param int $order_id
 	 */
-	public function delete_stripe_session_id( $order_id ) {
-		delete_post_meta( $order_id, '_stripe_session_id' );
+	public function delete_stripe_session_id($order_id) {
+		delete_post_meta($order_id, '_stripe_session_id');
 	}
 
 	/**
@@ -156,19 +156,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function maybe_process_redirect_order() {
-		if ( ! is_order_received_page() || empty( $_GET['client_secret'] ) || empty( $_GET['source'] ) || empty( $_GET['stripe_session_id'] ) ) {
+		if ( ! is_order_received_page() || empty($_GET['client_secret']) || empty($_GET['source']) || empty($_GET['stripe_session_id'])) {
 			return;
 		}
 
-		$source            = wc_clean( $_GET['source'] );
-		$stripe_session_id = wc_clean( $_GET['stripe_session_id'] );
-		$order_id          = wc_clean( $_GET['order_id'] );
+		$source            = wc_clean($_GET['source']);
+		$stripe_session_id = wc_clean($_GET['stripe_session_id']);
+		$order_id          = wc_clean($_GET['order_id']);
 
-		if ( $stripe_session_id !== get_post_meta( $order_id, '_stripe_session_id', true ) ) {
+		if ($stripe_session_id !== get_post_meta($order_id, '_stripe_session_id', true)) {
 			return;
 		}
 
-		$this->process_redirect_payment( $order_id, true, $source );
+		$this->process_redirect_payment($order_id, true, $source);
 	}
 
 	/**
@@ -178,36 +178,36 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function capture_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function capture_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = get_post_meta( $order_id, '_stripe_charge_id', true );
-			$captured = get_post_meta( $order_id, '_stripe_charge_captured', true );
+		if ('stripe' === (version_compare(WC_VERSION, '3.0.0', '<') ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = get_post_meta($order_id, '_stripe_charge_id', true);
+			$captured = get_post_meta($order_id, '_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
-				$result = WC_Stripe_API::request( array(
+			if ($charge && 'no' === $captured) {
+				$result = WC_Stripe_API::request(array(
 					'amount'   => $order->get_total() * 100,
 					'expand[]' => 'balance_transaction',
-				), 'charges/' . $charge . '/capture' );
+				), 'charges/' . $charge . '/capture');
 
-				if ( is_wp_error( $result ) ) {
-					$order->add_order_note( __( 'Unable to capture charge!', 'woocommerce-gateway-stripe' ) . ' ' . $result->get_error_message() );
+				if (is_wp_error($result)) {
+					$order->add_order_note(__('Unable to capture charge!', 'woocommerce-gateway-stripe') . ' ' . $result->get_error_message());
 				} else {
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					update_post_meta( $order_id, '_stripe_charge_captured', 'yes' );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					update_post_meta($order_id, '_stripe_charge_captured', 'yes');
 
 					// Store other data such as fees
-					update_post_meta( $order_id, 'Stripe Payment ID', $result->id );
-					update_post_meta( $order_id, '_transaction_id', $result->id );
+					update_post_meta($order_id, 'Stripe Payment ID', $result->id);
+					update_post_meta($order_id, '_transaction_id', $result->id);
 
-					if ( isset( $result->balance_transaction ) && isset( $result->balance_transaction->fee ) ) {
+					if (isset($result->balance_transaction) && isset($result->balance_transaction->fee)) {
 						// Fees and Net needs to both come from Stripe to be accurate as the returned
 						// values are in the local currency of the Stripe account, not from WC.
-						$fee = ! empty( $result->balance_transaction->fee ) ? WC_Stripe_Helper::format_number( $result->balance_transaction, 'fee' ) : 0;
-						$net = ! empty( $result->balance_transaction->net ) ? WC_Stripe_Helper::format_number( $result->balance_transaction, 'net' ) : 0;
-						update_post_meta( $order_id, 'Stripe Fee', $fee );
-						update_post_meta( $order_id, 'Net Revenue From Stripe', $net );
+						$fee = ! empty($result->balance_transaction->fee) ? WC_Stripe_Helper::format_number($result->balance_transaction, 'fee') : 0;
+						$net = ! empty($result->balance_transaction->net) ? WC_Stripe_Helper::format_number($result->balance_transaction, 'net') : 0;
+						update_post_meta($order_id, 'Stripe Fee', $fee);
+						update_post_meta($order_id, 'Net Revenue From Stripe', $net);
 					}
 				}
 			}
@@ -221,23 +221,23 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function cancel_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function cancel_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = get_post_meta( $order_id, '_stripe_charge_id', true );
+		if ('stripe' === (version_compare(WC_VERSION, '3.0.0', '<') ? $order->payment_method : $order->get_payment_method())) {
+			$charge = get_post_meta($order_id, '_stripe_charge_id', true);
 
-			if ( $charge ) {
-				$result = WC_Stripe_API::request( array(
+			if ($charge) {
+				$result = WC_Stripe_API::request(array(
 					'amount' => $order->get_total() * 100,
-				), 'charges/' . $charge . '/refund' );
+				), 'charges/' . $charge . '/refund');
 
-				if ( is_wp_error( $result ) ) {
-					$order->add_order_note( __( 'Unable to refund charge!', 'woocommerce-gateway-stripe' ) . ' ' . $result->get_error_message() );
+				if (is_wp_error($result)) {
+					$order->add_order_note(__('Unable to refund charge!', 'woocommerce-gateway-stripe') . ' ' . $result->get_error_message());
 				} else {
-					$order->add_order_note( sprintf( __( 'Stripe charge refunded (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					delete_post_meta( $order_id, '_stripe_charge_captured' );
-					delete_post_meta( $order_id, '_stripe_charge_id' );
+					$order->add_order_note(sprintf(__('Stripe charge refunded (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					delete_post_meta($order_id, '_stripe_charge_captured');
+					delete_post_meta($order_id, '_stripe_charge_id');
 				}
 			}
 		}
@@ -250,14 +250,14 @@ 
 	 * @version 4.0.0
 	 */
 	public function validate_checkout() {
-		if ( ! wp_verify_nonce( $_POST['nonce'], '_wc_stripe_nonce' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+		if ( ! wp_verify_nonce($_POST['nonce'], '_wc_stripe_nonce')) {
+			wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 		}
 
 		$errors = new WP_Error();
-		parse_str( $_POST['required_fields'], $required_fields );
-		parse_str( $_POST['all_fields'], $all_fields );
-		$source_type = wc_clean( $_POST['source_type'] );
+		parse_str($_POST['required_fields'], $required_fields);
+		parse_str($_POST['all_fields'], $all_fields);
+		$source_type = wc_clean($_POST['source_type']);
 		$validate_shipping_fields = false;
 		$create_account = false;
 
@@ -265,89 +265,89 @@ 
 		 * If ship to different address checkbox is checked then we need
 		 * to validate shipping fields too.
 		 */
-		if ( isset( $all_fields['ship_to_different_address'] ) ) {
+		if (isset($all_fields['ship_to_different_address'])) {
 			$validate_shipping_fields = true;
 		}
 
 		// Check if createaccount is checked.
-		if ( isset( $all_fields['createaccount'] ) ) {
+		if (isset($all_fields['createaccount'])) {
 			$create_account = true;
 		}
 
 		// Check if required fields are empty.
-		foreach ( $required_fields as $field => $field_value ) {
+		foreach ($required_fields as $field => $field_value) {
 			// Check for shipping field.
-			if ( preg_match( '/^shipping_/', $field ) && ! $validate_shipping_fields ) {
+			if (preg_match('/^shipping_/', $field) && ! $validate_shipping_fields) {
 				continue;
 			}
 
 			// Check create account name.
-			if ( 'account_username' === $field && ! $create_account ) {
+			if ('account_username' === $field && ! $create_account) {
 				continue;
 			}
 
 			// Check create account password.
-			if ( 'account_password' === $field && ! $create_account ) {
+			if ('account_password' === $field && ! $create_account) {
 				continue;
 			}
 
 			// Check if is SEPA.
-			if ( empty( $field_value ) && 'stripe_sepa' !== $source_type ) {
+			if (empty($field_value) && 'stripe_sepa' !== $source_type) {
 				continue;
 			}
 
 			// Check if is Sofort.
-			if ( '-1' === $field_value && 'stripe_sofort' === $source_type ) {
-				$errors->add( 'validation', sprintf( __( '%s cannot be empty', 'woocommerce-gateway-stripe' ), ucfirst( str_replace( '_', ' ', $field ) ) ) );
+			if ('-1' === $field_value && 'stripe_sofort' === $source_type) {
+				$errors->add('validation', sprintf(__('%s cannot be empty', 'woocommerce-gateway-stripe'), ucfirst(str_replace('_', ' ', $field))));
 			}
 
-			if ( empty( $field_value ) ) {
-				$errors->add( 'validation', sprintf( __( '%s cannot be empty', 'woocommerce-gateway-stripe' ), ucfirst( str_replace( '_', ' ', $field ) ) ) );
+			if (empty($field_value)) {
+				$errors->add('validation', sprintf(__('%s cannot be empty', 'woocommerce-gateway-stripe'), ucfirst(str_replace('_', ' ', $field))));
 			}
 		}
 
 		// Check if email is valid format.
-		if ( ! empty( $required_fields['billing_email'] ) && ! is_email( $required_fields['billing_email'] ) ) {
-			$errors->add( 'validation', __( 'Email is not valid', 'woocommerce-gateway-stripe' ) );
+		if ( ! empty($required_fields['billing_email']) && ! is_email($required_fields['billing_email'])) {
+			$errors->add('validation', __('Email is not valid', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( empty( $all_fields['woocommerce_checkout_update_totals'] ) && empty( $all_fields['terms'] ) && apply_filters( 'woocommerce_checkout_show_terms', wc_get_page_id( 'terms' ) > 0 ) ) {
-			$errors->add( 'terms', __( 'You must accept our Terms &amp; Conditions.', 'woocommerce-gateway-stripe' ) );
+		if (empty($all_fields['woocommerce_checkout_update_totals']) && empty($all_fields['terms']) && apply_filters('woocommerce_checkout_show_terms', wc_get_page_id('terms') > 0)) {
+			$errors->add('terms', __('You must accept our Terms &amp; Conditions.', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( WC()->cart->needs_shipping() ) {
+		if (WC()->cart->needs_shipping()) {
 			$shipping_country = WC()->customer->get_shipping_country();
 
-			if ( empty( $shipping_country ) ) {
-				$errors->add( 'shipping', __( 'Please enter an address to continue.', 'woocommerce-gateway-stripe' ) );
-			} elseif ( ! in_array( WC()->customer->get_shipping_country(), array_keys( WC()->countries->get_shipping_countries() ) ) ) {
-				$errors->add( 'shipping', sprintf( __( 'Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce-gateway-stripe' ), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country() ) );
+			if (empty($shipping_country)) {
+				$errors->add('shipping', __('Please enter an address to continue.', 'woocommerce-gateway-stripe'));
+			} elseif ( ! in_array(WC()->customer->get_shipping_country(), array_keys(WC()->countries->get_shipping_countries()))) {
+				$errors->add('shipping', sprintf(__('Unfortunately <strong>we do not ship %s</strong>. Please enter an alternative shipping address.', 'woocommerce-gateway-stripe'), WC()->countries->shipping_to_prefix() . ' ' . WC()->customer->get_shipping_country()));
 			} else {
-				$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+				$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
 
-				foreach ( WC()->shipping->get_packages() as $i => $package ) {
-					if ( ! isset( $chosen_shipping_methods[ $i ], $package['rates'][ $chosen_shipping_methods[ $i ] ] ) ) {
-						$errors->add( 'shipping', __( 'No shipping method has been selected. Please double check your address, or contact us if you need any help.', 'woocommerce-gateway-stripe' ) );
+				foreach (WC()->shipping->get_packages() as $i => $package) {
+					if ( ! isset($chosen_shipping_methods[$i], $package['rates'][$chosen_shipping_methods[$i]])) {
+						$errors->add('shipping', __('No shipping method has been selected. Please double check your address, or contact us if you need any help.', 'woocommerce-gateway-stripe'));
 					}
 				}
 			}
 		}
 
-		if ( WC()->cart->needs_payment() ) {
+		if (WC()->cart->needs_payment()) {
 			$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-			if ( ! isset( $available_gateways[ $all_fields['payment_method'] ] ) ) {
-				$errors->add( 'payment', __( 'Invalid payment method.', 'woocommerce-gateway-stripe' ) );
+			if ( ! isset($available_gateways[$all_fields['payment_method']])) {
+				$errors->add('payment', __('Invalid payment method.', 'woocommerce-gateway-stripe'));
 			} else {
-				$available_gateways[ $all_fields['payment_method'] ]->validate_fields();
+				$available_gateways[$all_fields['payment_method']]->validate_fields();
 			}
 		}
 
-		if ( 0 === count( $errors->errors ) ) {
-			wp_send_json( 'success' );
+		if (0 === count($errors->errors)) {
+			wp_send_json('success');
 		} else {
-			foreach ( $errors->get_error_messages() as $message ) {
-				wc_add_notice( $message, 'error' );
+			foreach ($errors->get_error_messages() as $message) {
+				wc_add_notice($message, 'error');
 			}
 
 			$this->send_ajax_failure_response();
@@ -361,9 +361,9 @@ 
 	 * @version 4.0.0
 	 */
 	public function send_ajax_failure_response() {
-		if ( is_ajax() ) {
+		if (is_ajax()) {
 			// only print notices if not reloading the checkout, otherwise they're lost in the page reload.
-			if ( ! isset( WC()->session->reload_checkout ) ) {
+			if ( ! isset(WC()->session->reload_checkout)) {
 				ob_start();
 				wc_print_notices();
 				$messages = ob_get_clean();
@@ -371,14 +371,14 @@ 
 
 			$response = array(
 				'result'   => 'failure',
-				'messages' => isset( $messages ) ? $messages : '',
-				'refresh'  => isset( WC()->session->refresh_totals ),
-				'reload'   => isset( WC()->session->reload_checkout ),
+				'messages' => isset($messages) ? $messages : '',
+				'refresh'  => isset(WC()->session->refresh_totals),
+				'reload'   => isset(WC()->session->reload_checkout),
 			);
 
-			unset( WC()->session->refresh_totals, WC()->session->reload_checkout );
+			unset(WC()->session->refresh_totals, WC()->session->reload_checkout);
 
-			wp_send_json( $response );
+			wp_send_json($response);
 		}
 	}
 }

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

Spacing +29 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,9 +21,9 @@ 
 	public function __construct() {
 		self::$_this = $this;
 
-		add_filter( 'woocommerce_get_customer_payment_tokens', array( $this, 'woocommerce_get_customer_payment_tokens' ), 10, 3 );
-		add_action( 'woocommerce_payment_token_deleted', array( $this, 'woocommerce_payment_token_deleted' ), 10, 2 );
-		add_action( 'woocommerce_payment_token_set_default', array( $this, 'woocommerce_payment_token_set_default' ) );
+		add_filter('woocommerce_get_customer_payment_tokens', array($this, 'woocommerce_get_customer_payment_tokens'), 10, 3);
+		add_action('woocommerce_payment_token_deleted', array($this, 'woocommerce_payment_token_deleted'), 10, 2);
+		add_action('woocommerce_payment_token_set_default', array($this, 'woocommerce_payment_token_set_default'));
 	}
 
 	/**
@@ -44,37 +44,37 @@ 
 	 * @param array $tokens
 	 * @return array
 	 */
-	public function woocommerce_get_customer_payment_tokens( $tokens, $customer_id, $gateway_id ) {
-		if ( is_user_logged_in() && 'stripe' === $gateway_id && class_exists( 'WC_Payment_Token_CC' ) ) {
-			$stripe_customer = new WC_Stripe_Customer( $customer_id );
+	public function woocommerce_get_customer_payment_tokens($tokens, $customer_id, $gateway_id) {
+		if (is_user_logged_in() && 'stripe' === $gateway_id && class_exists('WC_Payment_Token_CC')) {
+			$stripe_customer = new WC_Stripe_Customer($customer_id);
 			$stripe_cards    = $stripe_customer->get_sources();
 			$stored_tokens   = array();
 
-			foreach ( $tokens as $token ) {
+			foreach ($tokens as $token) {
 				$stored_tokens[] = $token->get_token();
 			}
 
-			foreach ( $stripe_cards as $card ) {
-				if ( ! in_array( $card->id, $stored_tokens ) ) {
+			foreach ($stripe_cards as $card) {
+				if ( ! in_array($card->id, $stored_tokens)) {
 					$token = new WC_Payment_Token_CC();
-					$token->set_token( $card->id );
-					$token->set_gateway_id( 'stripe' );
+					$token->set_token($card->id);
+					$token->set_gateway_id('stripe');
 
-					if ( 'three_d_secure' === $card->type ) {
+					if ('three_d_secure' === $card->type) {
 						continue;
 					}
 
-					if ( 'source' === $card->object ) {
+					if ('source' === $card->object) {
 						$card = $card->card;
 					}
 
-					$token->set_card_type( strtolower( $card->brand ) );
-					$token->set_last4( $card->last4 );
-					$token->set_expiry_month( $card->exp_month );
-					$token->set_expiry_year( $card->exp_year );
-					$token->set_user_id( $customer_id );
+					$token->set_card_type(strtolower($card->brand));
+					$token->set_last4($card->last4);
+					$token->set_expiry_month($card->exp_month);
+					$token->set_expiry_year($card->exp_year);
+					$token->set_user_id($customer_id);
 					$token->save();
-					$tokens[ $token->get_id() ] = $token;
+					$tokens[$token->get_id()] = $token;
 				}
 			}
 		}
@@ -88,10 +88,10 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	public function woocommerce_payment_token_deleted( $token_id, $token ) {
-		if ( 'stripe' === $token->get_gateway_id() ) {
-			$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-			$stripe_customer->delete_source( $token->get_token() );
+	public function woocommerce_payment_token_deleted($token_id, $token) {
+		if ('stripe' === $token->get_gateway_id()) {
+			$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+			$stripe_customer->delete_source($token->get_token());
 		}
 	}
 
@@ -101,11 +101,11 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	public function woocommerce_payment_token_set_default( $token_id ) {
-		$token = WC_Payment_Tokens::get( $token_id );
-		if ( 'stripe' === $token->get_gateway_id() ) {
-			$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-			$stripe_customer->set_default_source( $token->get_token() );
+	public function woocommerce_payment_token_set_default($token_id) {
+		$token = WC_Payment_Tokens::get($token_id);
+		if ('stripe' === $token->get_gateway_id()) {
+			$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+			$stripe_customer->set_default_source($token->get_token());
 		}
 	}
 }

includes/class-wc-stripe-logger.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,23 +20,23 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public static function log( $message, $start_time = null, $end_time = null ) {
-		if ( empty( self::$logger ) ) {
+	public static function log($message, $start_time = null, $end_time = null) {
+		if (empty(self::$logger)) {
 			self::$logger = new WC_Logger();
 		}
 
-		$settings = get_option( 'woocommerce_stripe_settings' );
+		$settings = get_option('woocommerce_stripe_settings');
 
-		if ( empty( $settings ) || 'yes' !== $settings['logging'] ) {
+		if (empty($settings) || 'yes' !== $settings['logging']) {
 			return;
 		}
 
-		if ( ! is_null( $start_time ) ) {
+		if ( ! is_null($start_time)) {
 
-			$formatted_start_time = date_i18n( get_option( 'date_format' ) . ' g:ia', $start_time );
-			$end_time             = is_null( $end_time ) ? current_time( 'timestamp' ) : $end_time;
-			$formatted_end_time   = date_i18n( get_option( 'date_format' ) . ' g:ia', $end_time );
-			$elapsed_time         = round( abs( $end_time - $start_time ) / 60, 2 );
+			$formatted_start_time = date_i18n(get_option('date_format') . ' g:ia', $start_time);
+			$end_time             = is_null($end_time) ? current_time('timestamp') : $end_time;
+			$formatted_end_time   = date_i18n(get_option('date_format') . ' g:ia', $end_time);
+			$elapsed_time         = round(abs($end_time - $start_time) / 60, 2);
 
 			$log_entry  = '====Start Log ' . $formatted_start_time . '====' . "\n" . $message . "\n";
 			$log_entry .= '====End Log ' . $formatted_end_time . ' (' . $elapsed_time . ')====' . "\n\n";
@@ -47,6 +47,6 @@ 
 
 		}
 
-		self::$logger->add( self::WC_LOG_FILENAME, $log_entry );
+		self::$logger->add(self::WC_LOG_FILENAME, $log_entry);
 	}
 }

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

Spacing +75 added lines, -75 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,8 +57,8 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_giropay';
-		$this->method_title         = __( 'Stripe Giropay', 'woocommerce-gateway-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->method_title         = __('Stripe Giropay', 'woocommerce-gateway-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'));
 
 		// Load the form fields.
 		$this->init_form_fields();
@@ -66,24 +66,24 @@ 
 		// 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( '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('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -95,13 +95,13 @@ 
 	public function check_environment() {
 		$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>';
 		}
 	}
@@ -114,8 +114,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && 'EUR' !== get_woocommerce_currency() ) {
-			$message = __( 'Giropay is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && 'EUR' !== get_woocommerce_currency()) {
+			$message = __('Giropay is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -131,9 +131,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'giropay' => '<i class="stripe-pf stripe-pf-giropay stripe-pf-right" alt="Giropay" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -150,7 +150,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);
 	}
 
 	/**
@@ -161,19 +161,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;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
+		wp_enqueue_style('stripe_paymentfonts');
 
-		if ( apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ) {
-			wp_enqueue_script( 'stripev3' );
-			wp_enqueue_script( 'woocommerce_stripe_elements' );
+		if (apply_filters('wc_stripe_use_elements_checkout_form', true)) {
+			wp_enqueue_script('stripev3');
+			wp_enqueue_script('woocommerce_stripe_elements');
 		} else {
-			wp_enqueue_script( 'woocommerce_stripe' );
+			wp_enqueue_script('woocommerce_stripe');
 		}
 	}
 
@@ -181,7 +181,7 @@ 
 	 * 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');
 	}
 
 	/**
@@ -192,25 +192,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>';
@@ -224,26 +224,26 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency              = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->get_order_currency() : $order->get_currency();
-		$order_id              = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+	public function create_source($order) {
+		$currency              = version_compare(WC_VERSION, '3.0.0', '<') ? $order->get_order_currency() : $order->get_currency();
+		$order_id              = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 		$stripe_session_id     = uniqid();
 		
 		// Set the stripe session id in order meta to later match it for security purposes.
-		update_post_meta( $order_id, '_stripe_session_id', $stripe_session_id );
-		$return_url            = $this->get_stripe_return_url( $order, $stripe_session_id );
+		update_post_meta($order_id, '_stripe_session_id', $stripe_session_id);
+		$return_url = $this->get_stripe_return_url($order, $stripe_session_id);
 
 		$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['giropay']        = array( 'statement_descriptor' => $this->statement_descriptor );
+		$post_data['owner']          = $this->get_owner_details($order);
+		$post_data['redirect']       = array('return_url' => $return_url);
+		$post_data['giropay']        = array('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');
 	}
 
 	/**
@@ -257,45 +257,45 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_customer = false ) {
+	public function process_payment($order_id, $retry = true, $force_customer = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
-					throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe_Helper::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
+					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe_Helper::get_minimum_amount() / 100)));
 				}
 
-				$response = $this->create_source( $order );
+				$response = $this->create_source($order);
 
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					$message = $response->get_error_message();
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($message);
 				}
 
-				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),
 				);
 			} else {
 				$order->payment_complete();
 			}
-		} 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());
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
 			return array(
 				'result'   => 'fail',

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

Spacing +74 added lines, -74 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,8 +57,8 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_alipay';
-		$this->method_title         = __( 'Stripe Alipay', 'woocommerce-gateway-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->method_title         = __('Stripe Alipay', 'woocommerce-gateway-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'));
 
 		// Load the form fields.
 		$this->init_form_fields();
@@ -66,24 +66,24 @@ 
 		// 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( '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('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -95,13 +95,13 @@ 
 	public function check_environment() {
 		$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>';
 		}
 	}
@@ -126,7 +126,7 @@ 
 			'SGD' !== get_woocommerce_currency() &&
 			'USD' !== get_woocommerce_currency()
 		) {
-			$message = __( 'Alipay is enabled - it requires store currency to be set to USD, EUR, AUD, CAD, GBP, HKD, JPY, NZD or SGD.', 'woocommerce-gateway-stripe' );
+			$message = __('Alipay is enabled - it requires store currency to be set to USD, EUR, AUD, CAD, GBP, HKD, JPY, NZD or SGD.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -142,9 +142,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'alipay' => '<i class="stripe-pf stripe-pf-alipay stripe-pf-right" alt="Alipay" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 
 		$icons_str .= $icons['alipay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -172,19 +172,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;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
+		wp_enqueue_style('stripe_paymentfonts');
 
-		if ( apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ) {
-			wp_enqueue_script( 'stripev3' );
-			wp_enqueue_script( 'woocommerce_stripe_elements' );
+		if (apply_filters('wc_stripe_use_elements_checkout_form', true)) {
+			wp_enqueue_script('stripev3');
+			wp_enqueue_script('woocommerce_stripe_elements');
 		} else {
-			wp_enqueue_script( 'woocommerce_stripe' );
+			wp_enqueue_script('woocommerce_stripe');
 		}
 	}
 
@@ -192,7 +192,7 @@ 
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php');
 	}
 
 	/**
@@ -203,25 +203,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-alipay-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>';
@@ -235,26 +235,26 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
-		$currency              = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->get_order_currency() : $order->get_currency();
-		$order_id              = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id();
+	public function create_source($order) {
+		$currency              = version_compare(WC_VERSION, '3.0.0', '<') ? $order->get_order_currency() : $order->get_currency();
+		$order_id              = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id();
 		$stripe_session_id     = uniqid();
 		
 		// Set the stripe session id in order meta to later match it for security purposes.
-		update_post_meta( $order_id, '_stripe_session_id', $stripe_session_id );
-		$return_url            = $this->get_stripe_return_url( $order, $stripe_session_id );
+		update_post_meta($order_id, '_stripe_session_id', $stripe_session_id);
+		$return_url = $this->get_stripe_return_url($order, $stripe_session_id);
 
 		$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']           = 'alipay';
-		$post_data['owner']          = $this->get_owner_details( $order );
-		$post_data['redirect']       = array( 'return_url' => $return_url );
-		$post_data['alipay']         = array( 'statement_descriptor' => $this->statement_descriptor );
+		$post_data['owner']          = $this->get_owner_details($order);
+		$post_data['redirect']       = array('return_url' => $return_url);
+		$post_data['alipay']         = array('statement_descriptor' => $this->statement_descriptor);
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Alipay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Alipay source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -268,45 +268,45 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_customer = false ) {
+	public function process_payment($order_id, $retry = true, $force_customer = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
-					throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe_Helper::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
+					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe_Helper::get_minimum_amount() / 100)));
 				}
 
-				$response = $this->create_source( $order );
+				$response = $this->create_source($order);
 
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					$message = $response->get_error_message();
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($message);
 				}
 
-				WC_Stripe_Logger::log( 'Info: Redirecting to Alipay...' );
+				WC_Stripe_Logger::log('Info: Redirecting to Alipay...');
 
 				return array(
 					'result'   => 'success',
-					'redirect' => esc_url_raw( $response->redirect->url ),
+					'redirect' => esc_url_raw($response->redirect->url),
 				);
 			} else {
 				$order->payment_complete();
 			}
-		} 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());
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
 			return array(
 				'result'   => 'fail',

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

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,8 +57,8 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sepa';
-		$this->method_title         = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-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->method_title         = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-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'));
 
 		// Load the form fields.
 		$this->init_form_fields();
@@ -66,27 +66,27 @@ 
 		// 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'] : '';
-
-			$this->description .= ' ' . __( 'TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe' );
-			$this->description  = trim( $this->description );
+		$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'] : '';
+
+			$this->description .= ' ' . __('TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe');
+			$this->description  = trim($this->description);
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		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('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,13 +98,13 @@ 
 	public function check_environment() {
 		$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>';
 		}
 	}
@@ -117,8 +117,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && 'EUR' !== get_woocommerce_currency() ) {
-			$message = __( 'SEPA is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && 'EUR' !== get_woocommerce_currency()) {
+			$message = __('SEPA is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -134,9 +134,9 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'sepa' => '<i class="stripe-pf stripe-pf-sepa stripe-pf-right" alt="SEPA" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -153,7 +153,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);
 	}
 
 	/**
@@ -164,19 +164,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;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
+		wp_enqueue_style('stripe_paymentfonts');
 
-		if ( apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ) {
-			wp_enqueue_script( 'stripev3' );
-			wp_enqueue_script( 'woocommerce_stripe_elements' );
+		if (apply_filters('wc_stripe_use_elements_checkout_form', true)) {
+			wp_enqueue_script('stripev3');
+			wp_enqueue_script('woocommerce_stripe_elements');
 		} else {
-			wp_enqueue_script( 'woocommerce_stripe' );
+			wp_enqueue_script('woocommerce_stripe');
 		}
 	}
 
@@ -184,7 +184,7 @@ 
 	 * 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');
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 * @return string
 	 */
 	public function mandate_display() {
-		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' ), $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'), $this->statement_descriptor);
 	}
 
 	/**
@@ -206,18 +206,18 @@ 
 	 */
 	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); ?>
 			<?php $this->mandate_display(); ?>
 			<p class="form-row form-row-wide validate-required">
 				<label for="stripe-sepa-iban">
-					<?php esc_html_e( 'IBAN.', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('IBAN.', 'woocommerce-gateway-stripe'); ?>
 				</label>
 				<input id="stripe-sepa-iban" name="stripe_sepa_iban" value="" />
 			</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
@@ -231,25 +231,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-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 ) {
-			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();
@@ -268,66 +268,66 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_customer = false ) {
+	public function process_payment($order_id, $retry = true, $force_customer = false) {
 		try {
-			$order = wc_get_order( $order_id );
-			$source_object = ! empty( $_POST['stripe_source_object'] ) ? json_decode( stripslashes( $_POST['stripe_source_object'] ) ) : false;
+			$order = wc_get_order($order_id);
+			$source_object = ! empty($_POST['stripe_source_object']) ? json_decode(stripslashes($_POST['stripe_source_object'])) : false;
 
-			$source = $this->get_source( get_current_user_id(), $force_customer );
+			$source = $this->get_source(get_current_user_id(), $force_customer);
 
-			if ( empty( $source->source ) && empty( $source->customer ) ) {
-				$error_msg = __( 'Please enter your card details to make a payment.', 'woocommerce-gateway-stripe' );
-				$error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe' );
-				throw new Exception( $error_msg );
+			if (empty($source->source) && empty($source->customer)) {
+				$error_msg = __('Please enter your card details to make a payment.', 'woocommerce-gateway-stripe');
+				$error_msg .= ' ' . __('Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe');
+				throw new Exception($error_msg);
 			}
 
 			// Store source to order meta.
-			$this->save_source( $order, $source );
+			$this->save_source($order, $source);
 
 			// Result from Stripe API request.
 			$response = null;
 
 			// Handle payment.
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 
-				if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
-					throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe_Helper::get_minimum_amount() / 100 ) ) );
+				if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
+					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe_Helper::get_minimum_amount() / 100)));
 				}
 
-				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, $source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
 
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( 'customer' === $response->get_error_code() && $retry ) {
-						delete_user_meta( get_current_user_id(), '_stripe_customer_id' );
-						return $this->process_payment( $order_id, false, $force_customer );
-					} elseif ( preg_match( '/No such customer/i', $response->get_error_message() ) && $retry ) {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
+					if ('customer' === $response->get_error_code() && $retry) {
+						delete_user_meta(get_current_user_id(), '_stripe_customer_id');
+						return $this->process_payment($order_id, false, $force_customer);
+					} elseif (preg_match('/No such customer/i', $response->get_error_message()) && $retry) {
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
 
-						return $this->process_redirect_payment( $order_id, false, $source );
+						return $this->process_redirect_payment($order_id, false, $source);
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					} elseif ( 'source' === $response->get_error_code() && $source->token_id ) {
-						$token = WC_Payment_Tokens::get( $source->token_id );
+					} elseif ('source' === $response->get_error_code() && $source->token_id) {
+						$token = WC_Payment_Tokens::get($source->token_id);
 						$token->delete();
-						$message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $message );
-						throw new Exception( $message );
+						$message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($message);
+						throw new Exception($message);
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					$message = isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message();
+					$message = isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message();
 
-					$order->add_order_note( $message );
+					$order->add_order_note($message);
 
-					throw new Exception( $message );
+					throw new Exception($message);
 				}
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -335,23 +335,23 @@ 
 			// Remove cart.
 			WC()->cart->empty_cart();
 
-			do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
 			return array(
 				'result'   => 'fail',