woocommerce / woocommerce-gateway-stripe

woocommerce-gateway-stripe.php

Spacing +83 added lines, -83 removed lines

@@ -15,20 +15,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', '4.1.0' );
-	define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-	define( 'WC_STRIPE_MIN_WC_VER', '2.6.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', '4.1.0');
+	define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+	define('WC_STRIPE_MIN_WC_VER', '2.6.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 {
 
@@ -48,7 +48,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;
@@ -75,8 +75,8 @@ 
 		 * *Singleton* via the `new` operator from outside of this class.
 		 */
 		private function __construct() {
-			add_action( 'admin_init', array( $this, 'install' ) );
-			add_action( 'plugins_loaded', array( $this, 'init' ) );
+			add_action('admin_init', array($this, 'install'));
+			add_action('plugins_loaded', array($this, 'init'));
 		}
 
 		/**
@@ -86,51 +86,51 @@ 
 		 * @version 4.0.0
 		 */
 		public function init() {
-			if ( function_exists( 'is_woocommerce_active' ) && ! is_woocommerce_active() ) {
-				add_action( 'admin_notices', array( $this, 'woocommerce_missing_notice' ) );
+			if (function_exists('is_woocommerce_active') && ! is_woocommerce_active()) {
+				add_action('admin_notices', array($this, 'woocommerce_missing_notice'));
 				return;
 			}
 
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php' );
-			include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' );
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-exception.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-logger.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-helper.php');
+			include_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php');
 
-			load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+			load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-			require_once( dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php' );
-			require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.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-eps.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-p24.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/payment-methods/class-wc-gateway-stripe-multibanco.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.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/abstracts/abstract-wc-stripe-payment-gateway.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php');
+			require_once(dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.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-eps.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-p24.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/payment-methods/class-wc-gateway-stripe-multibanco.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.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');
 
-			if ( is_admin() ) {
-				require_once( dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php' );
+			if (is_admin()) {
+				require_once(dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php');
 			}
 
 			// REMOVE IN THE FUTURE.
-			require_once( dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php' );
+			require_once(dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php');
 
-			add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
-			add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-			add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+			add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+			add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+			add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 		}
 
 		/**
@@ -140,7 +140,7 @@ 
 		 * @return string
 		 */
 		public function woocommerce_missing_notice() {
-			echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+			echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 		}
 
 		/**
@@ -150,8 +150,8 @@ 
 		 * @version 4.0.0
 		 */
 		public 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);
 		}
 
 		/**
@@ -161,15 +161,15 @@ 
 		 * @version 3.1.0
 		 */
 		public function install() {
-			if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+			if ( ! is_plugin_active(plugin_basename(__FILE__))) {
 				return;
 			}
 
-			if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
-				do_action( 'woocommerce_stripe_updated' );
+			if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
+				do_action('woocommerce_stripe_updated');
 
-				if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-					define( 'WC_STRIPE_INSTALLING', true );
+				if ( ! defined('WC_STRIPE_INSTALLING')) {
+					define('WC_STRIPE_INSTALLING', true);
 				}
 
 				$this->update_plugin_version();
@@ -182,13 +182,13 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function plugin_action_links( $links ) {
+		public function plugin_action_links($links) {
 			$plugin_links = array(
-				'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://woocommerce.com/contact-us/">' . esc_html__( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+				'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__('Docs', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://woocommerce.com/contact-us/">' . esc_html__('Support', 'woocommerce-gateway-stripe') . '</a>',
 			);
-			return array_merge( $plugin_links, $links );
+			return array_merge($plugin_links, $links);
 		}
 
 		/**
@@ -197,8 +197,8 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function add_gateways( $methods ) {
-			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+		public function add_gateways($methods) {
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 				$methods[] = 'WC_Stripe_Subs_Compat';
 				$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
 			} else {
@@ -225,30 +225,30 @@ 
 		 * @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_eps'] );
-			unset( $sections['stripe_ideal'] );
-			unset( $sections['stripe_p24'] );
-			unset( $sections['stripe_alipay'] );
-			unset( $sections['stripe_sepa'] );
-			unset( $sections['stripe_bitcoin'] );
-			unset( $sections['stripe_multibanco'] );
+		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_eps']);
+			unset($sections['stripe_ideal']);
+			unset($sections['stripe_p24']);
+			unset($sections['stripe_alipay']);
+			unset($sections['stripe_sepa']);
+			unset($sections['stripe_bitcoin']);
+			unset($sections['stripe_multibanco']);
 
 			$sections['stripe']            = 'Stripe';
-			$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
-			$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
-			$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
-			$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
-			$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
-			$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
-			$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
-			$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
-			$sections['stripe_bitcoin']    = __( 'Stripe Bitcoin', 'woocommerce-gateway-stripe' );
-			$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+			$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
+			$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
+			$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
+			$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
+			$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
+			$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
+			$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
+			$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
+			$sections['stripe_bitcoin']    = __('Stripe Bitcoin', 'woocommerce-gateway-stripe');
+			$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 
 			return $sections;
 		}

includes/class-wc-stripe-logger.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,28 +20,28 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public static function log( $message, $start_time = null, $end_time = null ) {
-		if ( ! class_exists( 'WC_Logger' ) ) {
+	public static function log($message, $start_time = null, $end_time = null) {
+		if ( ! class_exists('WC_Logger')) {
 			return;
 		}
 
-		if ( apply_filters( 'wc_stripe_logging', true, $message ) ) {
-			if ( empty( self::$logger ) ) {
+		if (apply_filters('wc_stripe_logging', true, $message)) {
+			if (empty(self::$logger)) {
 				self::$logger = new WC_Logger();
 			}
 
-			$settings = get_option( 'woocommerce_stripe_settings' );
+			$settings = get_option('woocommerce_stripe_settings');
 
-			if ( empty( $settings ) || isset( $settings['logging'] ) && 'yes' !== $settings['logging'] ) {
+			if (empty($settings) || isset($settings['logging']) && '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 = "\n" . '====Stripe Version: ' . WC_STRIPE_VERSION . '====' . "\n";
 				$log_entry .= '====Start Log ' . $formatted_start_time . '====' . "\n" . $message . "\n";
@@ -53,7 +53,7 @@ 
 
 			}
 
-			self::$logger->add( self::WC_LOG_FILENAME, $log_entry );
+			self::$logger->add(self::WC_LOG_FILENAME, $log_entry);
 		}
 	}
 }

includes/admin/class-wc-stripe-admin-notices.php

Spacing +80 added lines, -80 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,8 +21,8 @@ 
 	 * @since 4.1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('wp_loaded', array($this, 'hide_notices'));
 	}
 
 	/**
@@ -31,8 +31,8 @@ 
 	 * @since 1.0.0
 	 * @version 4.0.0
 	 */
-	public function add_admin_notice( $slug, $class, $message, $dismissible = false ) {
-		$this->notices[ $slug ] = array(
+	public function add_admin_notice($slug, $class, $message, $dismissible = false) {
+		$this->notices[$slug] = array(
 			'class'       => $class,
 			'message'     => $message,
 			'dismissible' => $dismissible,
@@ -46,7 +46,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function admin_notices() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
@@ -56,17 +56,17 @@ 
 		// All other payment methods.
 		$this->payment_methods_check_environment();
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo '<div class="' . esc_attr( $notice['class'] ) . '" style="position:relative;">';
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo '<div class="' . esc_attr($notice['class']) . '" style="position:relative;">';
 
-			if ( $notice['dismissible'] ) {
+			if ($notice['dismissible']) {
 			?>
-				<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-stripe-hide-notice', $notice_key ), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce' ) ); ?>" class="woocommerce-message-close notice-dismiss" style="position:absolute;right:1px;padding:9px;text-decoration:none;"></a>
+				<a href="<?php echo esc_url(wp_nonce_url(add_query_arg('wc-stripe-hide-notice', $notice_key), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce')); ?>" class="woocommerce-message-close notice-dismiss" style="position:absolute;right:1px;padding:9px;text-decoration:none;"></a>
 			<?php
 			}
 
 			echo '<p>';
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -100,85 +100,85 @@ 
 	 * @version 4.0.0
 	 */
 	public function stripe_check_environment() {
-		$show_ssl_notice    = get_option( 'wc_stripe_show_ssl_notice' );
-		$show_keys_notice   = get_option( 'wc_stripe_show_keys_notice' );
-		$show_phpver_notice = get_option( 'wc_stripe_show_phpver_notice' );
-		$show_wcver_notice  = get_option( 'wc_stripe_show_wcver_notice' );
-		$show_curl_notice   = get_option( 'wc_stripe_show_curl_notice' );
-		$options            = get_option( 'woocommerce_stripe_settings' );
-		$testmode           = ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) ? true : false;
-		$test_pub_key       = isset( $options['test_publishable_key'] ) ? $options['test_publishable_key'] : '';
-		$test_secret_key    = isset( $options['test_secret_key'] ) ? $options['test_secret_key'] : '';
-		$live_pub_key       = isset( $options['publishable_key'] ) ? $options['publishable_key'] : '';
-		$live_secret_key    = isset( $options['secret_key'] ) ? $options['secret_key'] : '';
-
-		if ( isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
-			if ( empty( $show_phpver_notice ) ) {
-				if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
+		$show_ssl_notice    = get_option('wc_stripe_show_ssl_notice');
+		$show_keys_notice   = get_option('wc_stripe_show_keys_notice');
+		$show_phpver_notice = get_option('wc_stripe_show_phpver_notice');
+		$show_wcver_notice  = get_option('wc_stripe_show_wcver_notice');
+		$show_curl_notice   = get_option('wc_stripe_show_curl_notice');
+		$options            = get_option('woocommerce_stripe_settings');
+		$testmode           = (isset($options['testmode']) && 'yes' === $options['testmode']) ? true : false;
+		$test_pub_key       = isset($options['test_publishable_key']) ? $options['test_publishable_key'] : '';
+		$test_secret_key    = isset($options['test_secret_key']) ? $options['test_secret_key'] : '';
+		$live_pub_key       = isset($options['publishable_key']) ? $options['publishable_key'] : '';
+		$live_secret_key    = isset($options['secret_key']) ? $options['secret_key'] : '';
+
+		if (isset($options['enabled']) && 'yes' === $options['enabled']) {
+			if (empty($show_phpver_notice)) {
+				if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) {
 					/* translators: 1) int version 2) int version */
-					$message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+					$message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-					$this->add_admin_notice( 'phpver', 'error', sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() ), true );
+					$this->add_admin_notice('phpver', 'error', sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion()), true);
 
 					return;
 				}
 			}
 
-			if ( empty( $show_wcver_notice ) ) {
-				if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
+			if (empty($show_wcver_notice)) {
+				if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
 					/* translators: 1) int version 2) int version */
-					$message = __( 'WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+					$message = __('WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-					$this->add_admin_notice( 'wcver', 'notice notice-warning', sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION ), true );
+					$this->add_admin_notice('wcver', 'notice notice-warning', sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION), true);
 
 					return;
 				}
 			}
 
-			if ( empty( $show_curl_notice ) ) {
-				if ( ! function_exists( 'curl_init' ) ) {
-					$this->add_admin_notice( 'curl', 'notice notice-warning', __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' ), true );
+			if (empty($show_curl_notice)) {
+				if ( ! function_exists('curl_init')) {
+					$this->add_admin_notice('curl', 'notice notice-warning', __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe'), true);
 				}
 			}
 
-			if ( empty( $show_keys_notice ) ) {
+			if (empty($show_keys_notice)) {
 				$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();
 					/* translators: 1) link */
-					$this->add_admin_notice( 'keys', '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 ), true );
+					$this->add_admin_notice('keys', '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), true);
 				}
 
 				// Check if keys are entered properly per live/test mode.
-				if ( $testmode ) {
+				if ($testmode) {
 					if (
-						! empty( $test_pub_key ) && ! preg_match( '/^pk_test_/', $test_pub_key )
-						|| ( ! empty( $test_secret_key ) && ! preg_match( '/^sk_test_/', $test_secret_key )
-						&& ! empty( $test_secret_key ) && ! preg_match( '/^rk_test_/', $test_secret_key ) ) )
+						! empty($test_pub_key) && ! preg_match('/^pk_test_/', $test_pub_key)
+						|| ( ! empty($test_secret_key) && ! preg_match('/^sk_test_/', $test_secret_key)
+						&& ! empty($test_secret_key) && ! preg_match('/^rk_test_/', $test_secret_key)) )
 					{
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				} else {
 					if (
-						! empty( $live_pub_key ) && ! preg_match( '/^pk_live_/', $live_pub_key )
-						|| ( ! empty( $live_secret_key ) && ! preg_match( '/^sk_live_/', $live_secret_key )
-						&& ! empty( $live_secret_key ) && ! preg_match( '/^rk_live_/', $live_secret_key ) ) )
+						! empty($live_pub_key) && ! preg_match('/^pk_live_/', $live_pub_key)
+						|| ( ! empty($live_secret_key) && ! preg_match('/^sk_live_/', $live_secret_key)
+						&& ! empty($live_secret_key) && ! preg_match('/^rk_live_/', $live_secret_key)) )
 					{
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				}
 			}
 
-			if ( empty( $show_ssl_notice ) ) {
+			if (empty($show_ssl_notice)) {
 				// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected.
-				if ( ( function_exists( 'wc_site_is_https' ) && ! wc_site_is_https() ) && ( 'no' === get_option( 'woocommerce_force_ssl_checkout' ) && ! class_exists( 'WordPressHTTPS' ) ) ) {
+				if ((function_exists('wc_site_is_https') && ! wc_site_is_https()) && ('no' === get_option('woocommerce_force_ssl_checkout') && ! class_exists('WordPressHTTPS'))) {
 					/* translators: 1) link 2) link */
-					$this->add_admin_notice( 'ssl', 'notice notice-warning', sprintf( __( 'Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ), true );
+					$this->add_admin_notice('ssl', 'notice notice-warning', sprintf(__('Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security'), true);
 				}
 			}
 		}
@@ -192,16 +192,16 @@ 
 	public function payment_methods_check_environment() {
 		$payment_methods = $this->get_payment_methods();
 
-		foreach ( $payment_methods as $method => $class ) {
-			$show_notice = get_option( 'wc_stripe_show_' . strtolower( $method ) . '_notice' );
+		foreach ($payment_methods as $method => $class) {
+			$show_notice = get_option('wc_stripe_show_' . strtolower($method) . '_notice');
 			$gateway     = new $class();
 
-			if ( 'yes' !== $gateway->enabled || 'no' === $show_notice ) {
+			if ('yes' !== $gateway->enabled || 'no' === $show_notice) {
 				continue;
 			}
 
-			if ( ! in_array( get_woocommerce_currency(), $gateway->get_supported_currency() ) ) {
-				$this->add_admin_notice( $method, 'notice notice-error', sprintf( __( '%s is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe' ), $method, implode( ', ', $gateway->get_supported_currency() ) ), true );
+			if ( ! in_array(get_woocommerce_currency(), $gateway->get_supported_currency())) {
+				$this->add_admin_notice($method, 'notice notice-error', sprintf(__('%s is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe'), $method, implode(', ', $gateway->get_supported_currency())), true);
 			}
 		}
 	}
@@ -213,62 +213,62 @@ 
 	 * @version 4.0.0
 	 */
 	public function hide_notices() {
-		if ( isset( $_GET['wc-stripe-hide-notice'] ) && isset( $_GET['_wc_stripe_notice_nonce'] ) ) {
-			if ( ! wp_verify_nonce( $_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce' ) ) {
-				wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe' ) );
+		if (isset($_GET['wc-stripe-hide-notice']) && isset($_GET['_wc_stripe_notice_nonce'])) {
+			if ( ! wp_verify_nonce($_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce')) {
+				wp_die(__('Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe'));
 			}
 
-			if ( ! current_user_can( 'manage_woocommerce' ) ) {
-				wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+			if ( ! current_user_can('manage_woocommerce')) {
+				wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 			}
 
-			$notice = wc_clean( $_GET['wc-stripe-hide-notice'] );
+			$notice = wc_clean($_GET['wc-stripe-hide-notice']);
 
-			switch ( $notice ) {
+			switch ($notice) {
 				case 'phpver':
-					update_option( 'wc_stripe_show_phpver_notice', 'no' );
+					update_option('wc_stripe_show_phpver_notice', 'no');
 					break;
 				case 'wcver':
-					update_option( 'wc_stripe_show_wcver_notice', 'no' );
+					update_option('wc_stripe_show_wcver_notice', 'no');
 					break;
 				case 'curl':
-					update_option( 'wc_stripe_show_curl_notice', 'no' );
+					update_option('wc_stripe_show_curl_notice', 'no');
 					break;
 				case 'ssl':
-					update_option( 'wc_stripe_show_ssl_notice', 'no' );
+					update_option('wc_stripe_show_ssl_notice', 'no');
 					break;
 				case 'keys':
-					update_option( 'wc_stripe_show_keys_notice', 'no' );
+					update_option('wc_stripe_show_keys_notice', 'no');
 					break;
 				case 'Alipay':
-					update_option( 'wc_stripe_show_alipay_notice', 'no' );
+					update_option('wc_stripe_show_alipay_notice', 'no');
 					break;
 				case 'Bancontact':
-					update_option( 'wc_stripe_show_bancontact_notice', 'no' );
+					update_option('wc_stripe_show_bancontact_notice', 'no');
 					break;
 				case 'Bitcoin':
-					update_option( 'wc_stripe_show_bitcoin_notice', 'no' );
+					update_option('wc_stripe_show_bitcoin_notice', 'no');
 					break;
 				case 'EPS':
-					update_option( 'wc_stripe_show_eps_notice', 'no' );
+					update_option('wc_stripe_show_eps_notice', 'no');
 					break;
 				case 'Giropay':
-					update_option( 'wc_stripe_show_giropay_notice', 'no' );
+					update_option('wc_stripe_show_giropay_notice', 'no');
 					break;
 				case 'iDeal':
-					update_option( 'wc_stripe_show_ideal_notice', 'no' );
+					update_option('wc_stripe_show_ideal_notice', 'no');
 					break;
 				case 'Multibanco':
-					update_option( 'wc_stripe_show_multibanco_notice', 'no' );
+					update_option('wc_stripe_show_multibanco_notice', 'no');
 					break;
 				case 'P24':
-					update_option( 'wc_stripe_show_p24_notice', 'no' );
+					update_option('wc_stripe_show_p24_notice', 'no');
 					break;
 				case 'SEPA':
-					update_option( 'wc_stripe_show_sepa_notice', 'no' );
+					update_option('wc_stripe_show_sepa_notice', 'no');
 					break;
 				case 'SOFORT':
-					update_option( 'wc_stripe_show_sofort_notice', 'no' );
+					update_option('wc_stripe_show_sofort_notice', 'no');
 					break;
 			}
 		}
@@ -282,11 +282,11 @@ 
 	 * @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);
 	}
 }
 

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

Spacing +67 added lines, -67 removed lines

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

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

Spacing +66 added lines, -66 removed lines

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

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

Spacing +64 added lines, -64 removed lines

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

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

Spacing +69 added lines, -69 removed lines

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

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

Spacing +66 added lines, -66 removed lines

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

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

Spacing +98 added lines, -98 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -72,9 +72,9 @@ 
 	public function __construct() {
 		$this->retry_interval       = 1;
 		$this->id                   = 'stripe_sepa';
-		$this->method_title         = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -99,28 +99,28 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 
-		if ( WC_Stripe_Helper::is_pre_orders_exists() ) {
+		if (WC_Stripe_Helper::is_pre_orders_exists()) {
 			$this->pre_orders = new WC_Stripe_Pre_Orders_Compat();
 
-			add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this->pre_orders, 'process_pre_order_release_payment' ) );
+			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this->pre_orders, 'process_pre_order_release_payment'));
 		}
 	}
 
@@ -132,9 +132,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sepa_supported_currencies', array(
+		return apply_filters('wc_stripe_sepa_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -145,11 +145,11 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
-		if ( is_add_payment_method_page() && ! $this->saved_cards ) {
+		if (is_add_payment_method_page() && ! $this->saved_cards) {
 			return false;
 		}
 
@@ -170,7 +170,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);
 	}
 
 	/**
@@ -181,19 +181,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php');
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 */
 	public function mandate_display() {
 		/* translators: statement descriptor */
-		printf( __( 'By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe' ), WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor ) );
+		printf(__('By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe'), WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor));
 	}
 
 	/**
@@ -216,24 +216,24 @@ 
 	 */
 	public function form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<p class="wc-stripe-sepa-mandate" style="margin-bottom:40px;"><?php $this->mandate_display(); ?></p>
 			<p class="form-row form-row-wide">
 				<label for="stripe-sepa-owner">
-					<?php esc_html_e( 'IBAN Account Name.', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span>
+					<?php esc_html_e('IBAN Account Name.', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span>
 				</label>
 				<input id="stripe-sepa-owner" name="stripe_sepa_owner" value="" style="border:1px solid #ddd;margin:5px 0;padding:10px 5px;background-color:#fff;outline:0;" />
 			</p>
 			<p class="form-row form-row-wide">
 				<label for="stripe-sepa-iban">
-					<?php esc_html_e( 'IBAN Account Number.', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span>
+					<?php esc_html_e('IBAN Account Number.', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span>
 				</label>
 				<input id="stripe-sepa-iban" name="stripe_sepa_iban" value="" style="border:1px solid #ddd;margin:5px 0;padding:10px 5px;background-color:#fff;outline:0;" />
 			</p>
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -245,43 +245,43 @@ 
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
 		$total                = WC()->cart->total;
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 		$description          = $this->get_description() ? $this->get_description() : '';
 
 		// 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 ( $description ) {
-			if ( $this->testmode ) {
-				$description .= ' ' . __( 'TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe' );
-				$description  = trim( $description );
+		if ($description) {
+			if ($this->testmode) {
+				$description .= ' ' . __('TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe');
+				$description  = trim($description);
 			}
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
 		$this->form();
 
-		if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			$this->save_payment_method_checkbox();
 		}
 
@@ -299,99 +299,99 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( $this->maybe_process_pre_orders( $order_id ) ) {
-				return $this->pre_orders->process_pre_order( $order_id );
+			if ($this->maybe_process_pre_orders($order_id)) {
+				return $this->pre_orders->process_pre_order($order_id);
 			}
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( $this->is_no_such_customer_error( $response->error ) ) {
-						if ( WC_Stripe_Helper::is_pre_30() ) {
-							delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-							delete_post_meta( $order_id, '_stripe_customer_id' );
+					if ($this->is_no_such_customer_error($response->error)) {
+						if (WC_Stripe_Helper::is_pre_30()) {
+							delete_user_meta($order->customer_user, '_stripe_customer_id');
+							delete_post_meta($order_id, '_stripe_customer_id');
 						} else {
-							delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-							$order->delete_meta_data( '_stripe_customer_id' );
+							delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+							$order->delete_meta_data('_stripe_customer_id');
 							$order->save();
 						}
 					}
 
-					if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+					if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-						$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+						$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 						$wc_token->delete();
-						$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 
 					// We want to retry.
-					if ( $this->is_retryable_error( $response->error ) ) {
-						if ( $retry ) {
+					if ($this->is_retryable_error($response->error)) {
+						if ($retry) {
 							// Don't do anymore retries after this.
-							if ( 5 <= $this->retry_interval ) {
+							if (5 <= $this->retry_interval) {
 
-								return $this->process_payment( $order_id, false, $force_save_source );
+								return $this->process_payment($order_id, false, $force_save_source);
 							}
 
-							sleep( $this->retry_interval );
+							sleep($this->retry_interval);
 
 							$this->retry_interval++;
 
-							return $this->process_payment( $order_id, true, $force_save_source );
+							return $this->process_payment($order_id, true, $force_save_source);
 						} else {
-							$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					if ( 'card_error' === $response->error->type ) {
-						$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+					if ('card_error' === $response->error->type) {
+						$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 					} else {
-						$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+						$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 					}
 
-					$order->add_order_note( $localized_message );
+					$order->add_order_note($localized_message);
 
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -402,17 +402,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(