| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -12,25 +12,25 @@ discard block | ||
| 12 | 12 | * Constructor | 
| 13 | 13 | */ | 
| 14 | 14 |  	public function __construct() { | 
| 15 | - add_action( 'wp', array( $this, 'delete_card' ) ); | |
| 16 | - add_action( 'woocommerce_after_my_account', array( $this, 'output' ) ); | |
| 17 | - add_action( 'wp', array( $this, 'default_card' ) ); | |
| 15 | +		add_action('wp', array($this, 'delete_card')); | |
| 16 | +		add_action('woocommerce_after_my_account', array($this, 'output')); | |
| 17 | +		add_action('wp', array($this, 'default_card')); | |
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 | /** | 
| 21 | 21 | * Display saved cards | 
| 22 | 22 | */ | 
| 23 | 23 |  	public function output() { | 
| 24 | -		if ( ! is_user_logged_in() ) { | |
| 24 | +		if ( ! is_user_logged_in()) { | |
| 25 | 25 | return; | 
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 28 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 29 | 29 | $stripe_cards = $stripe_customer->get_cards(); | 
| 30 | 30 | $default_card = $stripe_customer->get_default_card(); | 
| 31 | 31 | |
| 32 | -		if ( $stripe_cards ) { | |
| 33 | - wc_get_template( 'saved-cards.php', array( 'cards' => $stripe_cards, 'default_card' => $default_card ), 'woocommerce-gateway-stripe/', untrailingslashit( plugin_dir_path( WC_STRIPE_MAIN_FILE ) ) . '/includes/legacy/templates/' ); | |
| 32 | +		if ($stripe_cards) { | |
| 33 | +			wc_get_template('saved-cards.php', array('cards' => $stripe_cards, 'default_card' => $default_card), 'woocommerce-gateway-stripe/', untrailingslashit(plugin_dir_path(WC_STRIPE_MAIN_FILE)) . '/includes/legacy/templates/'); | |
| 34 | 34 | } | 
| 35 | 35 | } | 
| 36 | 36 | |
| @@ -38,22 +38,22 @@ discard block | ||
| 38 | 38 | * Delete a card | 
| 39 | 39 | */ | 
| 40 | 40 |  	public function delete_card() { | 
| 41 | -		if ( ! isset( $_POST['stripe_delete_card'] ) || ! is_account_page() ) { | |
| 41 | +		if ( ! isset($_POST['stripe_delete_card']) || ! is_account_page()) { | |
| 42 | 42 | return; | 
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 45 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 46 | 46 | $stripe_customer_id = $stripe_customer->get_id(); | 
| 47 | - $delete_card = sanitize_text_field( $_POST['stripe_delete_card'] ); | |
| 47 | + $delete_card = sanitize_text_field($_POST['stripe_delete_card']); | |
| 48 | 48 | |
| 49 | -		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce( $_POST['_wpnonce'], "stripe_del_card" ) ) { | |
| 50 | - wp_die( __( 'Unable to make default card, please try again', 'woocommerce-gateway-stripe' ) ); | |
| 49 | +		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce($_POST['_wpnonce'], "stripe_del_card")) { | |
| 50 | +			wp_die(__('Unable to make default card, please try again', 'woocommerce-gateway-stripe')); | |
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | -		if ( ! $stripe_customer->delete_card( $delete_card ) ) { | |
| 54 | - wc_add_notice( __( 'Unable to delete card.', 'woocommerce-gateway-stripe' ), 'error' ); | |
| 53 | +		if ( ! $stripe_customer->delete_card($delete_card)) { | |
| 54 | +			wc_add_notice(__('Unable to delete card.', 'woocommerce-gateway-stripe'), 'error'); | |
| 55 | 55 |  		} else { | 
| 56 | - wc_add_notice( __( 'Card deleted.', 'woocommerce-gateway-stripe' ), 'success' ); | |
| 56 | +			wc_add_notice(__('Card deleted.', 'woocommerce-gateway-stripe'), 'success'); | |
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | 59 | |
| @@ -61,22 +61,22 @@ discard block | ||
| 61 | 61 | * Make a card as default method | 
| 62 | 62 | */ | 
| 63 | 63 |  	public function default_card() { | 
| 64 | -		if ( ! isset( $_POST['stripe_default_card'] ) || ! is_account_page() ) { | |
| 64 | +		if ( ! isset($_POST['stripe_default_card']) || ! is_account_page()) { | |
| 65 | 65 | return; | 
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 68 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 69 | 69 | $stripe_customer_id = $stripe_customer->get_id(); | 
| 70 | - $default_source = sanitize_text_field( $_POST['stripe_default_card'] ); | |
| 70 | + $default_source = sanitize_text_field($_POST['stripe_default_card']); | |
| 71 | 71 | |
| 72 | -		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce( $_POST['_wpnonce'], "stripe_default_card" ) ) { | |
| 73 | - wp_die( __( 'Unable to make default card, please try again', 'woocommerce-gateway-stripe' ) ); | |
| 72 | +		if ( ! is_user_logged_in() || ! $stripe_customer_id || ! wp_verify_nonce($_POST['_wpnonce'], "stripe_default_card")) { | |
| 73 | +			wp_die(__('Unable to make default card, please try again', 'woocommerce-gateway-stripe')); | |
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | -		if ( ! $stripe_customer->set_default_card( $default_source ) ) { | |
| 77 | - wc_add_notice( __( 'Unable to update default card.', 'woocommerce-gateway-stripe' ), 'error' ); | |
| 76 | +		if ( ! $stripe_customer->set_default_card($default_source)) { | |
| 77 | +			wc_add_notice(__('Unable to update default card.', 'woocommerce-gateway-stripe'), 'error'); | |
| 78 | 78 |  		} else { | 
| 79 | - wc_add_notice( __( 'Default card updated.', 'woocommerce-gateway-stripe' ), 'success' ); | |
| 79 | +			wc_add_notice(__('Default card updated.', 'woocommerce-gateway-stripe'), 'success'); | |
| 80 | 80 | } | 
| 81 | 81 | } | 
| 82 | 82 | } | 
| @@ -1,37 +1,37 @@ | ||
| 1 | -<h2 id="saved-cards" style="margin-top:40px;"><?php _e( 'Saved cards', 'woocommerce-gateway-stripe' ); ?></h2> | |
| 1 | +<h2 id="saved-cards" style="margin-top:40px;"><?php _e('Saved cards', 'woocommerce-gateway-stripe'); ?></h2> | |
| 2 | 2 | <table class="shop_table"> | 
| 3 | 3 | <thead> | 
| 4 | 4 | <tr> | 
| 5 | - <th><?php esc_html_e( 'Card', 'woocommerce-gateway-stripe' ); ?></th> | |
| 6 | - <th><?php esc_html_e( 'Expires', 'woocommerce-gateway-stripe' ); ?></th> | |
| 5 | +			<th><?php esc_html_e('Card', 'woocommerce-gateway-stripe'); ?></th> | |
| 6 | +			<th><?php esc_html_e('Expires', 'woocommerce-gateway-stripe'); ?></th> | |
| 7 | 7 | <th></th> | 
| 8 | 8 | </tr> | 
| 9 | 9 | </thead> | 
| 10 | 10 | <tbody> | 
| 11 | - <?php foreach ( $cards as $card ) : | |
| 12 | -			if ( 'card' !== $card->object ) { | |
| 11 | + <?php foreach ($cards as $card) : | |
| 12 | +			if ('card' !== $card->object) { | |
| 13 | 13 | continue; | 
| 14 | 14 | } | 
| 15 | 15 | |
| 16 | 16 | $is_default_card = $card->id === $default_card ? true : false; | 
| 17 | 17 | ?> | 
| 18 | 18 | <tr> | 
| 19 | - <td><?php printf( __( '%s card ending in %s', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4 ); ?> | |
| 20 | - <?php if ( $is_default_card ) echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' ); ?> | |
| 19 | +            <td><?php printf(__('%s card ending in %s', 'woocommerce-gateway-stripe'), $card->brand, $card->last4); ?> | |
| 20 | +            	<?php if ($is_default_card) echo '<br />' . __('(Default)', 'woocommerce-gateway-stripe'); ?> | |
| 21 | 21 | </td> | 
| 22 | - <td><?php printf( __( 'Expires %s/%s', 'woocommerce-gateway-stripe' ), $card->exp_month, $card->exp_year ); ?></td> | |
| 22 | +            <td><?php printf(__('Expires %s/%s', 'woocommerce-gateway-stripe'), $card->exp_month, $card->exp_year); ?></td> | |
| 23 | 23 | <td> | 
| 24 | 24 | <form action="" method="POST"> | 
| 25 | - <?php wp_nonce_field ( 'stripe_del_card' ); ?> | |
| 26 | - <input type="hidden" name="stripe_delete_card" value="<?php echo esc_attr( $card->id ); ?>"> | |
| 27 | - <input type="submit" class="button" value="<?php esc_attr_e( 'Delete card', 'woocommerce-gateway-stripe' ); ?>"> | |
| 25 | +                    <?php wp_nonce_field('stripe_del_card'); ?> | |
| 26 | + <input type="hidden" name="stripe_delete_card" value="<?php echo esc_attr($card->id); ?>"> | |
| 27 | +                    <input type="submit" class="button" value="<?php esc_attr_e('Delete card', 'woocommerce-gateway-stripe'); ?>"> | |
| 28 | 28 | </form> | 
| 29 | 29 | |
| 30 | -                <?php if ( ! $is_default_card ) { ?> | |
| 30 | +                <?php if ( ! $is_default_card) { ?> | |
| 31 | 31 | <form action="" method="POST" style="margin-top:10px;"> | 
| 32 | - <?php wp_nonce_field ( 'stripe_default_card' ); ?> | |
| 33 | - <input type="hidden" name="stripe_default_card" value="<?php echo esc_attr( $card->id ); ?>"> | |
| 34 | - <input type="submit" class="button" value="<?php esc_attr_e( 'Make Default', 'woocommerce-gateway-stripe' ); ?>"> | |
| 32 | +	                    <?php wp_nonce_field('stripe_default_card'); ?> | |
| 33 | + <input type="hidden" name="stripe_default_card" value="<?php echo esc_attr($card->id); ?>"> | |
| 34 | +	                    <input type="submit" class="button" value="<?php esc_attr_e('Make Default', 'woocommerce-gateway-stripe'); ?>"> | |
| 35 | 35 | </form> | 
| 36 | 36 | <?php } ?> | 
| 37 | 37 | </td> | 
| @@ -17,7 +17,10 @@ | ||
| 17 | 17 | ?> | 
| 18 | 18 | <tr> | 
| 19 | 19 | <td><?php printf( __( '%s card ending in %s', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4 ); ?> | 
| 20 | - <?php if ( $is_default_card ) echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' ); ?> | |
| 20 | +            	<?php if ( $is_default_card ) { | |
| 21 | + echo '<br />' . __( '(Default)', 'woocommerce-gateway-stripe' ); | |
| 22 | +} | |
| 23 | +?> | |
| 21 | 24 | </td> | 
| 22 | 25 | <td><?php printf( __( 'Expires %s/%s', 'woocommerce-gateway-stripe' ), $card->exp_month, $card->exp_year ); ?></td> | 
| 23 | 26 | <td> | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -15,8 +15,8 @@ discard block | ||
| 15 | 15 | */ | 
| 16 | 16 |  	public function __construct() { | 
| 17 | 17 | $this->id = 'stripe'; | 
| 18 | - $this->method_title = __( 'Stripe', 'woocommerce-gateway-stripe' ); | |
| 19 | - $this->method_description = __( 'Stripe works by adding credit card fields on the checkout and then sending the details to Stripe for verification.', 'woocommerce-gateway-stripe' ); | |
| 18 | +		$this->method_title         = __('Stripe', 'woocommerce-gateway-stripe'); | |
| 19 | +		$this->method_description   = __('Stripe works by adding credit card fields on the checkout and then sending the details to Stripe for verification.', 'woocommerce-gateway-stripe'); | |
| 20 | 20 | $this->has_fields = true; | 
| 21 | 21 | $this->view_transaction_url = 'https://dashboard.stripe.com/payments/%s'; | 
| 22 | 22 | $this->supports = array( | 
| @@ -42,35 +42,35 @@ discard block | ||
| 42 | 42 | $this->init_settings(); | 
| 43 | 43 | |
| 44 | 44 | // Get setting values. | 
| 45 | - $this->title = $this->get_option( 'title' ); | |
| 46 | - $this->description = $this->get_option( 'description' ); | |
| 47 | - $this->enabled = $this->get_option( 'enabled' ); | |
| 48 | - $this->testmode = 'yes' === $this->get_option( 'testmode' ); | |
| 49 | - $this->capture = 'yes' === $this->get_option( 'capture', 'yes' ); | |
| 50 | - $this->stripe_checkout = 'yes' === $this->get_option( 'stripe_checkout' ); | |
| 51 | - $this->stripe_checkout_locale = $this->get_option( 'stripe_checkout_locale' ); | |
| 52 | - $this->stripe_checkout_image = $this->get_option( 'stripe_checkout_image', '' ); | |
| 53 | - $this->saved_cards = 'yes' === $this->get_option( 'saved_cards' ); | |
| 54 | - $this->secret_key = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' ); | |
| 55 | - $this->publishable_key = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' ); | |
| 56 | - $this->bitcoin = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' ); | |
| 57 | - $this->logging = 'yes' === $this->get_option( 'logging' ); | |
| 58 | - | |
| 59 | -		if ( $this->stripe_checkout ) { | |
| 60 | - $this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' ); | |
| 45 | +		$this->title                  = $this->get_option('title'); | |
| 46 | +		$this->description            = $this->get_option('description'); | |
| 47 | +		$this->enabled                = $this->get_option('enabled'); | |
| 48 | +		$this->testmode               = 'yes' === $this->get_option('testmode'); | |
| 49 | +		$this->capture                = 'yes' === $this->get_option('capture', 'yes'); | |
| 50 | +		$this->stripe_checkout        = 'yes' === $this->get_option('stripe_checkout'); | |
| 51 | +		$this->stripe_checkout_locale = $this->get_option('stripe_checkout_locale'); | |
| 52 | +		$this->stripe_checkout_image  = $this->get_option('stripe_checkout_image', ''); | |
| 53 | +		$this->saved_cards            = 'yes' === $this->get_option('saved_cards'); | |
| 54 | +		$this->secret_key             = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key'); | |
| 55 | +		$this->publishable_key        = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key'); | |
| 56 | +		$this->bitcoin                = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin'); | |
| 57 | +		$this->logging                = 'yes' === $this->get_option('logging'); | |
| 58 | + | |
| 59 | +		if ($this->stripe_checkout) { | |
| 60 | +			$this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe'); | |
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | -		if ( $this->testmode ) { | |
| 64 | - $this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' ); | |
| 65 | - $this->description = trim( $this->description ); | |
| 63 | +		if ($this->testmode) { | |
| 64 | +			$this->description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing'); | |
| 65 | + $this->description = trim($this->description); | |
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | - WC_Stripe_API::set_secret_key( $this->secret_key ); | |
| 68 | + WC_Stripe_API::set_secret_key($this->secret_key); | |
| 69 | 69 | |
| 70 | 70 | // Hooks | 
| 71 | - add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) ); | |
| 72 | - add_action( 'admin_notices', array( $this, 'admin_notices' ) ); | |
| 73 | - add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) ); | |
| 71 | +		add_action('wp_enqueue_scripts', array($this, 'payment_scripts')); | |
| 72 | +		add_action('admin_notices', array($this, 'admin_notices')); | |
| 73 | +		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options')); | |
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | 76 | /** | 
| @@ -80,35 +80,35 @@ discard block | ||
| 80 | 80 | * @return string | 
| 81 | 81 | */ | 
| 82 | 82 |  	public function get_icon() { | 
| 83 | - $ext = version_compare( WC()->version, '2.6', '>=' ) ? '.svg' : '.png'; | |
| 84 | - $style = version_compare( WC()->version, '2.6', '>=' ) ? 'style="margin-left: 0.3em"' : ''; | |
| 83 | + $ext = version_compare(WC()->version, '2.6', '>=') ? '.svg' : '.png'; | |
| 84 | + $style = version_compare(WC()->version, '2.6', '>=') ? 'style="margin-left: 0.3em"' : ''; | |
| 85 | 85 | |
| 86 | - $icon = '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext ) . '" alt="Visa" width="32" ' . $style . ' />'; | |
| 87 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext ) . '" alt="Mastercard" width="32" ' . $style . ' />'; | |
| 88 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext ) . '" alt="Amex" width="32" ' . $style . ' />'; | |
| 86 | + $icon = '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext) . '" alt="Visa" width="32" ' . $style . ' />'; | |
| 87 | + $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext) . '" alt="Mastercard" width="32" ' . $style . ' />'; | |
| 88 | + $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext) . '" alt="Amex" width="32" ' . $style . ' />'; | |
| 89 | 89 | |
| 90 | -		if ( 'USD' === get_woocommerce_currency() ) { | |
| 91 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext ) . '" alt="Discover" width="32" ' . $style . ' />'; | |
| 92 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext ) . '" alt="JCB" width="32" ' . $style . ' />'; | |
| 93 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext ) . '" alt="Diners" width="32" ' . $style . ' />'; | |
| 90 | +		if ('USD' === get_woocommerce_currency()) { | |
| 91 | + $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext) . '" alt="Discover" width="32" ' . $style . ' />'; | |
| 92 | + $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext) . '" alt="JCB" width="32" ' . $style . ' />'; | |
| 93 | + $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext) . '" alt="Diners" width="32" ' . $style . ' />'; | |
| 94 | 94 | } | 
| 95 | 95 | |
| 96 | -		if ( $this->bitcoin ) { | |
| 97 | - $icon .= '<img src="' . WC_HTTPS::force_https_url( plugins_url( '/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE ) ) . '" alt="Bitcoin" width="32" ' . $style . ' />'; | |
| 96 | +		if ($this->bitcoin) { | |
| 97 | +			$icon .= '<img src="' . WC_HTTPS::force_https_url(plugins_url('/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE)) . '" alt="Bitcoin" width="32" ' . $style . ' />'; | |
| 98 | 98 | } | 
| 99 | 99 | |
| 100 | - return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id ); | |
| 100 | +		return apply_filters('woocommerce_gateway_icon', $icon, $this->id); | |
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | 103 | /** | 
| 104 | 104 | * Get Stripe amount to pay | 
| 105 | 105 | * @return float | 
| 106 | 106 | */ | 
| 107 | -	public function get_stripe_amount( $total, $currency = '' ) { | |
| 108 | -		if ( ! $currency ) { | |
| 107 | +	public function get_stripe_amount($total, $currency = '') { | |
| 108 | +		if ( ! $currency) { | |
| 109 | 109 | $currency = get_woocommerce_currency(); | 
| 110 | 110 | } | 
| 111 | -		switch ( strtoupper( $currency ) ) { | |
| 111 | +		switch (strtoupper($currency)) { | |
| 112 | 112 | // Zero decimal currencies | 
| 113 | 113 | case 'BIF' : | 
| 114 | 114 | case 'CLP' : | 
| @@ -125,10 +125,10 @@ discard block | ||
| 125 | 125 | case 'XAF' : | 
| 126 | 126 | case 'XOF' : | 
| 127 | 127 | case 'XPF' : | 
| 128 | - $total = absint( $total ); | |
| 128 | + $total = absint($total); | |
| 129 | 129 | break; | 
| 130 | 130 | default : | 
| 131 | - $total = round( $total, 2 ) * 100; // In cents | |
| 131 | + $total = round($total, 2) * 100; // In cents | |
| 132 | 132 | break; | 
| 133 | 133 | } | 
| 134 | 134 | return $total; | 
| @@ -138,31 +138,31 @@ discard block | ||
| 138 | 138 | * Check if SSL is enabled and notify the user | 
| 139 | 139 | */ | 
| 140 | 140 |  	public function admin_notices() { | 
| 141 | -		if ( $this->enabled == 'no' ) { | |
| 141 | +		if ($this->enabled == 'no') { | |
| 142 | 142 | return; | 
| 143 | 143 | } | 
| 144 | 144 | |
| 145 | - $addons = ( class_exists( 'WC_Subscriptions_Order' ) || class_exists( 'WC_Pre_Orders_Order' ) ) ? '_addons' : ''; | |
| 145 | +		$addons = (class_exists('WC_Subscriptions_Order') || class_exists('WC_Pre_Orders_Order')) ? '_addons' : ''; | |
| 146 | 146 | |
| 147 | 147 | // Check required fields | 
| 148 | -		if ( ! $this->secret_key ) { | |
| 149 | - echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Please enter your secret key <a href="%s">here</a>', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons ) ) . '</p></div>'; | |
| 148 | +		if ( ! $this->secret_key) { | |
| 149 | +			echo '<div class="error"><p>' . sprintf(__('Stripe error: Please enter your secret key <a href="%s">here</a>', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons)) . '</p></div>'; | |
| 150 | 150 | return; | 
| 151 | 151 | |
| 152 | -		} elseif ( ! $this->publishable_key ) { | |
| 153 | - echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Please enter your publishable key <a href="%s">here</a>', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons ) ) . '</p></div>'; | |
| 152 | +		} elseif ( ! $this->publishable_key) { | |
| 153 | +			echo '<div class="error"><p>' . sprintf(__('Stripe error: Please enter your publishable key <a href="%s">here</a>', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons)) . '</p></div>'; | |
| 154 | 154 | return; | 
| 155 | 155 | } | 
| 156 | 156 | |
| 157 | 157 | // Simple check for duplicate keys | 
| 158 | -		if ( $this->secret_key == $this->publishable_key ) { | |
| 159 | - echo '<div class="error"><p>' . sprintf( __( 'Stripe error: Your secret and publishable keys match. Please check and re-enter.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons ) ) . '</p></div>'; | |
| 158 | +		if ($this->secret_key == $this->publishable_key) { | |
| 159 | +			echo '<div class="error"><p>' . sprintf(__('Stripe error: Your secret and publishable keys match. Please check and re-enter.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout§ion=wc_gateway_stripe' . $addons)) . '</p></div>'; | |
| 160 | 160 | return; | 
| 161 | 161 | } | 
| 162 | 162 | |
| 163 | 163 | // Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected | 
| 164 | -		if ( ( function_exists( 'wc_site_is_https' ) && ! wc_site_is_https() ) && ( 'no' === get_option( 'woocommerce_force_ssl_checkout' ) && ! class_exists( 'WordPressHTTPS' ) ) ) { | |
| 165 | - echo '<div class="error"><p>' . sprintf( __( 'Stripe is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Stripe will only work in test mode.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) . '</p></div>'; | |
| 164 | +		if ((function_exists('wc_site_is_https') && ! wc_site_is_https()) && ('no' === get_option('woocommerce_force_ssl_checkout') && ! class_exists('WordPressHTTPS'))) { | |
| 165 | +			echo '<div class="error"><p>' . sprintf(__('Stripe is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - Stripe will only work in test mode.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout')) . '</p></div>'; | |
| 166 | 166 | } | 
| 167 | 167 | } | 
| 168 | 168 | |
| @@ -170,11 +170,11 @@ discard block | ||
| 170 | 170 | * Check if this gateway is enabled | 
| 171 | 171 | */ | 
| 172 | 172 |  	public function is_available() { | 
| 173 | -		if ( 'yes' === $this->enabled ) { | |
| 174 | -			if ( ! $this->testmode && is_checkout() && ! is_ssl() ) { | |
| 173 | +		if ('yes' === $this->enabled) { | |
| 174 | +			if ( ! $this->testmode && is_checkout() && ! is_ssl()) { | |
| 175 | 175 | return false; | 
| 176 | 176 | } | 
| 177 | -			if ( ! $this->secret_key || ! $this->publishable_key ) { | |
| 177 | +			if ( ! $this->secret_key || ! $this->publishable_key) { | |
| 178 | 178 | return false; | 
| 179 | 179 | } | 
| 180 | 180 | return true; | 
| @@ -186,9 +186,9 @@ discard block | ||
| 186 | 186 | * Initialise Gateway Settings Form Fields | 
| 187 | 187 | */ | 
| 188 | 188 |  	public function init_form_fields() { | 
| 189 | - $this->form_fields = include( untrailingslashit( plugin_dir_path( WC_STRIPE_MAIN_FILE ) ) . '/includes/settings-stripe.php' ); | |
| 189 | + $this->form_fields = include(untrailingslashit(plugin_dir_path(WC_STRIPE_MAIN_FILE)) . '/includes/settings-stripe.php'); | |
| 190 | 190 | |
| 191 | - wc_enqueue_js( " | |
| 191 | +		wc_enqueue_js(" | |
| 192 | 192 |  			jQuery( function( $ ) { | 
| 193 | 193 |  				$( '#woocommerce_stripe_stripe_checkout' ).change(function(){ | 
| 194 | 194 |  					if ( $( this ).is( ':checked' ) ) { | 
| @@ -208,25 +208,25 @@ discard block | ||
| 208 | 208 | ?> | 
| 209 | 209 | <fieldset class="stripe-legacy-payment-fields"> | 
| 210 | 210 | <?php | 
| 211 | -				if ( $this->description ) { | |
| 212 | - echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) ); | |
| 211 | +				if ($this->description) { | |
| 212 | +					echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description))); | |
| 213 | 213 | } | 
| 214 | -				if ( $this->saved_cards && is_user_logged_in() ) { | |
| 215 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 214 | +				if ($this->saved_cards && is_user_logged_in()) { | |
| 215 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 216 | 216 | ?> | 
| 217 | 217 | <p class="form-row form-row-wide"> | 
| 218 | - <a class="<?php echo apply_filters( 'wc_stripe_manage_saved_cards_class', 'button' ); ?>" style="float:right;" href="<?php echo apply_filters( 'wc_stripe_manage_saved_cards_url', get_permalink( get_option( 'woocommerce_myaccount_page_id' ) ) ); ?>#saved-cards"><?php esc_html_e( 'Manage cards', 'woocommerce-gateway-stripe' ); ?></a> | |
| 218 | +						<a class="<?php echo apply_filters('wc_stripe_manage_saved_cards_class', 'button'); ?>" style="float:right;" href="<?php echo apply_filters('wc_stripe_manage_saved_cards_url', get_permalink(get_option('woocommerce_myaccount_page_id'))); ?>#saved-cards"><?php esc_html_e('Manage cards', 'woocommerce-gateway-stripe'); ?></a> | |
| 219 | 219 | <?php | 
| 220 | -						if ( $cards = $stripe_customer->get_cards() ) { | |
| 220 | +						if ($cards = $stripe_customer->get_cards()) { | |
| 221 | 221 | $default_card = $cards[0]->id; | 
| 222 | -							foreach ( (array) $cards as $card ) { | |
| 223 | -								if ( 'card' !== $card->object ) { | |
| 222 | +							foreach ((array) $cards as $card) { | |
| 223 | +								if ('card' !== $card->object) { | |
| 224 | 224 | continue; | 
| 225 | 225 | } | 
| 226 | 226 | ?> | 
| 227 | - <label for="stripe_card_<?php echo $card->id; ?>" class="brand-<?php echo esc_attr( strtolower( $card->brand ) ); ?>"> | |
| 228 | - <input type="radio" id="stripe_card_<?php echo $card->id; ?>" name="wc-stripe-payment-token" value="<?php echo $card->id; ?>" <?php checked( $default_card, $card->id ) ?> /> | |
| 229 | - <?php printf( __( '%s card ending in %s (Expires %s/%s)', 'woocommerce-gateway-stripe' ), $card->brand, $card->last4, $card->exp_month, $card->exp_year ); ?> | |
| 227 | + <label for="stripe_card_<?php echo $card->id; ?>" class="brand-<?php echo esc_attr(strtolower($card->brand)); ?>"> | |
| 228 | + <input type="radio" id="stripe_card_<?php echo $card->id; ?>" name="wc-stripe-payment-token" value="<?php echo $card->id; ?>" <?php checked($default_card, $card->id) ?> /> | |
| 229 | +									<?php printf(__('%s card ending in %s (Expires %s/%s)', 'woocommerce-gateway-stripe'), $card->brand, $card->last4, $card->exp_month, $card->exp_year); ?> | |
| 230 | 230 | </label> | 
| 231 | 231 | <?php | 
| 232 | 232 | } | 
| @@ -234,7 +234,7 @@ discard block | ||
| 234 | 234 | ?> | 
| 235 | 235 | <label for="new"> | 
| 236 | 236 | <input type="radio" id="new" name="wc-stripe-payment-token" value="new" /> | 
| 237 | - <?php _e( 'Use a new credit card', 'woocommerce-gateway-stripe' ); ?> | |
| 237 | +							<?php _e('Use a new credit card', 'woocommerce-gateway-stripe'); ?> | |
| 238 | 238 | </label> | 
| 239 | 239 | </p> | 
| 240 | 240 | <?php | 
| @@ -242,8 +242,8 @@ discard block | ||
| 242 | 242 | |
| 243 | 243 | $user = wp_get_current_user(); | 
| 244 | 244 | |
| 245 | -				if ( $user ) { | |
| 246 | - $user_email = get_user_meta( $user->ID, 'billing_email', true ); | |
| 245 | +				if ($user) { | |
| 246 | + $user_email = get_user_meta($user->ID, 'billing_email', true); | |
| 247 | 247 | $user_email = $user_email ? $user_email : $user->user_email; | 
| 248 | 248 |  				} else { | 
| 249 | 249 | $user_email = ''; | 
| @@ -251,22 +251,22 @@ discard block | ||
| 251 | 251 | |
| 252 | 252 | $display = ''; | 
| 253 | 253 | |
| 254 | -				if ( $this->stripe_checkout || $this->saved_cards && ! empty( $cards ) ) { | |
| 254 | +				if ($this->stripe_checkout || $this->saved_cards && ! empty($cards)) { | |
| 255 | 255 | $display = 'style="display:none;"'; | 
| 256 | 256 | } | 
| 257 | 257 | |
| 258 | 258 | echo '<div ' . $display . ' id="stripe-payment-data" | 
| 259 | 259 | data-description="" | 
| 260 | - data-email="' . esc_attr( $user_email ) . '" | |
| 261 | - data-amount="' . esc_attr( $this->get_stripe_amount( WC()->cart->total ) ) . '" | |
| 262 | - data-name="' . esc_attr( get_bloginfo( 'name', 'display' ) ) . '" | |
| 263 | - data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '" | |
| 264 | - data-image="' . esc_attr( $this->stripe_checkout_image ) . '" | |
| 265 | - data-bitcoin="' . esc_attr( $this->bitcoin ? 'true' : 'false' ) . '" | |
| 266 | - data-locale="' . esc_attr( $this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en' ) . '">'; | |
| 267 | - | |
| 268 | -				if ( ! $this->stripe_checkout ) { | |
| 269 | - $this->credit_card_form( array( 'fields_have_names' => false ) ); | |
| 260 | + data-email="' . esc_attr($user_email) . '" | |
| 261 | + data-amount="' . esc_attr($this->get_stripe_amount(WC()->cart->total)) . '" | |
| 262 | +					data-name="' . esc_attr(get_bloginfo('name', 'display')) . '" | |
| 263 | + data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '" | |
| 264 | + data-image="' . esc_attr($this->stripe_checkout_image) . '" | |
| 265 | + data-bitcoin="' . esc_attr($this->bitcoin ? 'true' : 'false') . '" | |
| 266 | + data-locale="' . esc_attr($this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en') . '">'; | |
| 267 | + | |
| 268 | +				if ( ! $this->stripe_checkout) { | |
| 269 | +					$this->credit_card_form(array('fields_have_names' => false)); | |
| 270 | 270 | } | 
| 271 | 271 | |
| 272 | 272 | echo '</div>'; | 
| @@ -283,27 +283,27 @@ discard block | ||
| 283 | 283 | * @access public | 
| 284 | 284 | */ | 
| 285 | 285 |  	public function payment_scripts() { | 
| 286 | -		if ( $this->stripe_checkout ) { | |
| 287 | - wp_enqueue_script( 'stripe', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true ); | |
| 288 | - wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe_checkout.js', WC_STRIPE_MAIN_FILE ), array( 'stripe' ), WC_STRIPE_VERSION, true ); | |
| 286 | +		if ($this->stripe_checkout) { | |
| 287 | +			wp_enqueue_script('stripe', 'https://checkout.stripe.com/v2/checkout.js', '', '2.0', true); | |
| 288 | +			wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe_checkout.js', WC_STRIPE_MAIN_FILE), array('stripe'), WC_STRIPE_VERSION, true); | |
| 289 | 289 |  		} else { | 
| 290 | - wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '1.0', true ); | |
| 291 | - wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripe' ), WC_STRIPE_VERSION, true ); | |
| 290 | +			wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '1.0', true); | |
| 291 | +			wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripe'), WC_STRIPE_VERSION, true); | |
| 292 | 292 | } | 
| 293 | 293 | |
| 294 | 294 | $stripe_params = array( | 
| 295 | 295 | 'key' => $this->publishable_key, | 
| 296 | - 'i18n_terms' => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ), | |
| 297 | - 'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ), | |
| 296 | +			'i18n_terms'           => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'), | |
| 297 | +			'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'), | |
| 298 | 298 | ); | 
| 299 | 299 | |
| 300 | 300 | // If we're on the pay page we need to pass stripe.js the address of the order. | 
| 301 | -		if ( is_checkout_pay_page() && isset( $_GET['order'] ) && isset( $_GET['order_id'] ) ) { | |
| 302 | - $order_key = urldecode( $_GET['order'] ); | |
| 303 | - $order_id = absint( $_GET['order_id'] ); | |
| 304 | - $order = wc_get_order( $order_id ); | |
| 301 | +		if (is_checkout_pay_page() && isset($_GET['order']) && isset($_GET['order_id'])) { | |
| 302 | + $order_key = urldecode($_GET['order']); | |
| 303 | + $order_id = absint($_GET['order_id']); | |
| 304 | + $order = wc_get_order($order_id); | |
| 305 | 305 | |
| 306 | -			if ( $order->id === $order_id && $order->order_key === $order_key ) { | |
| 306 | +			if ($order->id === $order_id && $order->order_key === $order_key) { | |
| 307 | 307 | $stripe_params['billing_first_name'] = $order->billing_first_name; | 
| 308 | 308 | $stripe_params['billing_last_name'] = $order->billing_last_name; | 
| 309 | 309 | $stripe_params['billing_address_1'] = $order->billing_address_1; | 
| @@ -315,7 +315,7 @@ discard block | ||
| 315 | 315 | } | 
| 316 | 316 | } | 
| 317 | 317 | |
| 318 | - wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) ); | |
| 318 | +		wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params)); | |
| 319 | 319 | } | 
| 320 | 320 | |
| 321 | 321 | /** | 
| @@ -324,28 +324,28 @@ discard block | ||
| 324 | 324 | * @param object $source | 
| 325 | 325 | * @return array() | 
| 326 | 326 | */ | 
| 327 | -	protected function generate_payment_request( $order, $source ) { | |
| 327 | +	protected function generate_payment_request($order, $source) { | |
| 328 | 328 | $post_data = array(); | 
| 329 | - $post_data['currency'] = strtolower( $order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency() ); | |
| 330 | - $post_data['amount'] = $this->get_stripe_amount( $order->get_total(), $post_data['currency'] ); | |
| 331 | - $post_data['description'] = sprintf( __( '%s - Order %s', 'woocommerce-gateway-stripe' ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), $order->get_order_number() ); | |
| 329 | + $post_data['currency'] = strtolower($order->get_order_currency() ? $order->get_order_currency() : get_woocommerce_currency()); | |
| 330 | + $post_data['amount'] = $this->get_stripe_amount($order->get_total(), $post_data['currency']); | |
| 331 | +		$post_data['description'] = sprintf(__('%s - Order %s', 'woocommerce-gateway-stripe'), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), $order->get_order_number()); | |
| 332 | 332 | $post_data['capture'] = $this->capture ? 'true' : 'false'; | 
| 333 | 333 | |
| 334 | -		if ( ! empty( $order->billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) { | |
| 334 | +		if ( ! empty($order->billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) { | |
| 335 | 335 | $post_data['receipt_email'] = $order->billing_email; | 
| 336 | 336 | } | 
| 337 | 337 | |
| 338 | - $post_data['expand[]'] = 'balance_transaction'; | |
| 338 | + $post_data['expand[]'] = 'balance_transaction'; | |
| 339 | 339 | |
| 340 | -		if ( $source->customer ) { | |
| 340 | +		if ($source->customer) { | |
| 341 | 341 | $post_data['customer'] = $source->customer; | 
| 342 | 342 | } | 
| 343 | 343 | |
| 344 | -		if ( $source->source ) { | |
| 344 | +		if ($source->source) { | |
| 345 | 345 | $post_data['source'] = $source->source; | 
| 346 | 346 | } | 
| 347 | 347 | |
| 348 | - return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source ); | |
| 348 | +		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source); | |
| 349 | 349 | } | 
| 350 | 350 | |
| 351 | 351 | /** | 
| @@ -353,22 +353,22 @@ discard block | ||
| 353 | 353 | * @param bool $force_customer Should we force customer creation? | 
| 354 | 354 | * @return object | 
| 355 | 355 | */ | 
| 356 | -	protected function get_source( $user_id, $force_customer = false ) { | |
| 357 | - $stripe_customer = new WC_Stripe_Customer( $user_id ); | |
| 356 | +	protected function get_source($user_id, $force_customer = false) { | |
| 357 | + $stripe_customer = new WC_Stripe_Customer($user_id); | |
| 358 | 358 | $stripe_source = false; | 
| 359 | 359 | $token_id = false; | 
| 360 | 360 | |
| 361 | 361 | // New CC info was entered and we have a new token to process | 
| 362 | -		if ( isset( $_POST['stripe_token'] ) ) { | |
| 363 | - $stripe_token = wc_clean( $_POST['stripe_token'] ); | |
| 364 | - $maybe_saved_card = isset( $_POST['wc-stripe-new-payment-method'] ) && ! empty( $_POST['wc-stripe-new-payment-method'] ); | |
| 362 | +		if (isset($_POST['stripe_token'])) { | |
| 363 | + $stripe_token = wc_clean($_POST['stripe_token']); | |
| 364 | + $maybe_saved_card = isset($_POST['wc-stripe-new-payment-method']) && ! empty($_POST['wc-stripe-new-payment-method']); | |
| 365 | 365 | |
| 366 | 366 | // This is true if the user wants to store the card to their account. | 
| 367 | -			if ( ( $user_id && $this->saved_cards && $maybe_saved_card ) || $force_customer ) { | |
| 368 | - $stripe_source = $stripe_customer->add_card( $stripe_token ); | |
| 367 | +			if (($user_id && $this->saved_cards && $maybe_saved_card) || $force_customer) { | |
| 368 | + $stripe_source = $stripe_customer->add_card($stripe_token); | |
| 369 | 369 | |
| 370 | -				if ( is_wp_error( $stripe_source ) ) { | |
| 371 | - throw new Exception( $stripe_source->get_error_message() ); | |
| 370 | +				if (is_wp_error($stripe_source)) { | |
| 371 | + throw new Exception($stripe_source->get_error_message()); | |
| 372 | 372 | } | 
| 373 | 373 | |
| 374 | 374 |  			} else { | 
| @@ -379,8 +379,8 @@ discard block | ||
| 379 | 379 | } | 
| 380 | 380 | |
| 381 | 381 | // Use an existing token, and then process the payment | 
| 382 | -		elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) { | |
| 383 | - $stripe_source = wc_clean( $_POST['wc-stripe-payment-token'] ); | |
| 382 | +		elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) { | |
| 383 | + $stripe_source = wc_clean($_POST['wc-stripe-payment-token']); | |
| 384 | 384 | } | 
| 385 | 385 | |
| 386 | 386 | return (object) array( | 
| @@ -401,16 +401,16 @@ discard block | ||
| 401 | 401 | * @param object $order | 
| 402 | 402 | * @return object | 
| 403 | 403 | */ | 
| 404 | -	protected function get_order_source( $order = null ) { | |
| 404 | +	protected function get_order_source($order = null) { | |
| 405 | 405 | $stripe_customer = new WC_Stripe_Customer(); | 
| 406 | 406 | $stripe_source = false; | 
| 407 | 407 | $token_id = false; | 
| 408 | 408 | |
| 409 | -		if ( $order ) { | |
| 410 | -			if ( $meta_value = get_post_meta( $order->id, '_stripe_customer_id', true ) ) { | |
| 411 | - $stripe_customer->set_id( $meta_value ); | |
| 409 | +		if ($order) { | |
| 410 | +			if ($meta_value = get_post_meta($order->id, '_stripe_customer_id', true)) { | |
| 411 | + $stripe_customer->set_id($meta_value); | |
| 412 | 412 | } | 
| 413 | -			if ( $meta_value = get_post_meta( $order->id, '_stripe_card_id', true ) ) { | |
| 413 | +			if ($meta_value = get_post_meta($order->id, '_stripe_card_id', true)) { | |
| 414 | 414 | $stripe_source = $meta_value; | 
| 415 | 415 | } | 
| 416 | 416 | } | 
| @@ -425,43 +425,43 @@ discard block | ||
| 425 | 425 | /** | 
| 426 | 426 | * Process the payment | 
| 427 | 427 | */ | 
| 428 | -	public function process_payment( $order_id, $retry = true, $force_customer = false ) { | |
| 428 | +	public function process_payment($order_id, $retry = true, $force_customer = false) { | |
| 429 | 429 |  		try { | 
| 430 | - $order = wc_get_order( $order_id ); | |
| 431 | - $source = $this->get_source( get_current_user_id(), $force_customer ); | |
| 430 | + $order = wc_get_order($order_id); | |
| 431 | + $source = $this->get_source(get_current_user_id(), $force_customer); | |
| 432 | 432 | |
| 433 | -			if ( empty( $source->source ) && empty( $source->customer ) ) { | |
| 434 | - $error_msg = __( 'Please enter your card details to make a payment.', 'woocommerce-gateway-stripe' ); | |
| 435 | - $error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe' ); | |
| 436 | - throw new Exception( $error_msg ); | |
| 433 | +			if (empty($source->source) && empty($source->customer)) { | |
| 434 | +				$error_msg = __('Please enter your card details to make a payment.', 'woocommerce-gateway-stripe'); | |
| 435 | +				$error_msg .= ' ' . __('Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe'); | |
| 436 | + throw new Exception($error_msg); | |
| 437 | 437 | } | 
| 438 | 438 | |
| 439 | 439 | // Store source to order meta | 
| 440 | - $this->save_source( $order, $source ); | |
| 440 | + $this->save_source($order, $source); | |
| 441 | 441 | |
| 442 | 442 | // Handle payment | 
| 443 | -			if ( $order->get_total() > 0 ) { | |
| 443 | +			if ($order->get_total() > 0) { | |
| 444 | 444 | |
| 445 | -				if ( $order->get_total() * 100 < WC_Stripe::get_minimum_amount() ) { | |
| 446 | - throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) ); | |
| 445 | +				if ($order->get_total() * 100 < WC_Stripe::get_minimum_amount()) { | |
| 446 | +					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100))); | |
| 447 | 447 | } | 
| 448 | 448 | |
| 449 | -				WC_Stripe::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" ); | |
| 449 | +				WC_Stripe::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}"); | |
| 450 | 450 | |
| 451 | 451 | // Make the request | 
| 452 | - $response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) ); | |
| 452 | + $response = WC_Stripe_API::request($this->generate_payment_request($order, $source)); | |
| 453 | 453 | |
| 454 | -				if ( is_wp_error( $response ) ) { | |
| 454 | +				if (is_wp_error($response)) { | |
| 455 | 455 | // Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without. | 
| 456 | -					if ( 'customer' === $response->get_error_code() && $retry ) { | |
| 457 | - delete_user_meta( get_current_user_id(), '_stripe_customer_id' ); | |
| 458 | - return $this->process_payment( $order_id, false, $force_customer ); | |
| 456 | +					if ('customer' === $response->get_error_code() && $retry) { | |
| 457 | + delete_user_meta(get_current_user_id(), '_stripe_customer_id'); | |
| 458 | + return $this->process_payment($order_id, false, $force_customer); | |
| 459 | 459 | } | 
| 460 | - throw new Exception( $response->get_error_code() . ': ' . $response->get_error_message() ); | |
| 460 | + throw new Exception($response->get_error_code() . ': ' . $response->get_error_message()); | |
| 461 | 461 | } | 
| 462 | 462 | |
| 463 | 463 | // Process valid response | 
| 464 | - $this->process_response( $response, $order ); | |
| 464 | + $this->process_response($response, $order); | |
| 465 | 465 |  			} else { | 
| 466 | 466 | $order->payment_complete(); | 
| 467 | 467 | } | 
| @@ -472,13 +472,13 @@ discard block | ||
| 472 | 472 | // Return thank you page redirect | 
| 473 | 473 | return array( | 
| 474 | 474 | 'result' => 'success', | 
| 475 | - 'redirect' => $this->get_return_url( $order ) | |
| 475 | + 'redirect' => $this->get_return_url($order) | |
| 476 | 476 | ); | 
| 477 | 477 | |
| 478 | -		} catch ( Exception $e ) { | |
| 479 | - wc_add_notice( $e->getMessage(), 'error' ); | |
| 480 | - WC()->session->set( 'refresh_totals', true ); | |
| 481 | - WC_Stripe::log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) ); | |
| 478 | +		} catch (Exception $e) { | |
| 479 | + wc_add_notice($e->getMessage(), 'error'); | |
| 480 | +			WC()->session->set('refresh_totals', true); | |
| 481 | +			WC_Stripe::log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage())); | |
| 482 | 482 | return; | 
| 483 | 483 | } | 
| 484 | 484 | } | 
| @@ -486,45 +486,45 @@ discard block | ||
| 486 | 486 | /** | 
| 487 | 487 | * Save source to order. | 
| 488 | 488 | */ | 
| 489 | -	protected function save_source( $order, $source ) { | |
| 489 | +	protected function save_source($order, $source) { | |
| 490 | 490 | // Store source in the order | 
| 491 | -		if ( $source->customer ) { | |
| 492 | - update_post_meta( $order->id, '_stripe_customer_id', $source->customer ); | |
| 491 | +		if ($source->customer) { | |
| 492 | + update_post_meta($order->id, '_stripe_customer_id', $source->customer); | |
| 493 | 493 | } | 
| 494 | -		if ( $source->source ) { | |
| 495 | - update_post_meta( $order->id, '_stripe_card_id', $source->source->id ); | |
| 494 | +		if ($source->source) { | |
| 495 | + update_post_meta($order->id, '_stripe_card_id', $source->source->id); | |
| 496 | 496 | } | 
| 497 | 497 | } | 
| 498 | 498 | |
| 499 | 499 | /** | 
| 500 | 500 | * Store extra meta data for an order from a Stripe Response. | 
| 501 | 501 | */ | 
| 502 | -	public function process_response( $response, $order ) { | |
| 503 | - WC_Stripe::log( "Processing response: " . print_r( $response, true ) ); | |
| 502 | +	public function process_response($response, $order) { | |
| 503 | +		WC_Stripe::log("Processing response: " . print_r($response, true)); | |
| 504 | 504 | |
| 505 | 505 | // Store charge data | 
| 506 | - update_post_meta( $order->id, '_stripe_charge_id', $response->id ); | |
| 507 | - update_post_meta( $order->id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no' ); | |
| 506 | + update_post_meta($order->id, '_stripe_charge_id', $response->id); | |
| 507 | + update_post_meta($order->id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no'); | |
| 508 | 508 | |
| 509 | 509 | // Store other data such as fees | 
| 510 | -		if ( isset( $response->balance_transaction ) && isset( $response->balance_transaction->fee ) ) { | |
| 511 | - $fee = number_format( $response->balance_transaction->fee / 100, 2, '.', '' ); | |
| 512 | - update_post_meta( $order->id, 'Stripe Fee', $fee ); | |
| 513 | - update_post_meta( $order->id, 'Net Revenue From Stripe', $order->get_total() - $fee ); | |
| 510 | +		if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) { | |
| 511 | + $fee = number_format($response->balance_transaction->fee / 100, 2, '.', ''); | |
| 512 | + update_post_meta($order->id, 'Stripe Fee', $fee); | |
| 513 | + update_post_meta($order->id, 'Net Revenue From Stripe', $order->get_total() - $fee); | |
| 514 | 514 | } | 
| 515 | 515 | |
| 516 | -		if ( $response->captured ) { | |
| 517 | - $order->payment_complete( $response->id ); | |
| 518 | - WC_Stripe::log( "Successful charge: $response->id" ); | |
| 516 | +		if ($response->captured) { | |
| 517 | + $order->payment_complete($response->id); | |
| 518 | +			WC_Stripe::log("Successful charge: $response->id"); | |
| 519 | 519 |  		} else { | 
| 520 | - add_post_meta( $order->id, '_transaction_id', $response->id, true ); | |
| 520 | + add_post_meta($order->id, '_transaction_id', $response->id, true); | |
| 521 | 521 | |
| 522 | -			if ( $order->has_status( array( 'pending', 'failed' ) ) ) { | |
| 522 | +			if ($order->has_status(array('pending', 'failed'))) { | |
| 523 | 523 | $order->reduce_order_stock(); | 
| 524 | 524 | } | 
| 525 | 525 | |
| 526 | - $order->update_status( 'on-hold', sprintf( __( 'Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe' ), $response->id ) ); | |
| 527 | - WC_Stripe::log( "Successful auth: $response->id" ); | |
| 526 | +			$order->update_status('on-hold', sprintf(__('Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe'), $response->id)); | |
| 527 | +			WC_Stripe::log("Successful auth: $response->id"); | |
| 528 | 528 | } | 
| 529 | 529 | |
| 530 | 530 | return $response; | 
| @@ -536,21 +536,21 @@ discard block | ||
| 536 | 536 | * @since 3.0.0 | 
| 537 | 537 | */ | 
| 538 | 538 |  	public function add_payment_method() { | 
| 539 | -		if ( empty( $_POST['stripe_token'] ) || ! is_user_logged_in() ) { | |
| 540 | - wc_add_notice( __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' ), 'error' ); | |
| 539 | +		if (empty($_POST['stripe_token']) || ! is_user_logged_in()) { | |
| 540 | +			wc_add_notice(__('There was a problem adding the card.', 'woocommerce-gateway-stripe'), 'error'); | |
| 541 | 541 | return; | 
| 542 | 542 | } | 
| 543 | 543 | |
| 544 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 545 | - $result = $stripe_customer->add_card( wc_clean( $_POST['stripe_token'] ) ); | |
| 544 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 545 | + $result = $stripe_customer->add_card(wc_clean($_POST['stripe_token'])); | |
| 546 | 546 | |
| 547 | -		if ( is_wp_error( $result ) ) { | |
| 548 | - throw new Exception( $result->get_error_message() ); | |
| 547 | +		if (is_wp_error($result)) { | |
| 548 | + throw new Exception($result->get_error_message()); | |
| 549 | 549 | } | 
| 550 | 550 | |
| 551 | 551 | return array( | 
| 552 | 552 | 'result' => 'success', | 
| 553 | - 'redirect' => wc_get_endpoint_url( 'payment-methods' ), | |
| 553 | +			'redirect' => wc_get_endpoint_url('payment-methods'), | |
| 554 | 554 | ); | 
| 555 | 555 | } | 
| 556 | 556 | |
| @@ -560,36 +560,36 @@ discard block | ||
| 560 | 560 | * @param float $amount | 
| 561 | 561 | * @return bool | 
| 562 | 562 | */ | 
| 563 | -	public function process_refund( $order_id, $amount = null, $reason = '' ) { | |
| 564 | - $order = wc_get_order( $order_id ); | |
| 563 | +	public function process_refund($order_id, $amount = null, $reason = '') { | |
| 564 | + $order = wc_get_order($order_id); | |
| 565 | 565 | |
| 566 | -		if ( ! $order || ! $order->get_transaction_id() ) { | |
| 566 | +		if ( ! $order || ! $order->get_transaction_id()) { | |
| 567 | 567 | return false; | 
| 568 | 568 | } | 
| 569 | 569 | |
| 570 | 570 | $body = array(); | 
| 571 | 571 | |
| 572 | -		if ( ! is_null( $amount ) ) { | |
| 573 | - $body['amount'] = $this->get_stripe_amount( $amount ); | |
| 572 | +		if ( ! is_null($amount)) { | |
| 573 | + $body['amount'] = $this->get_stripe_amount($amount); | |
| 574 | 574 | } | 
| 575 | 575 | |
| 576 | -		if ( $reason ) { | |
| 576 | +		if ($reason) { | |
| 577 | 577 | $body['metadata'] = array( | 
| 578 | 578 | 'reason' => $reason, | 
| 579 | 579 | ); | 
| 580 | 580 | } | 
| 581 | 581 | |
| 582 | -		WC_Stripe::log( "Info: Beginning refund for order $order_id for the amount of {$amount}" ); | |
| 582 | +		WC_Stripe::log("Info: Beginning refund for order $order_id for the amount of {$amount}"); | |
| 583 | 583 | |
| 584 | - $response = WC_Stripe_API::request( $body, 'charges/' . $order->get_transaction_id() . '/refunds' ); | |
| 584 | + $response = WC_Stripe_API::request($body, 'charges/' . $order->get_transaction_id() . '/refunds'); | |
| 585 | 585 | |
| 586 | -		if ( is_wp_error( $response ) ) { | |
| 587 | - WC_Stripe::log( "Error: " . $response->get_error_message() ); | |
| 586 | +		if (is_wp_error($response)) { | |
| 587 | +			WC_Stripe::log("Error: " . $response->get_error_message()); | |
| 588 | 588 | return $response; | 
| 589 | -		} elseif ( ! empty( $response->id ) ) { | |
| 590 | - $refund_message = sprintf( __( 'Refunded %s - Refund ID: %s - Reason: %s', 'woocommerce-gateway-stripe' ), wc_price( $response->amount / 100 ), $response->id, $reason ); | |
| 591 | - $order->add_order_note( $refund_message ); | |
| 592 | - WC_Stripe::log( "Success: " . html_entity_decode( strip_tags( $refund_message ) ) ); | |
| 589 | +		} elseif ( ! empty($response->id)) { | |
| 590 | +			$refund_message = sprintf(__('Refunded %s - Refund ID: %s - Reason: %s', 'woocommerce-gateway-stripe'), wc_price($response->amount / 100), $response->id, $reason); | |
| 591 | + $order->add_order_note($refund_message); | |
| 592 | +			WC_Stripe::log("Success: " . html_entity_decode(strip_tags($refund_message))); | |
| 593 | 593 | return true; | 
| 594 | 594 | } | 
| 595 | 595 | } | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | * Set secret API Key. | 
| 26 | 26 | * @param string $key | 
| 27 | 27 | */ | 
| 28 | -	public static function set_secret_key( $secret_key ) { | |
| 28 | +	public static function set_secret_key($secret_key) { | |
| 29 | 29 | self::$secret_key = $secret_key; | 
| 30 | 30 | } | 
| 31 | 31 | |
| @@ -34,11 +34,11 @@ discard block | ||
| 34 | 34 | * @return string | 
| 35 | 35 | */ | 
| 36 | 36 |  	public static function get_secret_key() { | 
| 37 | -		if ( ! self::$secret_key ) { | |
| 38 | - $options = get_option( 'woocommerce_stripe_settings' ); | |
| 37 | +		if ( ! self::$secret_key) { | |
| 38 | +			$options = get_option('woocommerce_stripe_settings'); | |
| 39 | 39 | |
| 40 | -			if ( isset( $options['testmode'], $options['secret_key'], $options['test_secret_key'] ) ) { | |
| 41 | - self::set_secret_key( 'yes' === $options['testmode'] ? $options['test_secret_key'] : $options['secret_key'] ); | |
| 40 | +			if (isset($options['testmode'], $options['secret_key'], $options['test_secret_key'])) { | |
| 41 | +				self::set_secret_key('yes' === $options['testmode'] ? $options['test_secret_key'] : $options['secret_key']); | |
| 42 | 42 | } | 
| 43 | 43 | } | 
| 44 | 44 | return self::$secret_key; | 
| @@ -51,39 +51,39 @@ discard block | ||
| 51 | 51 | * @param string $api | 
| 52 | 52 | * @return array|WP_Error | 
| 53 | 53 | */ | 
| 54 | -	public static function request( $request, $api = 'charges', $method = 'POST' ) { | |
| 55 | -		self::log( "{$api} request: " . print_r( $request, true ) ); | |
| 54 | +	public static function request($request, $api = 'charges', $method = 'POST') { | |
| 55 | +		self::log("{$api} request: " . print_r($request, true)); | |
| 56 | 56 | |
| 57 | 57 | $response = wp_safe_remote_post( | 
| 58 | 58 | self::ENDPOINT . $api, | 
| 59 | 59 | array( | 
| 60 | 60 | 'method' => $method, | 
| 61 | 61 | 'headers' => array( | 
| 62 | - 'Authorization' => 'Basic ' . base64_encode( self::get_secret_key() . ':' ), | |
| 62 | + 'Authorization' => 'Basic ' . base64_encode(self::get_secret_key() . ':'), | |
| 63 | 63 | 'Stripe-Version' => '2016-03-07', | 
| 64 | 64 | ), | 
| 65 | - 'body' => apply_filters( 'woocommerce_stripe_request_body', $request, $api ), | |
| 65 | +				'body'       => apply_filters('woocommerce_stripe_request_body', $request, $api), | |
| 66 | 66 | 'timeout' => 70, | 
| 67 | 67 | 'user-agent' => 'WooCommerce ' . WC()->version, | 
| 68 | 68 | ) | 
| 69 | 69 | ); | 
| 70 | 70 | |
| 71 | -		if ( is_wp_error( $response ) || empty( $response['body'] ) ) { | |
| 72 | - self::log( 'Error Response: ' . print_r( $response, true ) ); | |
| 73 | - return new WP_Error( 'stripe_error', __( 'There was a problem connecting to the payment gateway.', 'woocommerce-gateway-stripe' ) ); | |
| 71 | +		if (is_wp_error($response) || empty($response['body'])) { | |
| 72 | +			self::log('Error Response: ' . print_r($response, true)); | |
| 73 | +			return new WP_Error('stripe_error', __('There was a problem connecting to the payment gateway.', 'woocommerce-gateway-stripe')); | |
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | - $parsed_response = json_decode( $response['body'] ); | |
| 76 | + $parsed_response = json_decode($response['body']); | |
| 77 | 77 | // Handle response | 
| 78 | -		if ( ! empty( $parsed_response->error ) ) { | |
| 79 | -			if ( ! empty( $parsed_response->error->param ) ) { | |
| 78 | +		if ( ! empty($parsed_response->error)) { | |
| 79 | +			if ( ! empty($parsed_response->error->param)) { | |
| 80 | 80 | $code = $parsed_response->error->param; | 
| 81 | -			} elseif ( ! empty( $parsed_response->error->code ) ) { | |
| 81 | +			} elseif ( ! empty($parsed_response->error->code)) { | |
| 82 | 82 | $code = $parsed_response->error->code; | 
| 83 | 83 |  			} else { | 
| 84 | 84 | $code = 'stripe_error'; | 
| 85 | 85 | } | 
| 86 | - return new WP_Error( $code, $parsed_response->error->message ); | |
| 86 | + return new WP_Error($code, $parsed_response->error->message); | |
| 87 | 87 |  		} else { | 
| 88 | 88 | return $parsed_response; | 
| 89 | 89 | } | 
| @@ -97,11 +97,11 @@ discard block | ||
| 97 | 97 | * | 
| 98 | 98 | * @param string $message | 
| 99 | 99 | */ | 
| 100 | -	public static function log( $message ) { | |
| 101 | - $options = get_option( 'woocommerce_stripe_settings' ); | |
| 100 | +	public static function log($message) { | |
| 101 | +		$options = get_option('woocommerce_stripe_settings'); | |
| 102 | 102 | |
| 103 | -		if ( 'yes' === $options['logging'] ) { | |
| 104 | - WC_Stripe::log( $message ); | |
| 103 | +		if ('yes' === $options['logging']) { | |
| 104 | + WC_Stripe::log($message); | |
| 105 | 105 | } | 
| 106 | 106 | } | 
| 107 | 107 | } | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -32,10 +32,10 @@ discard block | ||
| 32 | 32 | * Constructor | 
| 33 | 33 | * @param integer $user_id | 
| 34 | 34 | */ | 
| 35 | -	public function __construct( $user_id = 0 ) { | |
| 36 | -		if ( $user_id ) { | |
| 37 | - $this->set_user_id( $user_id ); | |
| 38 | - $this->set_id( get_user_meta( $user_id, '_stripe_customer_id', true ) ); | |
| 35 | +	public function __construct($user_id = 0) { | |
| 36 | +		if ($user_id) { | |
| 37 | + $this->set_user_id($user_id); | |
| 38 | + $this->set_id(get_user_meta($user_id, '_stripe_customer_id', true)); | |
| 39 | 39 | } | 
| 40 | 40 | } | 
| 41 | 41 | |
| @@ -51,8 +51,8 @@ discard block | ||
| 51 | 51 | * Set Stripe customer ID. | 
| 52 | 52 | * @param [type] $id [description] | 
| 53 | 53 | */ | 
| 54 | -	public function set_id( $id ) { | |
| 55 | - $this->id = wc_clean( $id ); | |
| 54 | +	public function set_id($id) { | |
| 55 | + $this->id = wc_clean($id); | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | 58 | /** | 
| @@ -60,15 +60,15 @@ discard block | ||
| 60 | 60 | * @return int | 
| 61 | 61 | */ | 
| 62 | 62 |  	public function get_user_id() { | 
| 63 | - return absint( $this->user_id ); | |
| 63 | + return absint($this->user_id); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | /** | 
| 67 | 67 | * Set User ID used by WordPress. | 
| 68 | 68 | * @param int $user_id | 
| 69 | 69 | */ | 
| 70 | -	public function set_user_id( $user_id ) { | |
| 71 | - $this->user_id = absint( $user_id ); | |
| 70 | +	public function set_user_id($user_id) { | |
| 71 | + $this->user_id = absint($user_id); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | /** | 
| @@ -76,13 +76,13 @@ discard block | ||
| 76 | 76 | * @return WP_User | 
| 77 | 77 | */ | 
| 78 | 78 |  	protected function get_user() { | 
| 79 | - return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false; | |
| 79 | +		return $this->get_user_id() ? get_user_by('id', $this->get_user_id()) : false; | |
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | 82 | /** | 
| 83 | 83 | * Store data from the Stripe API about this customer | 
| 84 | 84 | */ | 
| 85 | -	public function set_customer_data( $data ) { | |
| 85 | +	public function set_customer_data($data) { | |
| 86 | 86 | $this->customer_data = $data; | 
| 87 | 87 | } | 
| 88 | 88 | |
| @@ -90,12 +90,12 @@ discard block | ||
| 90 | 90 | * Get data from the Stripe API about this customer | 
| 91 | 91 | */ | 
| 92 | 92 |  	public function get_customer_data() { | 
| 93 | -		if ( empty( $this->customer_data ) && $this->get_id() && false === ( $this->customer_data = get_transient( 'stripe_customer_' . $this->get_id() ) ) ) { | |
| 94 | - $response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() ); | |
| 93 | +		if (empty($this->customer_data) && $this->get_id() && false === ($this->customer_data = get_transient('stripe_customer_' . $this->get_id()))) { | |
| 94 | + $response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id()); | |
| 95 | 95 | |
| 96 | -			if ( ! is_wp_error( $response ) ) { | |
| 97 | - $this->set_customer_data( $response ); | |
| 98 | - set_transient( 'stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48 ); | |
| 96 | +			if ( ! is_wp_error($response)) { | |
| 97 | + $this->set_customer_data($response); | |
| 98 | +				set_transient('stripe_customer_' . $this->get_id(), $response, HOUR_IN_SECONDS * 48); | |
| 99 | 99 | } | 
| 100 | 100 | } | 
| 101 | 101 | return $this->customer_data; | 
| @@ -109,7 +109,7 @@ discard block | ||
| 109 | 109 | $data = $this->get_customer_data(); | 
| 110 | 110 | $source = ''; | 
| 111 | 111 | |
| 112 | -		if ( $data ) { | |
| 112 | +		if ($data) { | |
| 113 | 113 | $source = $data->default_source; | 
| 114 | 114 | } | 
| 115 | 115 | |
| @@ -121,10 +121,10 @@ discard block | ||
| 121 | 121 | * @param array $args | 
| 122 | 122 | * @return WP_Error|int | 
| 123 | 123 | */ | 
| 124 | -	public function create_customer( $args = array() ) { | |
| 125 | -		if ( $user = $this->get_user() ) { | |
| 126 | - $billing_first_name = get_user_meta( $user->ID, 'billing_first_name', true ); | |
| 127 | - $billing_last_name = get_user_meta( $user->ID, 'billing_last_name', true ); | |
| 124 | +	public function create_customer($args = array()) { | |
| 125 | +		if ($user = $this->get_user()) { | |
| 126 | + $billing_first_name = get_user_meta($user->ID, 'billing_first_name', true); | |
| 127 | + $billing_last_name = get_user_meta($user->ID, 'billing_last_name', true); | |
| 128 | 128 | |
| 129 | 129 | $defaults = array( | 
| 130 | 130 | 'email' => $user->user_email, | 
| @@ -139,26 +139,26 @@ discard block | ||
| 139 | 139 | |
| 140 | 140 | $metadata = array(); | 
| 141 | 141 | |
| 142 | - $defaults['metadata'] = apply_filters( 'wc_stripe_customer_metadata', $metadata, $user ); | |
| 142 | +		$defaults['metadata'] = apply_filters('wc_stripe_customer_metadata', $metadata, $user); | |
| 143 | 143 | |
| 144 | - $args = wp_parse_args( $args, $defaults ); | |
| 145 | - $response = WC_Stripe_API::request( $args, 'customers' ); | |
| 144 | + $args = wp_parse_args($args, $defaults); | |
| 145 | + $response = WC_Stripe_API::request($args, 'customers'); | |
| 146 | 146 | |
| 147 | -		if ( is_wp_error( $response ) ) { | |
| 147 | +		if (is_wp_error($response)) { | |
| 148 | 148 | return $response; | 
| 149 | -		} elseif ( empty( $response->id ) ) { | |
| 150 | - return new WP_Error( 'stripe_error', __( 'Could not create Stripe customer.', 'woocommerce-gateway-stripe' ) ); | |
| 149 | +		} elseif (empty($response->id)) { | |
| 150 | +			return new WP_Error('stripe_error', __('Could not create Stripe customer.', 'woocommerce-gateway-stripe')); | |
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | - $this->set_id( $response->id ); | |
| 153 | + $this->set_id($response->id); | |
| 154 | 154 | $this->clear_cache(); | 
| 155 | - $this->set_customer_data( $response ); | |
| 155 | + $this->set_customer_data($response); | |
| 156 | 156 | |
| 157 | -		if ( $this->get_user_id() ) { | |
| 158 | - update_user_meta( $this->get_user_id(), '_stripe_customer_id', $response->id ); | |
| 157 | +		if ($this->get_user_id()) { | |
| 158 | + update_user_meta($this->get_user_id(), '_stripe_customer_id', $response->id); | |
| 159 | 159 | } | 
| 160 | 160 | |
| 161 | - do_action( 'woocommerce_stripe_add_customer', $args, $response ); | |
| 161 | +		do_action('woocommerce_stripe_add_customer', $args, $response); | |
| 162 | 162 | |
| 163 | 163 | return $response->id; | 
| 164 | 164 | } | 
| @@ -169,44 +169,44 @@ discard block | ||
| 169 | 169 | * @param bool $retry | 
| 170 | 170 | * @return WP_Error|int | 
| 171 | 171 | */ | 
| 172 | -	public function add_card( $token, $retry = true ) { | |
| 173 | -		if ( ! $this->get_id() ) { | |
| 174 | -			if ( ( $response = $this->create_customer() ) && is_wp_error( $response ) ) { | |
| 172 | +	public function add_card($token, $retry = true) { | |
| 173 | +		if ( ! $this->get_id()) { | |
| 174 | +			if (($response = $this->create_customer()) && is_wp_error($response)) { | |
| 175 | 175 | return $response; | 
| 176 | 176 | } | 
| 177 | 177 | } | 
| 178 | 178 | |
| 179 | - $response = WC_Stripe_API::request( array( | |
| 179 | + $response = WC_Stripe_API::request(array( | |
| 180 | 180 | 'source' => $token, | 
| 181 | - ), 'customers/' . $this->get_id() . '/sources' ); | |
| 181 | + ), 'customers/' . $this->get_id() . '/sources'); | |
| 182 | 182 | |
| 183 | -		if ( is_wp_error( $response ) ) { | |
| 184 | -			if ( 'customer' === $response->get_error_code() && $retry ) { | |
| 183 | +		if (is_wp_error($response)) { | |
| 184 | +			if ('customer' === $response->get_error_code() && $retry) { | |
| 185 | 185 | $this->create_customer(); | 
| 186 | - return $this->add_card( $token, false ); | |
| 186 | + return $this->add_card($token, false); | |
| 187 | 187 |  			} else { | 
| 188 | 188 | return $response; | 
| 189 | 189 | } | 
| 190 | -		} elseif ( empty( $response->id ) ) { | |
| 191 | - return new WP_Error( 'error', __( 'Unable to add card', 'woocommerce-gateway-stripe' ) ); | |
| 190 | +		} elseif (empty($response->id)) { | |
| 191 | +			return new WP_Error('error', __('Unable to add card', 'woocommerce-gateway-stripe')); | |
| 192 | 192 | } | 
| 193 | 193 | |
| 194 | 194 | // Add token to WooCommerce | 
| 195 | -		if ( $this->get_user_id() && class_exists( 'WC_Payment_Token_CC' ) ) { | |
| 195 | +		if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) { | |
| 196 | 196 | $token = new WC_Payment_Token_CC(); | 
| 197 | - $token->set_token( $response->id ); | |
| 198 | - $token->set_gateway_id( 'stripe' ); | |
| 199 | - $token->set_card_type( strtolower( $response->brand ) ); | |
| 200 | - $token->set_last4( $response->last4 ); | |
| 201 | - $token->set_expiry_month( $response->exp_month ); | |
| 202 | - $token->set_expiry_year( $response->exp_year ); | |
| 203 | - $token->set_user_id( $this->get_user_id() ); | |
| 197 | + $token->set_token($response->id); | |
| 198 | +			$token->set_gateway_id('stripe'); | |
| 199 | + $token->set_card_type(strtolower($response->brand)); | |
| 200 | + $token->set_last4($response->last4); | |
| 201 | + $token->set_expiry_month($response->exp_month); | |
| 202 | + $token->set_expiry_year($response->exp_year); | |
| 203 | + $token->set_user_id($this->get_user_id()); | |
| 204 | 204 | $token->save(); | 
| 205 | 205 | } | 
| 206 | 206 | |
| 207 | 207 | $this->clear_cache(); | 
| 208 | 208 | |
| 209 | - do_action( 'woocommerce_stripe_add_card', $this->get_id(), $token, $response ); | |
| 209 | +		do_action('woocommerce_stripe_add_card', $this->get_id(), $token, $response); | |
| 210 | 210 | |
| 211 | 211 | return $response->id; | 
| 212 | 212 | } | 
| @@ -220,20 +220,20 @@ discard block | ||
| 220 | 220 |  	public function get_cards() { | 
| 221 | 221 | $cards = array(); | 
| 222 | 222 | |
| 223 | -		if ( $this->get_id() && false === ( $cards = get_transient( 'stripe_cards_' . $this->get_id() ) ) ) { | |
| 224 | - $response = WC_Stripe_API::request( array( | |
| 223 | +		if ($this->get_id() && false === ($cards = get_transient('stripe_cards_' . $this->get_id()))) { | |
| 224 | + $response = WC_Stripe_API::request(array( | |
| 225 | 225 | 'limit' => 100, | 
| 226 | - ), 'customers/' . $this->get_id() . '/sources', 'GET' ); | |
| 226 | + ), 'customers/' . $this->get_id() . '/sources', 'GET'); | |
| 227 | 227 | |
| 228 | -			if ( is_wp_error( $response ) ) { | |
| 228 | +			if (is_wp_error($response)) { | |
| 229 | 229 | return array(); | 
| 230 | 230 | } | 
| 231 | 231 | |
| 232 | -			if ( is_array( $response->data ) ) { | |
| 232 | +			if (is_array($response->data)) { | |
| 233 | 233 | $cards = $response->data; | 
| 234 | 234 | } | 
| 235 | 235 | |
| 236 | - set_transient( 'stripe_cards_' . $this->get_id(), $cards, HOUR_IN_SECONDS * 48 ); | |
| 236 | +			set_transient('stripe_cards_' . $this->get_id(), $cards, HOUR_IN_SECONDS * 48); | |
| 237 | 237 | } | 
| 238 | 238 | |
| 239 | 239 | return $cards; | 
| @@ -243,13 +243,13 @@ discard block | ||
| 243 | 243 | * Delete a card from stripe. | 
| 244 | 244 | * @param string $card_id | 
| 245 | 245 | */ | 
| 246 | -	public function delete_card( $card_id ) { | |
| 247 | - $response = WC_Stripe_API::request( array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field( $card_id ), 'DELETE' ); | |
| 246 | +	public function delete_card($card_id) { | |
| 247 | + $response = WC_Stripe_API::request(array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field($card_id), 'DELETE'); | |
| 248 | 248 | |
| 249 | 249 | $this->clear_cache(); | 
| 250 | 250 | |
| 251 | -		if ( ! is_wp_error( $response ) ) { | |
| 252 | - do_action( 'wc_stripe_delete_card', $this->get_id(), $response ); | |
| 251 | +		if ( ! is_wp_error($response)) { | |
| 252 | +			do_action('wc_stripe_delete_card', $this->get_id(), $response); | |
| 253 | 253 | |
| 254 | 254 | return true; | 
| 255 | 255 | } | 
| @@ -261,15 +261,15 @@ discard block | ||
| 261 | 261 | * Set default card in Stripe | 
| 262 | 262 | * @param string $card_id | 
| 263 | 263 | */ | 
| 264 | -	public function set_default_card( $card_id ) { | |
| 265 | - $response = WC_Stripe_API::request( array( | |
| 266 | - 'default_source' => sanitize_text_field( $card_id ), | |
| 267 | - ), 'customers/' . $this->get_id(), 'POST' ); | |
| 264 | +	public function set_default_card($card_id) { | |
| 265 | + $response = WC_Stripe_API::request(array( | |
| 266 | + 'default_source' => sanitize_text_field($card_id), | |
| 267 | + ), 'customers/' . $this->get_id(), 'POST'); | |
| 268 | 268 | |
| 269 | 269 | $this->clear_cache(); | 
| 270 | 270 | |
| 271 | -		if ( ! is_wp_error( $response ) ) { | |
| 272 | - do_action( 'wc_stripe_set_default_card', $this->get_id(), $response ); | |
| 271 | +		if ( ! is_wp_error($response)) { | |
| 272 | +			do_action('wc_stripe_set_default_card', $this->get_id(), $response); | |
| 273 | 273 | |
| 274 | 274 | return true; | 
| 275 | 275 | } | 
| @@ -281,8 +281,8 @@ discard block | ||
| 281 | 281 | * Deletes caches for this users cards. | 
| 282 | 282 | */ | 
| 283 | 283 |  	public function clear_cache() { | 
| 284 | - delete_transient( 'stripe_cards_' . $this->get_id() ); | |
| 285 | - delete_transient( 'stripe_customer_' . $this->get_id() ); | |
| 284 | +		delete_transient('stripe_cards_' . $this->get_id()); | |
| 285 | +		delete_transient('stripe_customer_' . $this->get_id()); | |
| 286 | 286 | $this->customer_data = array(); | 
| 287 | 287 | } | 
| 288 | 288 | } | 
| @@ -7,7 +7,7 @@ discard block | ||
| 7 | 7 | * @version 3.1.0 | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 10 | +if ( ! defined('ABSPATH')) { | |
| 11 | 11 | exit; | 
| 12 | 12 | } | 
| 13 | 13 | |
| @@ -20,12 +20,12 @@ discard block | ||
| 20 | 20 | * Initialize class actions. | 
| 21 | 21 | */ | 
| 22 | 22 |  	public function __construct() { | 
| 23 | - add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) ); | |
| 23 | +		add_action('wp_enqueue_scripts', array($this, 'scripts')); | |
| 24 | 24 | |
| 25 | - add_action( 'wc_ajax_wc_stripe_get_cart_details', array( $this, 'ajax_get_cart_details' ) ); | |
| 26 | - add_action( 'wc_ajax_wc_stripe_get_shipping_options', array( $this, 'ajax_get_shipping_options' ) ); | |
| 27 | - add_action( 'wc_ajax_wc_stripe_update_shipping_method', array( $this, 'ajax_update_shipping_method' ) ); | |
| 28 | - add_action( 'wc_ajax_wc_stripe_create_order', array( $this, 'ajax_create_order' ) ); | |
| 25 | +		add_action('wc_ajax_wc_stripe_get_cart_details', array($this, 'ajax_get_cart_details')); | |
| 26 | +		add_action('wc_ajax_wc_stripe_get_shipping_options', array($this, 'ajax_get_shipping_options')); | |
| 27 | +		add_action('wc_ajax_wc_stripe_update_shipping_method', array($this, 'ajax_update_shipping_method')); | |
| 28 | +		add_action('wc_ajax_wc_stripe_create_order', array($this, 'ajax_create_order')); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | /** | 
| @@ -34,10 +34,10 @@ discard block | ||
| 34 | 34 | * @return bool | 
| 35 | 35 | */ | 
| 36 | 36 |  	protected function is_activated() { | 
| 37 | - $options = get_option( 'woocommerce_stripe_settings', array() ); | |
| 38 | - $enabled = isset( $options['enabled'] ) && 'yes' === $options['enabled']; | |
| 39 | - $stripe_checkout = isset( $options['stripe_checkout'] ) && 'yes' !== $options['stripe_checkout']; | |
| 40 | - $request_payment_api = isset( $options['request_payment_api'] ) && 'yes' === $options['request_payment_api']; | |
| 37 | +		$options             = get_option('woocommerce_stripe_settings', array()); | |
| 38 | + $enabled = isset($options['enabled']) && 'yes' === $options['enabled']; | |
| 39 | + $stripe_checkout = isset($options['stripe_checkout']) && 'yes' !== $options['stripe_checkout']; | |
| 40 | + $request_payment_api = isset($options['request_payment_api']) && 'yes' === $options['request_payment_api']; | |
| 41 | 41 | |
| 42 | 42 | return $enabled && $stripe_checkout && $request_payment_api && is_ssl(); | 
| 43 | 43 | } | 
| @@ -48,9 +48,9 @@ discard block | ||
| 48 | 48 | * @return string | 
| 49 | 49 | */ | 
| 50 | 50 |  	protected function get_publishable_key() { | 
| 51 | - $options = get_option( 'woocommerce_stripe_settings', array() ); | |
| 51 | +		$options = get_option('woocommerce_stripe_settings', array()); | |
| 52 | 52 | |
| 53 | -		if ( empty( $options ) ) { | |
| 53 | +		if (empty($options)) { | |
| 54 | 54 | return ''; | 
| 55 | 55 | } | 
| 56 | 56 | |
| @@ -62,39 +62,39 @@ discard block | ||
| 62 | 62 | */ | 
| 63 | 63 |  	public function scripts() { | 
| 64 | 64 | // Load PaymentRequest only on cart for now. | 
| 65 | -		if ( ! is_cart() ) { | |
| 65 | +		if ( ! is_cart()) { | |
| 66 | 66 | return; | 
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | -		if ( ! $this->is_activated() ) { | |
| 69 | +		if ( ! $this->is_activated()) { | |
| 70 | 70 | return; | 
| 71 | 71 | } | 
| 72 | 72 | |
| 73 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 73 | +		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | |
| 74 | 74 | |
| 75 | - wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '1.0', true ); | |
| 76 | - wp_enqueue_script( 'google-payment-request-shim', 'https://storage.googleapis.com/prshim/v1/payment-shim.js', '', '1.0', false ); | |
| 77 | - wp_enqueue_script( 'wc-stripe-payment-request', plugins_url( 'assets/js/payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery', 'stripe' ), WC_STRIPE_VERSION, true ); | |
| 75 | +		wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '1.0', true); | |
| 76 | +		wp_enqueue_script('google-payment-request-shim', 'https://storage.googleapis.com/prshim/v1/payment-shim.js', '', '1.0', false); | |
| 77 | +		wp_enqueue_script('wc-stripe-payment-request', plugins_url('assets/js/payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery', 'stripe'), WC_STRIPE_VERSION, true); | |
| 78 | 78 | |
| 79 | 79 | wp_localize_script( | 
| 80 | 80 | 'wc-stripe-payment-request', | 
| 81 | 81 | 'wcStripePaymentRequestParams', | 
| 82 | 82 | array( | 
| 83 | - 'ajax_url' => WC_AJAX::get_endpoint( '%%endpoint%%' ), | |
| 83 | +				'ajax_url' => WC_AJAX::get_endpoint('%%endpoint%%'), | |
| 84 | 84 | 'stripe' => array( | 
| 85 | 85 | 'key' => $this->get_publishable_key(), | 
| 86 | - 'allow_prepaid_card' => apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no', | |
| 86 | +					'allow_prepaid_card' => apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no', | |
| 87 | 87 | ), | 
| 88 | 88 | 'nonce' => array( | 
| 89 | - 'payment' => wp_create_nonce( 'wc-stripe-payment-request' ), | |
| 90 | - 'shipping' => wp_create_nonce( 'wc-stripe-payment-request-shipping' ), | |
| 91 | - 'update_shipping' => wp_create_nonce( 'wc-stripe-update-shipping-method' ), | |
| 92 | - 'checkout' => wp_create_nonce( 'woocommerce-process_checkout' ), | |
| 89 | +					'payment'         => wp_create_nonce('wc-stripe-payment-request'), | |
| 90 | +					'shipping'        => wp_create_nonce('wc-stripe-payment-request-shipping'), | |
| 91 | +					'update_shipping' => wp_create_nonce('wc-stripe-update-shipping-method'), | |
| 92 | +					'checkout'        => wp_create_nonce('woocommerce-process_checkout'), | |
| 93 | 93 | ), | 
| 94 | 94 | 'i18n' => array( | 
| 95 | - 'no_prepaid_card' => __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ), | |
| 95 | +					'no_prepaid_card'  => __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'), | |
| 96 | 96 | /* translators: Do not translate the [option] placeholder */ | 
| 97 | - 'unknown_shipping' => __( 'Unknown shipping option "[option]".', 'woocommerce-gateway-stripe' ), | |
| 97 | +					'unknown_shipping' => __('Unknown shipping option "[option]".', 'woocommerce-gateway-stripe'), | |
| 98 | 98 | ), | 
| 99 | 99 | ) | 
| 100 | 100 | ); | 
| @@ -104,10 +104,10 @@ discard block | ||
| 104 | 104 | * Get cart details. | 
| 105 | 105 | */ | 
| 106 | 106 |  	public function ajax_get_cart_details() { | 
| 107 | - check_ajax_referer( 'wc-stripe-payment-request', 'security' ); | |
| 107 | +		check_ajax_referer('wc-stripe-payment-request', 'security'); | |
| 108 | 108 | |
| 109 | -		if ( ! defined( 'WOOCOMMERCE_CART' ) ) { | |
| 110 | - define( 'WOOCOMMERCE_CART', true ); | |
| 109 | +		if ( ! defined('WOOCOMMERCE_CART')) { | |
| 110 | +			define('WOOCOMMERCE_CART', true); | |
| 111 | 111 | } | 
| 112 | 112 | |
| 113 | 113 | WC()->cart->calculate_totals(); | 
| @@ -119,18 +119,18 @@ discard block | ||
| 119 | 119 | 'shipping_required' => WC()->cart->needs_shipping(), | 
| 120 | 120 | 'order_data' => array( | 
| 121 | 121 | 'total' => array( | 
| 122 | - 'label' => __( 'Total', 'woocommerce-gateway-stripe' ), | |
| 122 | +					'label'  => __('Total', 'woocommerce-gateway-stripe'), | |
| 123 | 123 | 'amount' => array( | 
| 124 | - 'value' => max( 0, apply_filters( 'woocommerce_calculated_total', round( WC()->cart->cart_contents_total + WC()->cart->fee_total + WC()->cart->tax_total, WC()->cart->dp ), WC()->cart ) ), | |
| 124 | +						'value'    => max(0, apply_filters('woocommerce_calculated_total', round(WC()->cart->cart_contents_total + WC()->cart->fee_total + WC()->cart->tax_total, WC()->cart->dp), WC()->cart)), | |
| 125 | 125 | 'currency' => $currency, | 
| 126 | 126 | ), | 
| 127 | 127 | ), | 
| 128 | 128 | // Include line items such as subtotal, fees and taxes. No shipping option is provided here because it is not chosen yet. | 
| 129 | - 'displayItems' => $this->compute_display_items( null ), | |
| 129 | + 'displayItems' => $this->compute_display_items(null), | |
| 130 | 130 | ), | 
| 131 | 131 | ); | 
| 132 | 132 | |
| 133 | - wp_send_json( $data ); | |
| 133 | + wp_send_json($data); | |
| 134 | 134 | } | 
| 135 | 135 | |
| 136 | 136 | /** | 
| @@ -140,7 +140,7 @@ discard block | ||
| 140 | 140 | * @version 3.1.0 | 
| 141 | 141 | * @param array $address | 
| 142 | 142 | */ | 
| 143 | -	public function calculate_shipping( $address = array() ) { | |
| 143 | +	public function calculate_shipping($address = array()) { | |
| 144 | 144 | $country = $address['country']; | 
| 145 | 145 | $state = $address['state']; | 
| 146 | 146 | $postcode = $address['postcode']; | 
| @@ -150,19 +150,19 @@ discard block | ||
| 150 | 150 | |
| 151 | 151 | WC()->shipping->reset_shipping(); | 
| 152 | 152 | |
| 153 | -		if ( $postcode && WC_Validation::is_postcode( $postcode, $country ) ) { | |
| 154 | - $postcode = wc_format_postcode( $postcode, $country ); | |
| 153 | +		if ($postcode && WC_Validation::is_postcode($postcode, $country)) { | |
| 154 | + $postcode = wc_format_postcode($postcode, $country); | |
| 155 | 155 | } | 
| 156 | 156 | |
| 157 | -		if ( $country ) { | |
| 158 | - WC()->customer->set_location( $country, $state, $postcode, $city ); | |
| 159 | - WC()->customer->set_shipping_location( $country, $state, $postcode, $city ); | |
| 157 | +		if ($country) { | |
| 158 | + WC()->customer->set_location($country, $state, $postcode, $city); | |
| 159 | + WC()->customer->set_shipping_location($country, $state, $postcode, $city); | |
| 160 | 160 |  		} else { | 
| 161 | 161 | WC()->customer->set_to_base(); | 
| 162 | 162 | WC()->customer->set_shipping_to_base(); | 
| 163 | 163 | } | 
| 164 | 164 | |
| 165 | - WC()->customer->calculated_shipping( true ); | |
| 165 | + WC()->customer->calculated_shipping(true); | |
| 166 | 166 | |
| 167 | 167 | $packages = array(); | 
| 168 | 168 | |
| @@ -177,17 +177,17 @@ discard block | ||
| 177 | 177 | $packages[0]['destination']['address'] = $address_1; | 
| 178 | 178 | $packages[0]['destination']['address_2'] = $address_2; | 
| 179 | 179 | |
| 180 | -		foreach ( WC()->cart->get_cart() as $item ) { | |
| 181 | -			if ( $item['data']->needs_shipping() ) { | |
| 182 | -				if ( isset( $item['line_total'] ) ) { | |
| 180 | +		foreach (WC()->cart->get_cart() as $item) { | |
| 181 | +			if ($item['data']->needs_shipping()) { | |
| 182 | +				if (isset($item['line_total'])) { | |
| 183 | 183 | $packages[0]['contents_cost'] += $item['line_total']; | 
| 184 | 184 | } | 
| 185 | 185 | } | 
| 186 | 186 | } | 
| 187 | 187 | |
| 188 | - $packages = apply_filters( 'woocommerce_cart_shipping_packages', $packages ); | |
| 188 | +		$packages = apply_filters('woocommerce_cart_shipping_packages', $packages); | |
| 189 | 189 | |
| 190 | - WC()->shipping->calculate_shipping( $packages ); | |
| 190 | + WC()->shipping->calculate_shipping($packages); | |
| 191 | 191 | } | 
| 192 | 192 | |
| 193 | 193 | /** | 
| @@ -198,19 +198,19 @@ discard block | ||
| 198 | 198 | * @see WC_Shipping::get_packages(). | 
| 199 | 199 | */ | 
| 200 | 200 |  	public function ajax_get_shipping_options() { | 
| 201 | - check_ajax_referer( 'wc-stripe-payment-request-shipping', 'security' ); | |
| 201 | +		check_ajax_referer('wc-stripe-payment-request-shipping', 'security'); | |
| 202 | 202 | |
| 203 | 203 | // Set the shipping package. | 
| 204 | - $posted = filter_input_array( INPUT_POST, array( | |
| 204 | + $posted = filter_input_array(INPUT_POST, array( | |
| 205 | 205 | 'country' => FILTER_SANITIZE_STRING, | 
| 206 | 206 | 'state' => FILTER_SANITIZE_STRING, | 
| 207 | 207 | 'postcode' => FILTER_SANITIZE_STRING, | 
| 208 | 208 | 'city' => FILTER_SANITIZE_STRING, | 
| 209 | 209 | 'address' => FILTER_SANITIZE_STRING, | 
| 210 | 210 | 'address_2' => FILTER_SANITIZE_STRING, | 
| 211 | - ) ); | |
| 211 | + )); | |
| 212 | 212 | |
| 213 | - $this->calculate_shipping( $posted ); | |
| 213 | + $this->calculate_shipping($posted); | |
| 214 | 214 | |
| 215 | 215 | // Set the shipping options. | 
| 216 | 216 | $currency = get_woocommerce_currency(); | 
| @@ -218,13 +218,13 @@ discard block | ||
| 218 | 218 | |
| 219 | 219 | $packages = WC()->shipping->get_packages(); | 
| 220 | 220 | |
| 221 | -		if ( ! empty( $packages ) && WC()->customer->has_calculated_shipping() ) { | |
| 222 | -			foreach ( $packages as $package_key => $package ) { | |
| 223 | -				if ( empty( $package['rates'] ) ) { | |
| 221 | +		if ( ! empty($packages) && WC()->customer->has_calculated_shipping()) { | |
| 222 | +			foreach ($packages as $package_key => $package) { | |
| 223 | +				if (empty($package['rates'])) { | |
| 224 | 224 | break; | 
| 225 | 225 | } | 
| 226 | 226 | |
| 227 | -				foreach ( $package['rates'] as $key => $rate ) { | |
| 227 | +				foreach ($package['rates'] as $key => $rate) { | |
| 228 | 228 | $data[] = array( | 
| 229 | 229 | 'id' => $rate->id, | 
| 230 | 230 | 'label' => $rate->label, | 
| @@ -239,60 +239,60 @@ discard block | ||
| 239 | 239 | } | 
| 240 | 240 | |
| 241 | 241 | // Auto select when have only one shipping method available. | 
| 242 | -		if ( 1 === count( $data ) ) { | |
| 242 | +		if (1 === count($data)) { | |
| 243 | 243 | $data[0]['selected'] = true; | 
| 244 | 244 | } | 
| 245 | 245 | |
| 246 | - wp_send_json( $data ); | |
| 246 | + wp_send_json($data); | |
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | 249 | /** | 
| 250 | 250 | * Update shipping method. | 
| 251 | 251 | */ | 
| 252 | 252 |  	public function ajax_update_shipping_method() { | 
| 253 | - check_ajax_referer( 'wc-stripe-update-shipping-method', 'security' ); | |
| 253 | +		check_ajax_referer('wc-stripe-update-shipping-method', 'security'); | |
| 254 | 254 | |
| 255 | -		if ( ! defined( 'WOOCOMMERCE_CART' ) ) { | |
| 256 | - define( 'WOOCOMMERCE_CART', true ); | |
| 255 | +		if ( ! defined('WOOCOMMERCE_CART')) { | |
| 256 | +			define('WOOCOMMERCE_CART', true); | |
| 257 | 257 | } | 
| 258 | 258 | |
| 259 | - $chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' ); | |
| 260 | - $shipping_method = filter_input( INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ); | |
| 259 | +		$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods'); | |
| 260 | + $shipping_method = filter_input(INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY); | |
| 261 | 261 | |
| 262 | -		if ( is_array( $shipping_method ) ) { | |
| 263 | -			foreach ( $shipping_method as $i => $value ) { | |
| 264 | - $chosen_shipping_methods[ $i ] = wc_clean( $value ); | |
| 262 | +		if (is_array($shipping_method)) { | |
| 263 | +			foreach ($shipping_method as $i => $value) { | |
| 264 | + $chosen_shipping_methods[$i] = wc_clean($value); | |
| 265 | 265 | } | 
| 266 | 266 | } | 
| 267 | 267 | |
| 268 | - WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods ); | |
| 268 | +		WC()->session->set('chosen_shipping_methods', $chosen_shipping_methods); | |
| 269 | 269 | |
| 270 | 270 | WC()->cart->calculate_totals(); | 
| 271 | 271 | |
| 272 | 272 | // Send back the new cart total and line items to be displayed, such as subtotal, shipping rate(s), fees and taxes. | 
| 273 | - $data = array( | |
| 273 | + $data = array( | |
| 274 | 274 | 'total' => WC()->cart->total, | 
| 275 | - 'items' => $this->compute_display_items( $shipping_method[0] ), | |
| 275 | + 'items' => $this->compute_display_items($shipping_method[0]), | |
| 276 | 276 | ); | 
| 277 | 277 | |
| 278 | - wp_send_json( $data ); | |
| 278 | + wp_send_json($data); | |
| 279 | 279 | } | 
| 280 | 280 | |
| 281 | 281 | /** | 
| 282 | 282 | * Create order. | 
| 283 | 283 | */ | 
| 284 | 284 |  	public function ajax_create_order() { | 
| 285 | -		if ( WC()->cart->is_empty() ) { | |
| 286 | - wp_send_json_error( __( 'Empty cart', 'woocommerce-gateway-stripe' ) ); | |
| 285 | +		if (WC()->cart->is_empty()) { | |
| 286 | +			wp_send_json_error(__('Empty cart', 'woocommerce-gateway-stripe')); | |
| 287 | 287 | } | 
| 288 | 288 | |
| 289 | -		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { | |
| 290 | - define( 'WOOCOMMERCE_CHECKOUT', true ); | |
| 289 | +		if ( ! defined('WOOCOMMERCE_CHECKOUT')) { | |
| 290 | +			define('WOOCOMMERCE_CHECKOUT', true); | |
| 291 | 291 | } | 
| 292 | 292 | |
| 293 | 293 | WC()->checkout()->process_checkout(); | 
| 294 | 294 | |
| 295 | - die( 0 ); | |
| 295 | + die(0); | |
| 296 | 296 | } | 
| 297 | 297 | |
| 298 | 298 | /** | 
| @@ -300,26 +300,26 @@ discard block | ||
| 300 | 300 | * | 
| 301 | 301 | * @param string shipping_method_id If shipping method ID is provided, will include display items about shipping. | 
| 302 | 302 | */ | 
| 303 | -	protected function compute_display_items( $shipping_method_id ) { | |
| 303 | +	protected function compute_display_items($shipping_method_id) { | |
| 304 | 304 | $currency = get_woocommerce_currency(); | 
| 305 | 305 | $items = array( | 
| 306 | 306 | // Subtotal excluding tax, because taxes is a separate item, below. | 
| 307 | 307 | array( | 
| 308 | - 'label' => __( 'Subtotal', 'woocommerce-gateway-stripe' ), | |
| 308 | +				'label' => __('Subtotal', 'woocommerce-gateway-stripe'), | |
| 309 | 309 | 'amount' => array( | 
| 310 | - 'value' => max( 0, round( WC()->cart->subtotal_ex_tax, WC()->cart->dp ) ), | |
| 310 | + 'value' => max(0, round(WC()->cart->subtotal_ex_tax, WC()->cart->dp)), | |
| 311 | 311 | 'currency' => $currency, | 
| 312 | 312 | ), | 
| 313 | 313 | ), | 
| 314 | 314 | ); | 
| 315 | 315 | // If a chosen shipping option was provided, add line item(s) for it and include the shipping tax. | 
| 316 | - $tax_total = max( 0, round( WC()->cart->tax_total, WC()->cart->dp ) ); | |
| 317 | -		if ( $shipping_method_id ) { | |
| 318 | - $tax_total = max( 0, round( WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp ) ); | |
| 316 | + $tax_total = max(0, round(WC()->cart->tax_total, WC()->cart->dp)); | |
| 317 | +		if ($shipping_method_id) { | |
| 318 | + $tax_total = max(0, round(WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp)); | |
| 319 | 319 | // Look through the package rates for $shipping_method_id, and when found, add a line item. | 
| 320 | -			foreach ( WC()->shipping->get_packages() as $package_key => $package ) { | |
| 321 | -				foreach ( $package['rates'] as $key => $rate ) { | |
| 322 | -					if ( $rate->id  == $shipping_method_id ) { | |
| 320 | +			foreach (WC()->shipping->get_packages() as $package_key => $package) { | |
| 321 | +				foreach ($package['rates'] as $key => $rate) { | |
| 322 | +					if ($rate->id == $shipping_method_id) { | |
| 323 | 323 | $items[] = array( | 
| 324 | 324 | 'label' => $rate->label, | 
| 325 | 325 | 'amount' => array( | 
| @@ -333,7 +333,7 @@ discard block | ||
| 333 | 333 | } | 
| 334 | 334 | } | 
| 335 | 335 | // Include fees and taxes as display items. | 
| 336 | -		foreach ( WC()->cart->fees as $key => $fee ) { | |
| 336 | +		foreach (WC()->cart->fees as $key => $fee) { | |
| 337 | 337 | $items[] = array( | 
| 338 | 338 | 'label' => $fee->name, | 
| 339 | 339 | 'amount' => array( | 
| @@ -343,9 +343,9 @@ discard block | ||
| 343 | 343 | ); | 
| 344 | 344 | } | 
| 345 | 345 | // The tax total may include the shipping taxes if a shipping option is provided. | 
| 346 | -		if ( 0 < $tax_total ) { | |
| 346 | +		if (0 < $tax_total) { | |
| 347 | 347 | $items[] = array( | 
| 348 | - 'label' => __( 'Tax', 'woocommerce-gateway-stripe' ), | |
| 348 | +				'label'  => __('Tax', 'woocommerce-gateway-stripe'), | |
| 349 | 349 | 'amount' => array( | 
| 350 | 350 | 'currency' => $currency, | 
| 351 | 351 | 'value' => $tax_total, | 
| @@ -1,184 +1,184 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | -return apply_filters( 'wc_stripe_settings', | |
| 6 | +return apply_filters('wc_stripe_settings', | |
| 7 | 7 | array( | 
| 8 | 8 | 'enabled' => array( | 
| 9 | - 'title' => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ), | |
| 10 | - 'label' => __( 'Enable Stripe', 'woocommerce-gateway-stripe' ), | |
| 9 | +			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'), | |
| 10 | +			'label'       => __('Enable Stripe', 'woocommerce-gateway-stripe'), | |
| 11 | 11 | 'type' => 'checkbox', | 
| 12 | 12 | 'description' => '', | 
| 13 | 13 | 'default' => 'no', | 
| 14 | 14 | ), | 
| 15 | 15 | 'title' => array( | 
| 16 | - 'title' => __( 'Title', 'woocommerce-gateway-stripe' ), | |
| 16 | +			'title'       => __('Title', 'woocommerce-gateway-stripe'), | |
| 17 | 17 | 'type' => 'text', | 
| 18 | - 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ), | |
| 19 | - 'default' => __( 'Credit Card (Stripe)', 'woocommerce-gateway-stripe' ), | |
| 18 | +			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'), | |
| 19 | +			'default'     => __('Credit Card (Stripe)', 'woocommerce-gateway-stripe'), | |
| 20 | 20 | 'desc_tip' => true, | 
| 21 | 21 | ), | 
| 22 | 22 | 'description' => array( | 
| 23 | - 'title' => __( 'Description', 'woocommerce-gateway-stripe' ), | |
| 23 | +			'title'       => __('Description', 'woocommerce-gateway-stripe'), | |
| 24 | 24 | 'type' => 'text', | 
| 25 | - 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ), | |
| 26 | - 'default' => __( 'Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe' ), | |
| 25 | +			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'), | |
| 26 | +			'default'     => __('Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe'), | |
| 27 | 27 | 'desc_tip' => true, | 
| 28 | 28 | ), | 
| 29 | 29 | 'testmode' => array( | 
| 30 | - 'title' => __( 'Test mode', 'woocommerce-gateway-stripe' ), | |
| 31 | - 'label' => __( 'Enable Test Mode', 'woocommerce-gateway-stripe' ), | |
| 30 | +			'title'       => __('Test mode', 'woocommerce-gateway-stripe'), | |
| 31 | +			'label'       => __('Enable Test Mode', 'woocommerce-gateway-stripe'), | |
| 32 | 32 | 'type' => 'checkbox', | 
| 33 | - 'description' => __( 'Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe' ), | |
| 33 | +			'description' => __('Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe'), | |
| 34 | 34 | 'default' => 'yes', | 
| 35 | 35 | 'desc_tip' => true, | 
| 36 | 36 | ), | 
| 37 | 37 | 'test_secret_key' => array( | 
| 38 | - 'title' => __( 'Test Secret Key', 'woocommerce-gateway-stripe' ), | |
| 38 | +			'title'       => __('Test Secret Key', 'woocommerce-gateway-stripe'), | |
| 39 | 39 | 'type' => 'text', | 
| 40 | - 'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ), | |
| 40 | +			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'), | |
| 41 | 41 | 'default' => '', | 
| 42 | 42 | 'desc_tip' => true, | 
| 43 | 43 | ), | 
| 44 | 44 | 'test_publishable_key' => array( | 
| 45 | - 'title' => __( 'Test Publishable Key', 'woocommerce-gateway-stripe' ), | |
| 45 | +			'title'       => __('Test Publishable Key', 'woocommerce-gateway-stripe'), | |
| 46 | 46 | 'type' => 'text', | 
| 47 | - 'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ), | |
| 47 | +			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'), | |
| 48 | 48 | 'default' => '', | 
| 49 | 49 | 'desc_tip' => true, | 
| 50 | 50 | ), | 
| 51 | 51 | 'secret_key' => array( | 
| 52 | - 'title' => __( 'Live Secret Key', 'woocommerce-gateway-stripe' ), | |
| 52 | +			'title'       => __('Live Secret Key', 'woocommerce-gateway-stripe'), | |
| 53 | 53 | 'type' => 'text', | 
| 54 | - 'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ), | |
| 54 | +			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'), | |
| 55 | 55 | 'default' => '', | 
| 56 | 56 | 'desc_tip' => true, | 
| 57 | 57 | ), | 
| 58 | 58 | 'publishable_key' => array( | 
| 59 | - 'title' => __( 'Live Publishable Key', 'woocommerce-gateway-stripe' ), | |
| 59 | +			'title'       => __('Live Publishable Key', 'woocommerce-gateway-stripe'), | |
| 60 | 60 | 'type' => 'text', | 
| 61 | - 'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ), | |
| 61 | +			'description' => __('Get your API keys from your stripe account.', 'woocommerce-gateway-stripe'), | |
| 62 | 62 | 'default' => '', | 
| 63 | 63 | 'desc_tip' => true, | 
| 64 | 64 | ), | 
| 65 | 65 | 'statement_descriptor' => array( | 
| 66 | - 'title' => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ), | |
| 66 | +			'title'       => __('Statement Descriptor', 'woocommerce-gateway-stripe'), | |
| 67 | 67 | 'type' => 'text', | 
| 68 | - 'description' => __( 'Extra information about a charge. This will appear on your customer’s credit card statement.', 'woocommerce-gateway-stripe' ), | |
| 68 | +			'description' => __('Extra information about a charge. This will appear on your customer’s credit card statement.', 'woocommerce-gateway-stripe'), | |
| 69 | 69 | 'default' => '', | 
| 70 | 70 | 'desc_tip' => true, | 
| 71 | 71 | ), | 
| 72 | 72 | 'capture' => array( | 
| 73 | - 'title' => __( 'Capture', 'woocommerce-gateway-stripe' ), | |
| 74 | - 'label' => __( 'Capture charge immediately', 'woocommerce-gateway-stripe' ), | |
| 73 | +			'title'       => __('Capture', 'woocommerce-gateway-stripe'), | |
| 74 | +			'label'       => __('Capture charge immediately', 'woocommerce-gateway-stripe'), | |
| 75 | 75 | 'type' => 'checkbox', | 
| 76 | - 'description' => __( 'Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe' ), | |
| 76 | +			'description' => __('Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe'), | |
| 77 | 77 | 'default' => 'yes', | 
| 78 | 78 | 'desc_tip' => true, | 
| 79 | 79 | ), | 
| 80 | 80 | 'stripe_checkout' => array( | 
| 81 | - 'title' => __( 'Stripe Checkout', 'woocommerce-gateway-stripe' ), | |
| 82 | - 'label' => __( 'Enable Stripe Checkout', 'woocommerce-gateway-stripe' ), | |
| 81 | +			'title'       => __('Stripe Checkout', 'woocommerce-gateway-stripe'), | |
| 82 | +			'label'       => __('Enable Stripe Checkout', 'woocommerce-gateway-stripe'), | |
| 83 | 83 | 'type' => 'checkbox', | 
| 84 | - 'description' => __( 'If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page.', 'woocommerce-gateway-stripe' ), | |
| 84 | +			'description' => __('If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page.', 'woocommerce-gateway-stripe'), | |
| 85 | 85 | 'default' => 'no', | 
| 86 | 86 | 'desc_tip' => true, | 
| 87 | 87 | ), | 
| 88 | 88 | 'allow_remember_me' => array( | 
| 89 | - 'title' => __( 'Allow Remember Me', 'woocommerce-gateway-stripe' ), | |
| 90 | - 'label' => __( 'Enable Remember Me', 'woocommerce-gateway-stripe' ), | |
| 89 | +			'title'       => __('Allow Remember Me', 'woocommerce-gateway-stripe'), | |
| 90 | +			'label'       => __('Enable Remember Me', 'woocommerce-gateway-stripe'), | |
| 91 | 91 | 'type' => 'checkbox', | 
| 92 | - 'description' => __( 'If enabled, this option shows a "Remember Me" checkbox which when checked by the customer will persist their details.', 'woocommerce-gateway-stripe' ), | |
| 92 | +			'description' => __('If enabled, this option shows a "Remember Me" checkbox which when checked by the customer will persist their details.', 'woocommerce-gateway-stripe'), | |
| 93 | 93 | 'default' => 'yes', | 
| 94 | 94 | 'desc_tip' => true, | 
| 95 | 95 | ), | 
| 96 | 96 | 'stripe_checkout_locale' => array( | 
| 97 | - 'title' => __( 'Stripe Checkout locale', 'woocommerce-gateway-stripe' ), | |
| 97 | +			'title'       => __('Stripe Checkout locale', 'woocommerce-gateway-stripe'), | |
| 98 | 98 | 'type' => 'select', | 
| 99 | 99 | 'class' => 'wc-enhanced-select', | 
| 100 | - 'description' => __( 'Language to display in Stripe Checkout modal. Specify Auto to display Checkout in the user\'s preferred language, if available. English will be used by default.', 'woocommerce-gateway-stripe' ), | |
| 100 | +			'description' => __('Language to display in Stripe Checkout modal. Specify Auto to display Checkout in the user\'s preferred language, if available. English will be used by default.', 'woocommerce-gateway-stripe'), | |
| 101 | 101 | 'default' => 'en', | 
| 102 | 102 | 'desc_tip' => true, | 
| 103 | 103 | 'options' => array( | 
| 104 | - 'auto' => __( 'Auto', 'woocommerce-gateway-stripe' ), | |
| 105 | - 'zh' => __( 'Simplified Chinese', 'woocommerce-gateway-stripe' ), | |
| 106 | - 'da' => __( 'Danish', 'woocommerce-gateway-stripe' ), | |
| 107 | - 'nl' => __( 'Dutch', 'woocommerce-gateway-stripe' ), | |
| 108 | - 'en' => __( 'English', 'woocommerce-gateway-stripe' ), | |
| 109 | - 'fi' => __( 'Finnish', 'woocommerce-gateway-stripe' ), | |
| 110 | - 'fr' => __( 'French', 'woocommerce-gateway-stripe' ), | |
| 111 | - 'de' => __( 'German', 'woocommerce-gateway-stripe' ), | |
| 112 | - 'it' => __( 'Italian', 'woocommerce-gateway-stripe' ), | |
| 113 | - 'ja' => __( 'Japanese', 'woocommerce-gateway-stripe' ), | |
| 114 | - 'no' => __( 'Norwegian', 'woocommerce-gateway-stripe' ), | |
| 115 | - 'es' => __( 'Spanish', 'woocommerce-gateway-stripe' ), | |
| 116 | - 'sv' => __( 'Swedish', 'woocommerce-gateway-stripe' ), | |
| 104 | +				'auto' => __('Auto', 'woocommerce-gateway-stripe'), | |
| 105 | +				'zh'   => __('Simplified Chinese', 'woocommerce-gateway-stripe'), | |
| 106 | +				'da'   => __('Danish', 'woocommerce-gateway-stripe'), | |
| 107 | +				'nl'   => __('Dutch', 'woocommerce-gateway-stripe'), | |
| 108 | +				'en'   => __('English', 'woocommerce-gateway-stripe'), | |
| 109 | +				'fi'   => __('Finnish', 'woocommerce-gateway-stripe'), | |
| 110 | +				'fr'   => __('French', 'woocommerce-gateway-stripe'), | |
| 111 | +				'de'   => __('German', 'woocommerce-gateway-stripe'), | |
| 112 | +				'it'   => __('Italian', 'woocommerce-gateway-stripe'), | |
| 113 | +				'ja'   => __('Japanese', 'woocommerce-gateway-stripe'), | |
| 114 | +				'no'   => __('Norwegian', 'woocommerce-gateway-stripe'), | |
| 115 | +				'es'   => __('Spanish', 'woocommerce-gateway-stripe'), | |
| 116 | +				'sv'   => __('Swedish', 'woocommerce-gateway-stripe'), | |
| 117 | 117 | ), | 
| 118 | 118 | ), | 
| 119 | 119 | 'stripe_bitcoin' => array( | 
| 120 | - 'title' => __( 'Bitcoin Currency', 'woocommerce-gateway-stripe' ), | |
| 121 | - 'label' => __( 'Enable Bitcoin Currency', 'woocommerce-gateway-stripe' ), | |
| 120 | +			'title'       => __('Bitcoin Currency', 'woocommerce-gateway-stripe'), | |
| 121 | +			'label'       => __('Enable Bitcoin Currency', 'woocommerce-gateway-stripe'), | |
| 122 | 122 | 'type' => 'checkbox', | 
| 123 | - 'description' => __( 'If enabled, an option to accept bitcoin will show on the checkout modal. Note: Stripe Checkout needs to be enabled and store currency must be set to USD.', 'woocommerce-gateway-stripe' ), | |
| 123 | +			'description' => __('If enabled, an option to accept bitcoin will show on the checkout modal. Note: Stripe Checkout needs to be enabled and store currency must be set to USD.', 'woocommerce-gateway-stripe'), | |
| 124 | 124 | 'default' => 'no', | 
| 125 | 125 | 'desc_tip' => true, | 
| 126 | 126 | ), | 
| 127 | 127 | 'stripe_checkout_image' => array( | 
| 128 | - 'title' => __( 'Stripe Checkout Image', 'woocommerce-gateway-stripe' ), | |
| 129 | - 'description' => __( 'Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe' ), | |
| 128 | +			'title'       => __('Stripe Checkout Image', 'woocommerce-gateway-stripe'), | |
| 129 | +			'description' => __('Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe'), | |
| 130 | 130 | 'type' => 'text', | 
| 131 | 131 | 'default' => '', | 
| 132 | 132 | 'desc_tip' => true, | 
| 133 | 133 | ), | 
| 134 | 134 | 'request_payment_api' => array( | 
| 135 | - 'title' => __( 'Payment Request API', 'woocommerce-gateway-stripe' ), | |
| 136 | - 'label' => __( 'Enable Payment Request API', 'woocommerce-gateway-stripe' ), | |
| 135 | +			'title'       => __('Payment Request API', 'woocommerce-gateway-stripe'), | |
| 136 | +			'label'       => __('Enable Payment Request API', 'woocommerce-gateway-stripe'), | |
| 137 | 137 | 'type' => 'checkbox', | 
| 138 | - 'description' => __( 'If enabled, users will be able to pay using the Payment Request API if supported by the browser.', 'woocommerce-gateway-stripe' ), | |
| 138 | +			'description' => __('If enabled, users will be able to pay using the Payment Request API if supported by the browser.', 'woocommerce-gateway-stripe'), | |
| 139 | 139 | 'default' => 'no', | 
| 140 | 140 | 'desc_tip' => true, | 
| 141 | 141 | ), | 
| 142 | 142 | 'apple_pay' => array( | 
| 143 | - 'title' => __( 'Apple Pay', 'woocommerce-gateway-stripe' ), | |
| 144 | - 'label' => sprintf( __( 'Enable Apple Pay. %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', 'woocommerce-gateway-stripe' ), '<br />', '<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>', '<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>' ), | |
| 143 | +			'title'       => __('Apple Pay', 'woocommerce-gateway-stripe'), | |
| 144 | +			'label'       => sprintf(__('Enable Apple Pay. %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', 'woocommerce-gateway-stripe'), '<br />', '<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>', '<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>'), | |
| 145 | 145 | 'type' => 'checkbox', | 
| 146 | - 'description' => __( 'If enabled, users will be able to pay with Apple Pay.', 'woocommerce-gateway-stripe' ), | |
| 146 | +			'description' => __('If enabled, users will be able to pay with Apple Pay.', 'woocommerce-gateway-stripe'), | |
| 147 | 147 | 'default' => 'yes', | 
| 148 | 148 | 'desc_tip' => true, | 
| 149 | 149 | ), | 
| 150 | 150 | 'apple_pay_button' => array( | 
| 151 | - 'title' => __( 'Apple Pay Button Style', 'woocommerce-gateway-stripe' ), | |
| 152 | - 'label' => __( 'Button Style', 'woocommerce-gateway-stripe' ), | |
| 151 | +			'title'       => __('Apple Pay Button Style', 'woocommerce-gateway-stripe'), | |
| 152 | +			'label'       => __('Button Style', 'woocommerce-gateway-stripe'), | |
| 153 | 153 | 'type' => 'select', | 
| 154 | - 'description' => __( 'Select the button style you would like to show.', 'woocommerce-gateway-stripe' ), | |
| 154 | +			'description' => __('Select the button style you would like to show.', 'woocommerce-gateway-stripe'), | |
| 155 | 155 | 'default' => 'black', | 
| 156 | 156 | 'desc_tip' => true, | 
| 157 | 157 | 'options' => array( | 
| 158 | - 'black' => __( 'Black', 'woocommerce-gateway-stripe' ), | |
| 159 | - 'white' => __( 'White', 'woocommerce-gateway-stripe' ), | |
| 158 | +				'black' => __('Black', 'woocommerce-gateway-stripe'), | |
| 159 | +				'white' => __('White', 'woocommerce-gateway-stripe'), | |
| 160 | 160 | ), | 
| 161 | 161 | ), | 
| 162 | 162 | 'apple_pay_button_lang' => array( | 
| 163 | - 'title' => __( 'Apple Pay Button Language', 'woocommerce-gateway-stripe' ), | |
| 164 | - 'description' => __( 'Enter the 2 letter ISO code for the language you would like your Apple Pay Button to display in. Reference available ISO codes here <code>http://www.w3schools.com/tags/ref_language_codes.asp</code>', 'woocommerce-gateway-stripe' ), | |
| 163 | +			'title'       => __('Apple Pay Button Language', 'woocommerce-gateway-stripe'), | |
| 164 | +			'description' => __('Enter the 2 letter ISO code for the language you would like your Apple Pay Button to display in. Reference available ISO codes here <code>http://www.w3schools.com/tags/ref_language_codes.asp</code>', 'woocommerce-gateway-stripe'), | |
| 165 | 165 | 'type' => 'text', | 
| 166 | 166 | 'default' => 'en', | 
| 167 | 167 | 'desc_tip' => false, | 
| 168 | 168 | ), | 
| 169 | 169 | 'saved_cards' => array( | 
| 170 | - 'title' => __( 'Saved Cards', 'woocommerce-gateway-stripe' ), | |
| 171 | - 'label' => __( 'Enable Payment via Saved Cards', 'woocommerce-gateway-stripe' ), | |
| 170 | +			'title'       => __('Saved Cards', 'woocommerce-gateway-stripe'), | |
| 171 | +			'label'       => __('Enable Payment via Saved Cards', 'woocommerce-gateway-stripe'), | |
| 172 | 172 | 'type' => 'checkbox', | 
| 173 | - 'description' => __( 'If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe' ), | |
| 173 | +			'description' => __('If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe'), | |
| 174 | 174 | 'default' => 'no', | 
| 175 | 175 | 'desc_tip' => true, | 
| 176 | 176 | ), | 
| 177 | 177 | 'logging' => array( | 
| 178 | - 'title' => __( 'Logging', 'woocommerce-gateway-stripe' ), | |
| 179 | - 'label' => __( 'Log debug messages', 'woocommerce-gateway-stripe' ), | |
| 178 | +			'title'       => __('Logging', 'woocommerce-gateway-stripe'), | |
| 179 | +			'label'       => __('Log debug messages', 'woocommerce-gateway-stripe'), | |
| 180 | 180 | 'type' => 'checkbox', | 
| 181 | - 'description' => __( 'Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe' ), | |
| 181 | +			'description' => __('Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe'), | |
| 182 | 182 | 'default' => 'no', | 
| 183 | 183 | 'desc_tip' => true, | 
| 184 | 184 | ), | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 2 | +if ( ! defined('ABSPATH')) { | |
| 3 | 3 | exit; | 
| 4 | 4 | } | 
| 5 | 5 | |
| @@ -16,22 +16,22 @@ discard block | ||
| 16 | 16 |  	public function __construct() { | 
| 17 | 17 | parent::__construct(); | 
| 18 | 18 | |
| 19 | -		if ( class_exists( 'WC_Subscriptions_Order' ) ) { | |
| 20 | - add_action( 'woocommerce_scheduled_subscription_payment_' . $this->id, array( $this, 'scheduled_subscription_payment' ), 10, 2 ); | |
| 21 | - add_action( 'wcs_resubscribe_order_created', array( $this, 'delete_resubscribe_meta' ), 10 ); | |
| 22 | - add_action( 'wcs_renewal_order_created', array( $this, 'delete_renewal_meta' ), 10 ); | |
| 23 | - add_action( 'woocommerce_subscription_failing_payment_method_updated_stripe', array( $this, 'update_failing_payment_method' ), 10, 2 ); | |
| 19 | +		if (class_exists('WC_Subscriptions_Order')) { | |
| 20 | +			add_action('woocommerce_scheduled_subscription_payment_' . $this->id, array($this, 'scheduled_subscription_payment'), 10, 2); | |
| 21 | +			add_action('wcs_resubscribe_order_created', array($this, 'delete_resubscribe_meta'), 10); | |
| 22 | +			add_action('wcs_renewal_order_created', array($this, 'delete_renewal_meta'), 10); | |
| 23 | +			add_action('woocommerce_subscription_failing_payment_method_updated_stripe', array($this, 'update_failing_payment_method'), 10, 2); | |
| 24 | 24 | |
| 25 | 25 | // display the credit card used for a subscription in the "My Subscriptions" table | 
| 26 | - add_filter( 'woocommerce_my_subscriptions_payment_method', array( $this, 'maybe_render_subscription_payment_method' ), 10, 2 ); | |
| 26 | +			add_filter('woocommerce_my_subscriptions_payment_method', array($this, 'maybe_render_subscription_payment_method'), 10, 2); | |
| 27 | 27 | |
| 28 | 28 | // allow store managers to manually set Stripe as the payment method on a subscription | 
| 29 | - add_filter( 'woocommerce_subscription_payment_meta', array( $this, 'add_subscription_payment_meta' ), 10, 2 ); | |
| 30 | - add_filter( 'woocommerce_subscription_validate_payment_meta', array( $this, 'validate_subscription_payment_meta' ), 10, 2 ); | |
| 29 | +			add_filter('woocommerce_subscription_payment_meta', array($this, 'add_subscription_payment_meta'), 10, 2); | |
| 30 | +			add_filter('woocommerce_subscription_validate_payment_meta', array($this, 'validate_subscription_payment_meta'), 10, 2); | |
| 31 | 31 | } | 
| 32 | 32 | |
| 33 | -		if ( class_exists( 'WC_Pre_Orders_Order' ) ) { | |
| 34 | - add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this, 'process_pre_order_release_payment' ) ); | |
| 33 | +		if (class_exists('WC_Pre_Orders_Order')) { | |
| 34 | +			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this, 'process_pre_order_release_payment')); | |
| 35 | 35 | } | 
| 36 | 36 | } | 
| 37 | 37 | |
| @@ -40,8 +40,8 @@ discard block | ||
| 40 | 40 | * @param int $order_id | 
| 41 | 41 | * @return boolean | 
| 42 | 42 | */ | 
| 43 | -	protected function is_subscription( $order_id ) { | |
| 44 | - return ( function_exists( 'wcs_order_contains_subscription' ) && ( wcs_order_contains_subscription( $order_id ) || wcs_is_subscription( $order_id ) || wcs_order_contains_renewal( $order_id ) ) ); | |
| 43 | +	protected function is_subscription($order_id) { | |
| 44 | +		return (function_exists('wcs_order_contains_subscription') && (wcs_order_contains_subscription($order_id) || wcs_is_subscription($order_id) || wcs_order_contains_renewal($order_id))); | |
| 45 | 45 | } | 
| 46 | 46 | |
| 47 | 47 | /** | 
| @@ -49,8 +49,8 @@ discard block | ||
| 49 | 49 | * @param int $order_id | 
| 50 | 50 | * @return boolean | 
| 51 | 51 | */ | 
| 52 | -	protected function is_pre_order( $order_id ) { | |
| 53 | - return ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Order::order_contains_pre_order( $order_id ) ); | |
| 52 | +	protected function is_pre_order($order_id) { | |
| 53 | +		return (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Order::order_contains_pre_order($order_id)); | |
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | /** | 
| @@ -58,39 +58,39 @@ discard block | ||
| 58 | 58 | * @param int $order_id | 
| 59 | 59 | * @return array | 
| 60 | 60 | */ | 
| 61 | -	public function process_payment( $order_id, $retry = true, $force_customer = false ) { | |
| 62 | -		if ( $this->is_subscription( $order_id ) ) { | |
| 61 | +	public function process_payment($order_id, $retry = true, $force_customer = false) { | |
| 62 | +		if ($this->is_subscription($order_id)) { | |
| 63 | 63 | // Regular payment with force customer enabled | 
| 64 | - return parent::process_payment( $order_id, true, true ); | |
| 64 | + return parent::process_payment($order_id, true, true); | |
| 65 | 65 | |
| 66 | -		} elseif ( $this->is_pre_order( $order_id ) ) { | |
| 67 | - return $this->process_pre_order( $order_id, $retry, $force_customer ); | |
| 66 | +		} elseif ($this->is_pre_order($order_id)) { | |
| 67 | + return $this->process_pre_order($order_id, $retry, $force_customer); | |
| 68 | 68 | |
| 69 | 69 |  		} else { | 
| 70 | - return parent::process_payment( $order_id, $retry, $force_customer ); | |
| 70 | + return parent::process_payment($order_id, $retry, $force_customer); | |
| 71 | 71 | } | 
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | /** | 
| 75 | 75 | * Updates other subscription sources. | 
| 76 | 76 | */ | 
| 77 | -	protected function save_source( $order, $source ) { | |
| 78 | - parent::save_source( $order, $source ); | |
| 77 | +	protected function save_source($order, $source) { | |
| 78 | + parent::save_source($order, $source); | |
| 79 | 79 | |
| 80 | - $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); | |
| 80 | + $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); | |
| 81 | 81 | |
| 82 | 82 | // Also store it on the subscriptions being purchased or paid for in the order | 
| 83 | -		if ( function_exists( 'wcs_order_contains_subscription' ) && wcs_order_contains_subscription( $order_id ) ) { | |
| 84 | - $subscriptions = wcs_get_subscriptions_for_order( $order_id ); | |
| 85 | -		} elseif ( function_exists( 'wcs_order_contains_renewal' ) && wcs_order_contains_renewal( $order_id ) ) { | |
| 86 | - $subscriptions = wcs_get_subscriptions_for_renewal_order( $order_id ); | |
| 83 | +		if (function_exists('wcs_order_contains_subscription') && wcs_order_contains_subscription($order_id)) { | |
| 84 | + $subscriptions = wcs_get_subscriptions_for_order($order_id); | |
| 85 | +		} elseif (function_exists('wcs_order_contains_renewal') && wcs_order_contains_renewal($order_id)) { | |
| 86 | + $subscriptions = wcs_get_subscriptions_for_renewal_order($order_id); | |
| 87 | 87 |  		} else { | 
| 88 | 88 | $subscriptions = array(); | 
| 89 | 89 | } | 
| 90 | 90 | |
| 91 | -		foreach ( $subscriptions as $subscription ) { | |
| 92 | - update_post_meta( $subscription->id, '_stripe_customer_id', $source->customer ); | |
| 93 | - update_post_meta( $subscription->id, '_stripe_card_id', $source->source ); | |
| 91 | +		foreach ($subscriptions as $subscription) { | |
| 92 | + update_post_meta($subscription->id, '_stripe_customer_id', $source->customer); | |
| 93 | + update_post_meta($subscription->id, '_stripe_card_id', $source->source); | |
| 94 | 94 | } | 
| 95 | 95 | } | 
| 96 | 96 | |
| @@ -101,39 +101,39 @@ discard block | ||
| 101 | 101 | * @param string $stripe_token (default: '') | 
| 102 | 102 | * @param bool initial_payment | 
| 103 | 103 | */ | 
| 104 | -	public function process_subscription_payment( $order = '', $amount = 0 ) { | |
| 105 | -		if ( $amount * 100 < WC_Stripe::get_minimum_amount() ) { | |
| 106 | - return new WP_Error( 'stripe_error', sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) ); | |
| 104 | +	public function process_subscription_payment($order = '', $amount = 0) { | |
| 105 | +		if ($amount * 100 < WC_Stripe::get_minimum_amount()) { | |
| 106 | +			return new WP_Error('stripe_error', sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100))); | |
| 107 | 107 | } | 
| 108 | 108 | |
| 109 | 109 | // Get source from order | 
| 110 | - $source = $this->get_order_source( $order ); | |
| 110 | + $source = $this->get_order_source($order); | |
| 111 | 111 | |
| 112 | 112 | // If no order source was defined, use user source instead. | 
| 113 | -		if ( ! $source->customer ) { | |
| 114 | - $source = $this->get_source( $order->customer_user ); | |
| 113 | +		if ( ! $source->customer) { | |
| 114 | + $source = $this->get_source($order->customer_user); | |
| 115 | 115 | } | 
| 116 | 116 | |
| 117 | 117 | // Or fail :( | 
| 118 | -		if ( ! $source->customer ) { | |
| 119 | - return new WP_Error( 'stripe_error', __( 'Customer not found', 'woocommerce-gateway-stripe' ) ); | |
| 118 | +		if ( ! $source->customer) { | |
| 119 | +			return new WP_Error('stripe_error', __('Customer not found', 'woocommerce-gateway-stripe')); | |
| 120 | 120 | } | 
| 121 | 121 | |
| 122 | - $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); | |
| 123 | -		$this->log( "Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}" ); | |
| 122 | + $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); | |
| 123 | +		$this->log("Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}"); | |
| 124 | 124 | |
| 125 | 125 | // Make the request | 
| 126 | - $request = $this->generate_payment_request( $order, $source ); | |
| 126 | + $request = $this->generate_payment_request($order, $source); | |
| 127 | 127 | $request['capture'] = 'true'; | 
| 128 | - $request['amount'] = $this->get_stripe_amount( $amount, $request['currency'] ); | |
| 128 | + $request['amount'] = $this->get_stripe_amount($amount, $request['currency']); | |
| 129 | 129 | $request['metadata'] = array( | 
| 130 | 130 | 'payment_type' => 'recurring', | 
| 131 | 131 | ); | 
| 132 | - $response = WC_Stripe_API::request( $request ); | |
| 132 | + $response = WC_Stripe_API::request($request); | |
| 133 | 133 | |
| 134 | 134 | // Process valid response | 
| 135 | -		if ( ! is_wp_error( $response ) ) { | |
| 136 | - $this->process_response( $response, $order ); | |
| 135 | +		if ( ! is_wp_error($response)) { | |
| 136 | + $this->process_response($response, $order); | |
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | 139 | return $response; | 
| @@ -144,42 +144,42 @@ discard block | ||
| 144 | 144 | * @param int $order_id | 
| 145 | 145 | * @return array | 
| 146 | 146 | */ | 
| 147 | -	public function process_pre_order( $order_id, $retry, $force_customer ) { | |
| 148 | -		if ( WC_Pre_Orders_Order::order_requires_payment_tokenization( $order_id ) ) { | |
| 147 | +	public function process_pre_order($order_id, $retry, $force_customer) { | |
| 148 | +		if (WC_Pre_Orders_Order::order_requires_payment_tokenization($order_id)) { | |
| 149 | 149 |  			try { | 
| 150 | - $order = wc_get_order( $order_id ); | |
| 150 | + $order = wc_get_order($order_id); | |
| 151 | 151 | |
| 152 | -				if ( $order->get_total() * 100 < WC_Stripe::get_minimum_amount() ) { | |
| 153 | - throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) ); | |
| 152 | +				if ($order->get_total() * 100 < WC_Stripe::get_minimum_amount()) { | |
| 153 | +					throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100))); | |
| 154 | 154 | } | 
| 155 | 155 | |
| 156 | - $source = $this->get_source( get_current_user_id(), true ); | |
| 156 | + $source = $this->get_source(get_current_user_id(), true); | |
| 157 | 157 | |
| 158 | 158 | // We need a source on file to continue. | 
| 159 | -				if ( empty( $source->customer ) || empty( $source->source ) ) { | |
| 160 | - throw new Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) ); | |
| 159 | +				if (empty($source->customer) || empty($source->source)) { | |
| 160 | +					throw new Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe')); | |
| 161 | 161 | } | 
| 162 | 162 | |
| 163 | 163 | // Store source to order meta | 
| 164 | - $this->save_source( $order, $source ); | |
| 164 | + $this->save_source($order, $source); | |
| 165 | 165 | |
| 166 | 166 | // Remove cart | 
| 167 | 167 | WC()->cart->empty_cart(); | 
| 168 | 168 | |
| 169 | 169 | // Is pre ordered! | 
| 170 | - WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order ); | |
| 170 | + WC_Pre_Orders_Order::mark_order_as_pre_ordered($order); | |
| 171 | 171 | |
| 172 | 172 | // Return thank you page redirect | 
| 173 | 173 | return array( | 
| 174 | 174 | 'result' => 'success', | 
| 175 | - 'redirect' => $this->get_return_url( $order ), | |
| 175 | + 'redirect' => $this->get_return_url($order), | |
| 176 | 176 | ); | 
| 177 | -			} catch ( Exception $e ) { | |
| 178 | - wc_add_notice( $e->getMessage(), 'error' ); | |
| 177 | +			} catch (Exception $e) { | |
| 178 | + wc_add_notice($e->getMessage(), 'error'); | |
| 179 | 179 | return; | 
| 180 | 180 | } | 
| 181 | 181 |  		} else { | 
| 182 | - return parent::process_payment( $order_id, $retry, $force_customer ); | |
| 182 | + return parent::process_payment($order_id, $retry, $force_customer); | |
| 183 | 183 | } | 
| 184 | 184 | } | 
| 185 | 185 | |
| @@ -188,7 +188,7 @@ discard block | ||
| 188 | 188 | * @param WC_Order $order | 
| 189 | 189 | * @return void | 
| 190 | 190 | */ | 
| 191 | -	public function process_pre_order_release_payment( $order ) { | |
| 191 | +	public function process_pre_order_release_payment($order) { | |
| 192 | 192 |  		try { | 
| 193 | 193 | // Define some callbacks if the first attempt fails. | 
| 194 | 194 | $retry_callbacks = array( | 
| @@ -196,32 +196,32 @@ discard block | ||
| 196 | 196 | 'remove_order_customer_before_retry', | 
| 197 | 197 | ); | 
| 198 | 198 | |
| 199 | -			while ( 1 ) { | |
| 200 | - $source = $this->get_order_source( $order ); | |
| 201 | - $response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) ); | |
| 199 | +			while (1) { | |
| 200 | + $source = $this->get_order_source($order); | |
| 201 | + $response = WC_Stripe_API::request($this->generate_payment_request($order, $source)); | |
| 202 | 202 | |
| 203 | -				if ( is_wp_error( $response ) ) { | |
| 204 | -					if ( 0 === sizeof( $retry_callbacks ) ) { | |
| 205 | - throw new Exception( $response->get_error_message() ); | |
| 203 | +				if (is_wp_error($response)) { | |
| 204 | +					if (0 === sizeof($retry_callbacks)) { | |
| 205 | + throw new Exception($response->get_error_message()); | |
| 206 | 206 |  					} else { | 
| 207 | - $retry_callback = array_shift( $retry_callbacks ); | |
| 208 | - call_user_func( array( $this, $retry_callback ), $order ); | |
| 207 | + $retry_callback = array_shift($retry_callbacks); | |
| 208 | + call_user_func(array($this, $retry_callback), $order); | |
| 209 | 209 | } | 
| 210 | 210 |  				} else { | 
| 211 | 211 | // Successful | 
| 212 | - $this->process_response( $response, $order ); | |
| 212 | + $this->process_response($response, $order); | |
| 213 | 213 | break; | 
| 214 | 214 | } | 
| 215 | 215 | } | 
| 216 | -		} catch ( Exception $e ) { | |
| 217 | - $order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $e->getMessage() ); | |
| 216 | +		} catch (Exception $e) { | |
| 217 | +			$order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $e->getMessage()); | |
| 218 | 218 | |
| 219 | 219 | // Mark order as failed if not already set, | 
| 220 | 220 | // otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times | 
| 221 | -			if ( ! $order->has_status( 'failed' ) ) { | |
| 222 | - $order->update_status( 'failed', $order_note ); | |
| 221 | +			if ( ! $order->has_status('failed')) { | |
| 222 | +				$order->update_status('failed', $order_note); | |
| 223 | 223 |  			} else { | 
| 224 | - $order->add_order_note( $order_note ); | |
| 224 | + $order->add_order_note($order_note); | |
| 225 | 225 | } | 
| 226 | 226 | } | 
| 227 | 227 | } | 
| @@ -230,20 +230,20 @@ discard block | ||
| 230 | 230 | * Don't transfer Stripe customer/token meta to resubscribe orders. | 
| 231 | 231 | * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription | 
| 232 | 232 | */ | 
| 233 | -	public function delete_resubscribe_meta( $resubscribe_order ) { | |
| 234 | - delete_post_meta( $resubscribe_order->id, '_stripe_customer_id' ); | |
| 235 | - delete_post_meta( $resubscribe_order->id, '_stripe_card_id' ); | |
| 236 | - $this->delete_renewal_meta( $resubscribe_order ); | |
| 233 | +	public function delete_resubscribe_meta($resubscribe_order) { | |
| 234 | + delete_post_meta($resubscribe_order->id, '_stripe_customer_id'); | |
| 235 | + delete_post_meta($resubscribe_order->id, '_stripe_card_id'); | |
| 236 | + $this->delete_renewal_meta($resubscribe_order); | |
| 237 | 237 | } | 
| 238 | 238 | |
| 239 | 239 | /** | 
| 240 | 240 | * Don't transfer Stripe fee/ID meta to renewal orders. | 
| 241 | 241 | * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription | 
| 242 | 242 | */ | 
| 243 | -	public function delete_renewal_meta( $renewal_order ) { | |
| 244 | - delete_post_meta( $renewal_order->id, 'Stripe Fee' ); | |
| 245 | - delete_post_meta( $renewal_order->id, 'Net Revenue From Stripe' ); | |
| 246 | - delete_post_meta( $renewal_order->id, 'Stripe Payment ID' ); | |
| 243 | +	public function delete_renewal_meta($renewal_order) { | |
| 244 | + delete_post_meta($renewal_order->id, 'Stripe Fee'); | |
| 245 | + delete_post_meta($renewal_order->id, 'Net Revenue From Stripe'); | |
| 246 | + delete_post_meta($renewal_order->id, 'Stripe Payment ID'); | |
| 247 | 247 | return $renewal_order; | 
| 248 | 248 | } | 
| 249 | 249 | |
| @@ -253,11 +253,11 @@ discard block | ||
| 253 | 253 | * @param $amount_to_charge float The amount to charge. | 
| 254 | 254 | * @param $renewal_order WC_Order A WC_Order object created to record the renewal payment. | 
| 255 | 255 | */ | 
| 256 | -	public function scheduled_subscription_payment( $amount_to_charge, $renewal_order ) { | |
| 257 | - $response = $this->process_subscription_payment( $renewal_order, $amount_to_charge ); | |
| 256 | +	public function scheduled_subscription_payment($amount_to_charge, $renewal_order) { | |
| 257 | + $response = $this->process_subscription_payment($renewal_order, $amount_to_charge); | |
| 258 | 258 | |
| 259 | -		if ( is_wp_error( $response ) ) { | |
| 260 | - $renewal_order->update_status( 'failed', sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) ); | |
| 259 | +		if (is_wp_error($response)) { | |
| 260 | +			$renewal_order->update_status('failed', sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $response->get_error_message())); | |
| 261 | 261 | } | 
| 262 | 262 | } | 
| 263 | 263 | |
| @@ -265,18 +265,18 @@ discard block | ||
| 265 | 265 | * Remove order meta | 
| 266 | 266 | * @param object $order | 
| 267 | 267 | */ | 
| 268 | -	public function remove_order_source_before_retry( $order ) { | |
| 269 | - $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); | |
| 270 | - delete_post_meta( $order_id, '_stripe_card_id' ); | |
| 268 | +	public function remove_order_source_before_retry($order) { | |
| 269 | + $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); | |
| 270 | + delete_post_meta($order_id, '_stripe_card_id'); | |
| 271 | 271 | } | 
| 272 | 272 | |
| 273 | 273 | /** | 
| 274 | 274 | * Remove order meta | 
| 275 | 275 | * @param object $order | 
| 276 | 276 | */ | 
| 277 | -	public function remove_order_customer_before_retry( $order ) { | |
| 278 | - $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); | |
| 279 | - delete_post_meta( $order_id, '_stripe_customer_id' ); | |
| 277 | +	public function remove_order_customer_before_retry($order) { | |
| 278 | + $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); | |
| 279 | + delete_post_meta($order_id, '_stripe_customer_id'); | |
| 280 | 280 | } | 
| 281 | 281 | |
| 282 | 282 | /** | 
| @@ -288,9 +288,9 @@ discard block | ||
| 288 | 288 | * @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment). | 
| 289 | 289 | * @return void | 
| 290 | 290 | */ | 
| 291 | -	public function update_failing_payment_method( $subscription, $renewal_order ) { | |
| 292 | - update_post_meta( $subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id ); | |
| 293 | - update_post_meta( $subscription->id, '_stripe_card_id', $renewal_order->stripe_card_id ); | |
| 291 | +	public function update_failing_payment_method($subscription, $renewal_order) { | |
| 292 | + update_post_meta($subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id); | |
| 293 | + update_post_meta($subscription->id, '_stripe_card_id', $renewal_order->stripe_card_id); | |
| 294 | 294 | } | 
| 295 | 295 | |
| 296 | 296 | /** | 
| @@ -302,15 +302,15 @@ discard block | ||
| 302 | 302 | * @param WC_Subscription $subscription An instance of a subscription object | 
| 303 | 303 | * @return array | 
| 304 | 304 | */ | 
| 305 | -	public function add_subscription_payment_meta( $payment_meta, $subscription ) { | |
| 306 | - $payment_meta[ $this->id ] = array( | |
| 305 | +	public function add_subscription_payment_meta($payment_meta, $subscription) { | |
| 306 | + $payment_meta[$this->id] = array( | |
| 307 | 307 | 'post_meta' => array( | 
| 308 | 308 | '_stripe_customer_id' => array( | 
| 309 | - 'value' => get_post_meta( $subscription->id, '_stripe_customer_id', true ), | |
| 309 | + 'value' => get_post_meta($subscription->id, '_stripe_customer_id', true), | |
| 310 | 310 | 'label' => 'Stripe Customer ID', | 
| 311 | 311 | ), | 
| 312 | 312 | '_stripe_card_id' => array( | 
| 313 | - 'value' => get_post_meta( $subscription->id, '_stripe_card_id', true ), | |
| 313 | + 'value' => get_post_meta($subscription->id, '_stripe_card_id', true), | |
| 314 | 314 | 'label' => 'Stripe Card ID', | 
| 315 | 315 | ), | 
| 316 | 316 | ), | 
| @@ -327,17 +327,17 @@ discard block | ||
| 327 | 327 | * @param array $payment_meta associative array of meta data required for automatic payments | 
| 328 | 328 | * @return array | 
| 329 | 329 | */ | 
| 330 | -	public function validate_subscription_payment_meta( $payment_method_id, $payment_meta ) { | |
| 331 | -		if ( $this->id === $payment_method_id ) { | |
| 330 | +	public function validate_subscription_payment_meta($payment_method_id, $payment_meta) { | |
| 331 | +		if ($this->id === $payment_method_id) { | |
| 332 | 332 | |
| 333 | -			if ( ! isset( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) || empty( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) ) { | |
| 334 | - throw new Exception( 'A "_stripe_customer_id" value is required.' ); | |
| 335 | -			} elseif ( 0 !== strpos( $payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_' ) ) { | |
| 336 | - throw new Exception( 'Invalid customer ID. A valid "_stripe_customer_id" must begin with "cus_".' ); | |
| 333 | +			if ( ! isset($payment_meta['post_meta']['_stripe_customer_id']['value']) || empty($payment_meta['post_meta']['_stripe_customer_id']['value'])) { | |
| 334 | +				throw new Exception('A "_stripe_customer_id" value is required.'); | |
| 335 | +			} elseif (0 !== strpos($payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_')) { | |
| 336 | +				throw new Exception('Invalid customer ID. A valid "_stripe_customer_id" must begin with "cus_".'); | |
| 337 | 337 | } | 
| 338 | 338 | |
| 339 | -			if ( ! empty( $payment_meta['post_meta']['_stripe_card_id']['value'] ) && 0 !== strpos( $payment_meta['post_meta']['_stripe_card_id']['value'], 'card_' ) ) { | |
| 340 | - throw new Exception( 'Invalid card ID. A valid "_stripe_card_id" must begin with "card_".' ); | |
| 339 | +			if ( ! empty($payment_meta['post_meta']['_stripe_card_id']['value']) && 0 !== strpos($payment_meta['post_meta']['_stripe_card_id']['value'], 'card_')) { | |
| 340 | +				throw new Exception('Invalid card ID. A valid "_stripe_card_id" must begin with "card_".'); | |
| 341 | 341 | } | 
| 342 | 342 | } | 
| 343 | 343 | } | 
| @@ -350,43 +350,43 @@ discard block | ||
| 350 | 350 | * @param WC_Subscription $subscription the subscription details | 
| 351 | 351 | * @return string the subscription payment method | 
| 352 | 352 | */ | 
| 353 | -	public function maybe_render_subscription_payment_method( $payment_method_to_display, $subscription ) { | |
| 353 | +	public function maybe_render_subscription_payment_method($payment_method_to_display, $subscription) { | |
| 354 | 354 | // bail for other payment methods | 
| 355 | -		if ( $this->id !== $subscription->payment_method || ! $subscription->customer_user ) { | |
| 355 | +		if ($this->id !== $subscription->payment_method || ! $subscription->customer_user) { | |
| 356 | 356 | return $payment_method_to_display; | 
| 357 | 357 | } | 
| 358 | 358 | |
| 359 | 359 | $stripe_customer = new WC_Stripe_Customer(); | 
| 360 | - $stripe_customer_id = get_post_meta( $subscription->id, '_stripe_customer_id', true ); | |
| 361 | - $stripe_card_id = get_post_meta( $subscription->id, '_stripe_card_id', true ); | |
| 360 | + $stripe_customer_id = get_post_meta($subscription->id, '_stripe_customer_id', true); | |
| 361 | + $stripe_card_id = get_post_meta($subscription->id, '_stripe_card_id', true); | |
| 362 | 362 | |
| 363 | 363 | // If we couldn't find a Stripe customer linked to the subscription, fallback to the user meta data. | 
| 364 | -		if ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) { | |
| 364 | +		if ( ! $stripe_customer_id || ! is_string($stripe_customer_id)) { | |
| 365 | 365 | $user_id = $subscription->customer_user; | 
| 366 | - $stripe_customer_id = get_user_meta( $user_id, '_stripe_customer_id', true ); | |
| 367 | - $stripe_card_id = get_user_meta( $user_id, '_stripe_card_id', true ); | |
| 366 | + $stripe_customer_id = get_user_meta($user_id, '_stripe_customer_id', true); | |
| 367 | + $stripe_card_id = get_user_meta($user_id, '_stripe_card_id', true); | |
| 368 | 368 | } | 
| 369 | 369 | |
| 370 | 370 | // If we couldn't find a Stripe customer linked to the account, fallback to the order meta data. | 
| 371 | -		if ( ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) && false !== $subscription->order ) { | |
| 372 | - $stripe_customer_id = get_post_meta( $subscription->order->id, '_stripe_customer_id', true ); | |
| 373 | - $stripe_card_id = get_post_meta( $subscription->order->id, '_stripe_card_id', true ); | |
| 371 | +		if (( ! $stripe_customer_id || ! is_string($stripe_customer_id)) && false !== $subscription->order) { | |
| 372 | + $stripe_customer_id = get_post_meta($subscription->order->id, '_stripe_customer_id', true); | |
| 373 | + $stripe_card_id = get_post_meta($subscription->order->id, '_stripe_card_id', true); | |
| 374 | 374 | } | 
| 375 | 375 | |
| 376 | - $stripe_customer->set_id( $stripe_customer_id ); | |
| 376 | + $stripe_customer->set_id($stripe_customer_id); | |
| 377 | 377 | $cards = $stripe_customer->get_cards(); | 
| 378 | 378 | |
| 379 | -		if ( $cards ) { | |
| 379 | +		if ($cards) { | |
| 380 | 380 | $found_card = false; | 
| 381 | -			foreach ( $cards as $card ) { | |
| 382 | -				if ( $card->id === $stripe_card_id ) { | |
| 381 | +			foreach ($cards as $card) { | |
| 382 | +				if ($card->id === $stripe_card_id) { | |
| 383 | 383 | $found_card = true; | 
| 384 | - $payment_method_to_display = sprintf( __( 'Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe' ), ( isset( $card->type ) ? $card->type : $card->brand ), $card->last4 ); | |
| 384 | +					$payment_method_to_display = sprintf(__('Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe'), (isset($card->type) ? $card->type : $card->brand), $card->last4); | |
| 385 | 385 | break; | 
| 386 | 386 | } | 
| 387 | 387 | } | 
| 388 | -			if ( ! $found_card ) { | |
| 389 | - $payment_method_to_display = sprintf( __( 'Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe' ), ( isset( $cards[0]->type ) ? $cards[0]->type : $cards[0]->brand ), $cards[0]->last4 ); | |
| 388 | +			if ( ! $found_card) { | |
| 389 | +				$payment_method_to_display = sprintf(__('Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe'), (isset($cards[0]->type) ? $cards[0]->type : $cards[0]->brand), $cards[0]->last4); | |
| 390 | 390 | } | 
| 391 | 391 | } | 
| 392 | 392 | |
| @@ -401,11 +401,11 @@ discard block | ||
| 401 | 401 | * | 
| 402 | 402 | * @param string $message | 
| 403 | 403 | */ | 
| 404 | -	public function log( $message ) { | |
| 405 | - $options = get_option( 'woocommerce_stripe_settings' ); | |
| 404 | +	public function log($message) { | |
| 405 | +		$options = get_option('woocommerce_stripe_settings'); | |
| 406 | 406 | |
| 407 | -		if ( 'yes' === $options['logging'] ) { | |
| 408 | - WC_Stripe::log( $message ); | |
| 407 | +		if ('yes' === $options['logging']) { | |
| 408 | + WC_Stripe::log($message); | |
| 409 | 409 | } | 
| 410 | 410 | } | 
| 411 | 411 | } | 
| @@ -25,21 +25,21 @@ discard block | ||
| 25 | 25 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 
| 26 | 26 | */ | 
| 27 | 27 | |
| 28 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 28 | +if ( ! defined('ABSPATH')) { | |
| 29 | 29 | exit; | 
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | /** | 
| 33 | 33 | * Required minimums and constants | 
| 34 | 34 | */ | 
| 35 | -define( 'WC_STRIPE_VERSION', '3.1.3' ); | |
| 36 | -define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' ); | |
| 37 | -define( 'WC_STRIPE_MIN_WC_VER', '2.5.0' ); | |
| 38 | -define( 'WC_STRIPE_MAIN_FILE', __FILE__ ); | |
| 39 | -define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) ); | |
| 40 | -define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) ); | |
| 35 | +define('WC_STRIPE_VERSION', '3.1.3'); | |
| 36 | +define('WC_STRIPE_MIN_PHP_VER', '5.6.0'); | |
| 37 | +define('WC_STRIPE_MIN_WC_VER', '2.5.0'); | |
| 38 | +define('WC_STRIPE_MAIN_FILE', __FILE__); | |
| 39 | +define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__)))); | |
| 40 | +define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__))); | |
| 41 | 41 | |
| 42 | -if ( ! class_exists( 'WC_Stripe' ) ) : | |
| 42 | +if ( ! class_exists('WC_Stripe')) : | |
| 43 | 43 | |
| 44 | 44 |  	class WC_Stripe { | 
| 45 | 45 | |
| @@ -59,7 +59,7 @@ discard block | ||
| 59 | 59 | * @return Singleton The *Singleton* instance. | 
| 60 | 60 | */ | 
| 61 | 61 |  		public static function get_instance() { | 
| 62 | -			if ( null === self::$instance ) { | |
| 62 | +			if (null === self::$instance) { | |
| 63 | 63 | self::$instance = new self(); | 
| 64 | 64 | } | 
| 65 | 65 | return self::$instance; | 
| @@ -108,9 +108,9 @@ discard block | ||
| 108 | 108 | * *Singleton* via the `new` operator from outside of this class. | 
| 109 | 109 | */ | 
| 110 | 110 |  		protected function __construct() { | 
| 111 | - add_action( 'admin_init', array( $this, 'check_environment' ) ); | |
| 112 | - add_action( 'admin_notices', array( $this, 'admin_notices' ), 15 ); | |
| 113 | - add_action( 'plugins_loaded', array( $this, 'init' ) ); | |
| 111 | +			add_action('admin_init', array($this, 'check_environment')); | |
| 112 | +			add_action('admin_notices', array($this, 'admin_notices'), 15); | |
| 113 | +			add_action('plugins_loaded', array($this, 'init')); | |
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | /** | 
| @@ -118,35 +118,35 @@ discard block | ||
| 118 | 118 | */ | 
| 119 | 119 |  		public function init() { | 
| 120 | 120 | // Don't hook anything else in the plugin if we're in an incompatible environment | 
| 121 | -			if ( self::get_environment_warning() ) { | |
| 121 | +			if (self::get_environment_warning()) { | |
| 122 | 122 | return; | 
| 123 | 123 | } | 
| 124 | 124 | |
| 125 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' ); | |
| 126 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php' ); | |
| 125 | + include_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php'); | |
| 126 | + include_once(dirname(__FILE__) . '/includes/class-wc-stripe-customer.php'); | |
| 127 | 127 | |
| 128 | 128 | // Init the gateway itself | 
| 129 | 129 | $this->init_gateways(); | 
| 130 | 130 | |
| 131 | - add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) ); | |
| 132 | - add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) ); | |
| 133 | - add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) ); | |
| 134 | - add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'cancel_payment' ) ); | |
| 135 | - add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'cancel_payment' ) ); | |
| 136 | - add_filter( 'woocommerce_get_customer_payment_tokens', array( $this, 'woocommerce_get_customer_payment_tokens' ), 10, 3 ); | |
| 137 | - add_action( 'woocommerce_payment_token_deleted', array( $this, 'woocommerce_payment_token_deleted' ), 10, 2 ); | |
| 138 | - add_action( 'woocommerce_payment_token_set_default', array( $this, 'woocommerce_payment_token_set_default' ) ); | |
| 139 | - add_action( 'wp_ajax_stripe_dismiss_request_api_notice', array( $this, 'dismiss_request_api_notice' ) ); | |
| 140 | - add_action( 'wp_ajax_stripe_dismiss_apple_pay_notice', array( $this, 'dismiss_apple_pay_notice' ) ); | |
| 141 | - | |
| 142 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-request.php' ); | |
| 131 | +			add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links')); | |
| 132 | +			add_action('woocommerce_order_status_on-hold_to_processing', array($this, 'capture_payment')); | |
| 133 | +			add_action('woocommerce_order_status_on-hold_to_completed', array($this, 'capture_payment')); | |
| 134 | +			add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'cancel_payment')); | |
| 135 | +			add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'cancel_payment')); | |
| 136 | +			add_filter('woocommerce_get_customer_payment_tokens', array($this, 'woocommerce_get_customer_payment_tokens'), 10, 3); | |
| 137 | +			add_action('woocommerce_payment_token_deleted', array($this, 'woocommerce_payment_token_deleted'), 10, 2); | |
| 138 | +			add_action('woocommerce_payment_token_set_default', array($this, 'woocommerce_payment_token_set_default')); | |
| 139 | +			add_action('wp_ajax_stripe_dismiss_request_api_notice', array($this, 'dismiss_request_api_notice')); | |
| 140 | +			add_action('wp_ajax_stripe_dismiss_apple_pay_notice', array($this, 'dismiss_apple_pay_notice')); | |
| 141 | + | |
| 142 | + include_once(dirname(__FILE__) . '/includes/class-wc-stripe-payment-request.php'); | |
| 143 | 143 | } | 
| 144 | 144 | |
| 145 | 145 | /** | 
| 146 | 146 | * Allow this class and other classes to add slug keyed notices (to avoid duplication) | 
| 147 | 147 | */ | 
| 148 | -		public function add_admin_notice( $slug, $class, $message ) { | |
| 149 | - $this->notices[ $slug ] = array( | |
| 148 | +		public function add_admin_notice($slug, $class, $message) { | |
| 149 | + $this->notices[$slug] = array( | |
| 150 | 150 | 'class' => $class, | 
| 151 | 151 | 'message' => $message, | 
| 152 | 152 | ); | 
| @@ -157,29 +157,29 @@ discard block | ||
| 157 | 157 | * or the environment changes after activation. Also handles upgrade routines. | 
| 158 | 158 | */ | 
| 159 | 159 |  		public function check_environment() { | 
| 160 | -			if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'woocommerce_stripe_version' ) ) ) { | |
| 160 | +			if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('woocommerce_stripe_version'))) { | |
| 161 | 161 | $this->install(); | 
| 162 | 162 | |
| 163 | - do_action( 'woocommerce_stripe_updated' ); | |
| 163 | +				do_action('woocommerce_stripe_updated'); | |
| 164 | 164 | } | 
| 165 | 165 | |
| 166 | 166 | $environment_warning = self::get_environment_warning(); | 
| 167 | 167 | |
| 168 | -			if ( $environment_warning && is_plugin_active( plugin_basename( __FILE__ ) ) ) { | |
| 169 | - $this->add_admin_notice( 'bad_environment', 'error', $environment_warning ); | |
| 168 | +			if ($environment_warning && is_plugin_active(plugin_basename(__FILE__))) { | |
| 169 | +				$this->add_admin_notice('bad_environment', 'error', $environment_warning); | |
| 170 | 170 | } | 
| 171 | 171 | |
| 172 | 172 | // Check if secret key present. Otherwise prompt, via notice, to go to | 
| 173 | 173 | // setting. | 
| 174 | -			if ( ! class_exists( 'WC_Stripe_API' ) ) { | |
| 175 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' ); | |
| 174 | +			if ( ! class_exists('WC_Stripe_API')) { | |
| 175 | + include_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php'); | |
| 176 | 176 | } | 
| 177 | 177 | |
| 178 | 178 | $secret = WC_Stripe_API::get_secret_key(); | 
| 179 | 179 | |
| 180 | -			if ( empty( $secret ) && ! ( isset( $_GET['page'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'] ) ) { | |
| 180 | +			if (empty($secret) && ! (isset($_GET['page'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'])) { | |
| 181 | 181 | $setting_link = $this->get_setting_link(); | 
| 182 | - $this->add_admin_notice( 'prompt_connect', 'notice notice-warning', sprintf( __( 'Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ) ); | |
| 182 | +				$this->add_admin_notice('prompt_connect', 'notice notice-warning', sprintf(__('Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link)); | |
| 183 | 183 | } | 
| 184 | 184 | } | 
| 185 | 185 | |
| @@ -191,8 +191,8 @@ discard block | ||
| 191 | 191 | * @return bool | 
| 192 | 192 | */ | 
| 193 | 193 |  		private static function _update_plugin_version() { | 
| 194 | - delete_option( 'wc_stripe_version' ); | |
| 195 | - add_option( 'wc_stripe_version', WC_STRIPE_VERSION ); | |
| 194 | +			delete_option('wc_stripe_version'); | |
| 195 | +			add_option('wc_stripe_version', WC_STRIPE_VERSION); | |
| 196 | 196 | |
| 197 | 197 | return true; | 
| 198 | 198 | } | 
| @@ -204,7 +204,7 @@ discard block | ||
| 204 | 204 | * @version 3.1.0 | 
| 205 | 205 | */ | 
| 206 | 206 |  		public function dismiss_request_api_notice() { | 
| 207 | - add_option( 'wc_stripe_show_request_api_notice', 'no' ); | |
| 207 | +			add_option('wc_stripe_show_request_api_notice', 'no'); | |
| 208 | 208 | } | 
| 209 | 209 | |
| 210 | 210 | /** | 
| @@ -214,7 +214,7 @@ discard block | ||
| 214 | 214 | * @version 3.1.0 | 
| 215 | 215 | */ | 
| 216 | 216 |  		public function dismiss_apple_pay_notice() { | 
| 217 | - add_option( 'wc_stripe_show_apple_pay_notice', 'no' ); | |
| 217 | +			add_option('wc_stripe_show_apple_pay_notice', 'no'); | |
| 218 | 218 | } | 
| 219 | 219 | |
| 220 | 220 | /** | 
| @@ -224,8 +224,8 @@ discard block | ||
| 224 | 224 | * @version 3.1.0 | 
| 225 | 225 | */ | 
| 226 | 226 |  		public function install() { | 
| 227 | -			if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) { | |
| 228 | - define( 'WC_STRIPE_INSTALLING', true ); | |
| 227 | +			if ( ! defined('WC_STRIPE_INSTALLING')) { | |
| 228 | +				define('WC_STRIPE_INSTALLING', true); | |
| 229 | 229 | } | 
| 230 | 230 | |
| 231 | 231 | $this->_update_plugin_version(); | 
| @@ -236,24 +236,24 @@ discard block | ||
| 236 | 236 | * found or false if the environment has no problems. | 
| 237 | 237 | */ | 
| 238 | 238 |  		static function get_environment_warning() { | 
| 239 | -			if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) { | |
| 240 | - $message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' ); | |
| 239 | +			if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) { | |
| 240 | +				$message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe'); | |
| 241 | 241 | |
| 242 | - return sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() ); | |
| 242 | + return sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion()); | |
| 243 | 243 | } | 
| 244 | 244 | |
| 245 | -			if ( ! defined( 'WC_VERSION' ) ) { | |
| 246 | - return __( 'WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe' ); | |
| 245 | +			if ( ! defined('WC_VERSION')) { | |
| 246 | +				return __('WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe'); | |
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | -			if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) { | |
| 250 | - $message = __( 'WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' ); | |
| 249 | +			if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) { | |
| 250 | +				$message = __('WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe'); | |
| 251 | 251 | |
| 252 | - return sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION ); | |
| 252 | + return sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION); | |
| 253 | 253 | } | 
| 254 | 254 | |
| 255 | -			if ( ! function_exists( 'curl_init' ) ) { | |
| 256 | - return __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' ); | |
| 255 | +			if ( ! function_exists('curl_init')) { | |
| 256 | +				return __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe'); | |
| 257 | 257 | } | 
| 258 | 258 | |
| 259 | 259 | return false; | 
| @@ -264,15 +264,15 @@ discard block | ||
| 264 | 264 | * | 
| 265 | 265 | * @since 1.0.0 | 
| 266 | 266 | */ | 
| 267 | -		public function plugin_action_links( $links ) { | |
| 267 | +		public function plugin_action_links($links) { | |
| 268 | 268 | $setting_link = $this->get_setting_link(); | 
| 269 | 269 | |
| 270 | 270 | $plugin_links = array( | 
| 271 | - '<a href="' . $setting_link . '">' . __( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>', | |
| 272 | - '<a href="https://docs.woothemes.com/document/stripe/">' . __( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>', | |
| 273 | - '<a href="http://support.woothemes.com/">' . __( 'Support', 'woocommerce-gateway-stripe' ) . '</a>', | |
| 271 | +				'<a href="' . $setting_link . '">' . __('Settings', 'woocommerce-gateway-stripe') . '</a>', | |
| 272 | +				'<a href="https://docs.woothemes.com/document/stripe/">' . __('Docs', 'woocommerce-gateway-stripe') . '</a>', | |
| 273 | +				'<a href="http://support.woothemes.com/">' . __('Support', 'woocommerce-gateway-stripe') . '</a>', | |
| 274 | 274 | ); | 
| 275 | - return array_merge( $plugin_links, $links ); | |
| 275 | + return array_merge($plugin_links, $links); | |
| 276 | 276 | } | 
| 277 | 277 | |
| 278 | 278 | /** | 
| @@ -283,24 +283,24 @@ discard block | ||
| 283 | 283 | * @return string Setting link | 
| 284 | 284 | */ | 
| 285 | 285 |  		public function get_setting_link() { | 
| 286 | - $use_id_as_section = function_exists( 'WC' ) ? version_compare( WC()->version, '2.6', '>=' ) : false; | |
| 286 | +			$use_id_as_section = function_exists('WC') ? version_compare(WC()->version, '2.6', '>=') : false; | |
| 287 | 287 | |
| 288 | - $section_slug = $use_id_as_section ? 'stripe' : strtolower( 'WC_Gateway_Stripe' ); | |
| 288 | +			$section_slug = $use_id_as_section ? 'stripe' : strtolower('WC_Gateway_Stripe'); | |
| 289 | 289 | |
| 290 | - return admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=' . $section_slug ); | |
| 290 | +			return admin_url('admin.php?page=wc-settings&tab=checkout§ion=' . $section_slug); | |
| 291 | 291 | } | 
| 292 | 292 | |
| 293 | 293 | /** | 
| 294 | 294 | * Display any notices we've collected thus far (e.g. for connection, disconnection) | 
| 295 | 295 | */ | 
| 296 | 296 |  		public function admin_notices() { | 
| 297 | - $show_request_api_notice = get_option( 'wc_stripe_show_request_api_notice' ); | |
| 298 | - $show_apple_pay_notice = get_option( 'wc_stripe_show_apple_pay_notice' ); | |
| 297 | +			$show_request_api_notice = get_option('wc_stripe_show_request_api_notice'); | |
| 298 | +			$show_apple_pay_notice   = get_option('wc_stripe_show_apple_pay_notice'); | |
| 299 | 299 | |
| 300 | -			if ( empty( $show_apple_pay_notice ) ) { | |
| 300 | +			if (empty($show_apple_pay_notice)) { | |
| 301 | 301 | // @TODO remove this notice in the future. | 
| 302 | 302 | ?> | 
| 303 | - <div class="notice notice-warning wc-stripe-apple-pay-notice is-dismissible"><p><?php esc_html_e( 'New Feature! Stripe now supports Apple Pay. Your customers can now purchase your products even faster. Apple Pay has been enabled by default.', 'woocommerce-gateway-stripe' ); ?></p></div> | |
| 303 | +				<div class="notice notice-warning wc-stripe-apple-pay-notice is-dismissible"><p><?php esc_html_e('New Feature! Stripe now supports Apple Pay. Your customers can now purchase your products even faster. Apple Pay has been enabled by default.', 'woocommerce-gateway-stripe'); ?></p></div> | |
| 304 | 304 | |
| 305 | 305 | <script type="application/javascript"> | 
| 306 | 306 |  					jQuery( '.wc-stripe-apple-pay-notice' ).on( 'click', '.notice-dismiss', function() { | 
| @@ -308,17 +308,17 @@ discard block | ||
| 308 | 308 | action: 'stripe_dismiss_apple_pay_notice' | 
| 309 | 309 | }; | 
| 310 | 310 | |
| 311 | - jQuery.post( '<?php echo admin_url( 'admin-ajax.php' ); ?>', data ); | |
| 311 | +						jQuery.post( '<?php echo admin_url('admin-ajax.php'); ?>', data ); | |
| 312 | 312 | }); | 
| 313 | 313 | </script> | 
| 314 | 314 | |
| 315 | 315 | <?php | 
| 316 | 316 | } | 
| 317 | 317 | |
| 318 | -			if ( empty( $show_request_api_notice ) ) { | |
| 318 | +			if (empty($show_request_api_notice)) { | |
| 319 | 319 | // @TODO remove this notice in the future. | 
| 320 | 320 | ?> | 
| 321 | - <div class="notice notice-warning wc-stripe-request-api-notice is-dismissible"><p><?php esc_html_e( 'New Feature! Stripe now supports Google Payment Request. Your customers can now use mobile phones with supported browsers such as Chrome to make purchases easier and faster.', 'woocommerce-gateway-stripe' ); ?></p></div> | |
| 321 | +				<div class="notice notice-warning wc-stripe-request-api-notice is-dismissible"><p><?php esc_html_e('New Feature! Stripe now supports Google Payment Request. Your customers can now use mobile phones with supported browsers such as Chrome to make purchases easier and faster.', 'woocommerce-gateway-stripe'); ?></p></div> | |
| 322 | 322 | |
| 323 | 323 | <script type="application/javascript"> | 
| 324 | 324 |  					jQuery( '.wc-stripe-request-api-notice' ).on( 'click', '.notice-dismiss', function() { | 
| @@ -326,16 +326,16 @@ discard block | ||
| 326 | 326 | action: 'stripe_dismiss_request_api_notice' | 
| 327 | 327 | }; | 
| 328 | 328 | |
| 329 | - jQuery.post( '<?php echo admin_url( 'admin-ajax.php' ); ?>', data ); | |
| 329 | +						jQuery.post( '<?php echo admin_url('admin-ajax.php'); ?>', data ); | |
| 330 | 330 | }); | 
| 331 | 331 | </script> | 
| 332 | 332 | |
| 333 | 333 | <?php | 
| 334 | 334 | } | 
| 335 | 335 | |
| 336 | -			foreach ( (array) $this->notices as $notice_key => $notice ) { | |
| 337 | - echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>"; | |
| 338 | - echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) ); | |
| 336 | +			foreach ((array) $this->notices as $notice_key => $notice) { | |
| 337 | + echo "<div class='" . esc_attr($notice['class']) . "'><p>"; | |
| 338 | +				echo wp_kses($notice['message'], array('a' => array('href' => array()))); | |
| 339 | 339 | echo '</p></div>'; | 
| 340 | 340 | } | 
| 341 | 341 | } | 
| @@ -346,28 +346,28 @@ discard block | ||
| 346 | 346 | * @since 1.0.0 | 
| 347 | 347 | */ | 
| 348 | 348 |  		public function init_gateways() { | 
| 349 | -			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) { | |
| 349 | +			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) { | |
| 350 | 350 | $this->subscription_support_enabled = true; | 
| 351 | 351 | } | 
| 352 | 352 | |
| 353 | -			if ( class_exists( 'WC_Pre_Orders_Order' ) ) { | |
| 353 | +			if (class_exists('WC_Pre_Orders_Order')) { | |
| 354 | 354 | $this->pre_order_enabled = true; | 
| 355 | 355 | } | 
| 356 | 356 | |
| 357 | -			if ( ! class_exists( 'WC_Payment_Gateway' ) ) { | |
| 357 | +			if ( ! class_exists('WC_Payment_Gateway')) { | |
| 358 | 358 | return; | 
| 359 | 359 | } | 
| 360 | 360 | |
| 361 | -			if ( class_exists( 'WC_Payment_Gateway_CC' ) ) { | |
| 362 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php' ); | |
| 363 | - include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay.php' ); | |
| 361 | +			if (class_exists('WC_Payment_Gateway_CC')) { | |
| 362 | + include_once(dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php'); | |
| 363 | + include_once(dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay.php'); | |
| 364 | 364 |  			} else { | 
| 365 | - include_once( dirname( __FILE__ ) . '/includes/legacy/class-wc-gateway-stripe.php' ); | |
| 366 | - include_once( dirname( __FILE__ ) . '/includes/legacy/class-wc-gateway-stripe-saved-cards.php' ); | |
| 365 | + include_once(dirname(__FILE__) . '/includes/legacy/class-wc-gateway-stripe.php'); | |
| 366 | + include_once(dirname(__FILE__) . '/includes/legacy/class-wc-gateway-stripe-saved-cards.php'); | |
| 367 | 367 | } | 
| 368 | 368 | |
| 369 | - load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' ); | |
| 370 | - add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) ); | |
| 369 | +			load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages'); | |
| 370 | +			add_filter('woocommerce_payment_gateways', array($this, 'add_gateways')); | |
| 371 | 371 | |
| 372 | 372 | $load_addons = ( | 
| 373 | 373 | $this->subscription_support_enabled | 
| @@ -375,8 +375,8 @@ discard block | ||
| 375 | 375 | $this->pre_order_enabled | 
| 376 | 376 | ); | 
| 377 | 377 | |
| 378 | -			if ( $load_addons ) { | |
| 379 | - require_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe-addons.php' ); | |
| 378 | +			if ($load_addons) { | |
| 379 | + require_once(dirname(__FILE__) . '/includes/class-wc-gateway-stripe-addons.php'); | |
| 380 | 380 | } | 
| 381 | 381 | } | 
| 382 | 382 | |
| @@ -385,8 +385,8 @@ discard block | ||
| 385 | 385 | * | 
| 386 | 386 | * @since 1.0.0 | 
| 387 | 387 | */ | 
| 388 | -		public function add_gateways( $methods ) { | |
| 389 | -			if ( $this->subscription_support_enabled || $this->pre_order_enabled ) { | |
| 388 | +		public function add_gateways($methods) { | |
| 389 | +			if ($this->subscription_support_enabled || $this->pre_order_enabled) { | |
| 390 | 390 | $methods[] = 'WC_Gateway_Stripe_Addons'; | 
| 391 | 391 |  			} else { | 
| 392 | 392 | $methods[] = 'WC_Gateway_Stripe'; | 
| @@ -426,24 +426,24 @@ discard block | ||
| 426 | 426 | * @param object $balance_transaction | 
| 427 | 427 | * @param string $type Type of number to format | 
| 428 | 428 | */ | 
| 429 | -		public static function format_number( $balance_transaction, $type = 'fee' ) { | |
| 430 | -			if ( ! is_object( $balance_transaction ) ) { | |
| 429 | +		public static function format_number($balance_transaction, $type = 'fee') { | |
| 430 | +			if ( ! is_object($balance_transaction)) { | |
| 431 | 431 | return; | 
| 432 | 432 | } | 
| 433 | 433 | |
| 434 | -			if ( in_array( strtolower( $balance_transaction->currency ), self::no_decimal_currencies() ) ) { | |
| 435 | -				if ( 'fee' === $type ) { | |
| 434 | +			if (in_array(strtolower($balance_transaction->currency), self::no_decimal_currencies())) { | |
| 435 | +				if ('fee' === $type) { | |
| 436 | 436 | return $balance_transaction->fee; | 
| 437 | 437 | } | 
| 438 | 438 | |
| 439 | 439 | return $balance_transaction->net; | 
| 440 | 440 | } | 
| 441 | 441 | |
| 442 | -			if ( 'fee' === $type ) { | |
| 443 | - return number_format( $balance_transaction->fee / 100, 2, '.', '' ); | |
| 442 | +			if ('fee' === $type) { | |
| 443 | + return number_format($balance_transaction->fee / 100, 2, '.', ''); | |
| 444 | 444 | } | 
| 445 | 445 | |
| 446 | - return number_format( $balance_transaction->net / 100, 2, '.', '' ); | |
| 446 | + return number_format($balance_transaction->net / 100, 2, '.', ''); | |
| 447 | 447 | } | 
| 448 | 448 | |
| 449 | 449 | /** | 
| @@ -451,35 +451,35 @@ discard block | ||
| 451 | 451 | * | 
| 452 | 452 | * @param int $order_id | 
| 453 | 453 | */ | 
| 454 | -		public function capture_payment( $order_id ) { | |
| 455 | - $order = wc_get_order( $order_id ); | |
| 454 | +		public function capture_payment($order_id) { | |
| 455 | + $order = wc_get_order($order_id); | |
| 456 | 456 | |
| 457 | -			if ( 'stripe' === ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->payment_method : $order->get_payment_method() ) ) { | |
| 458 | - $charge = get_post_meta( $order_id, '_stripe_charge_id', true ); | |
| 459 | - $captured = get_post_meta( $order_id, '_stripe_charge_captured', true ); | |
| 457 | +			if ('stripe' === (version_compare(WC_VERSION, '3.0.0', '<') ? $order->payment_method : $order->get_payment_method())) { | |
| 458 | + $charge = get_post_meta($order_id, '_stripe_charge_id', true); | |
| 459 | + $captured = get_post_meta($order_id, '_stripe_charge_captured', true); | |
| 460 | 460 | |
| 461 | -				if ( $charge && 'no' === $captured ) { | |
| 462 | - $result = WC_Stripe_API::request( array( | |
| 461 | +				if ($charge && 'no' === $captured) { | |
| 462 | + $result = WC_Stripe_API::request(array( | |
| 463 | 463 | 'amount' => $order->get_total() * 100, | 
| 464 | 464 | 'expand[]' => 'balance_transaction', | 
| 465 | - ), 'charges/' . $charge . '/capture' ); | |
| 465 | + ), 'charges/' . $charge . '/capture'); | |
| 466 | 466 | |
| 467 | -					if ( is_wp_error( $result ) ) { | |
| 468 | - $order->add_order_note( __( 'Unable to capture charge!', 'woocommerce-gateway-stripe' ) . ' ' . $result->get_error_message() ); | |
| 467 | +					if (is_wp_error($result)) { | |
| 468 | +						$order->add_order_note(__('Unable to capture charge!', 'woocommerce-gateway-stripe') . ' ' . $result->get_error_message()); | |
| 469 | 469 |  					} else { | 
| 470 | - $order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) ); | |
| 471 | - update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ); | |
| 470 | +						$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id)); | |
| 471 | + update_post_meta($order_id, '_stripe_charge_captured', 'yes'); | |
| 472 | 472 | |
| 473 | 473 | // Store other data such as fees | 
| 474 | - update_post_meta( $order_id, 'Stripe Payment ID', $result->id ); | |
| 474 | + update_post_meta($order_id, 'Stripe Payment ID', $result->id); | |
| 475 | 475 | |
| 476 | -						if ( isset( $result->balance_transaction ) && isset( $result->balance_transaction->fee ) ) { | |
| 476 | +						if (isset($result->balance_transaction) && isset($result->balance_transaction->fee)) { | |
| 477 | 477 | // Fees and Net needs to both come from Stripe to be accurate as the returned | 
| 478 | 478 | // values are in the local currency of the Stripe account, not from WC. | 
| 479 | - $fee = ! empty( $result->balance_transaction->fee ) ? self::format_number( $result->balance_transaction, 'fee' ) : 0; | |
| 480 | - $net = ! empty( $result->balance_transaction->net ) ? self::format_number( $result->balance_transaction, 'net' ) : 0; | |
| 481 | - update_post_meta( $order_id, 'Stripe Fee', $fee ); | |
| 482 | - update_post_meta( $order_id, 'Net Revenue From Stripe', $net ); | |
| 479 | + $fee = ! empty($result->balance_transaction->fee) ? self::format_number($result->balance_transaction, 'fee') : 0; | |
| 480 | + $net = ! empty($result->balance_transaction->net) ? self::format_number($result->balance_transaction, 'net') : 0; | |
| 481 | + update_post_meta($order_id, 'Stripe Fee', $fee); | |
| 482 | + update_post_meta($order_id, 'Net Revenue From Stripe', $net); | |
| 483 | 483 | } | 
| 484 | 484 | } | 
| 485 | 485 | } | 
| @@ -491,23 +491,23 @@ discard block | ||
| 491 | 491 | * | 
| 492 | 492 | * @param int $order_id | 
| 493 | 493 | */ | 
| 494 | -		public function cancel_payment( $order_id ) { | |
| 495 | - $order = wc_get_order( $order_id ); | |
| 494 | +		public function cancel_payment($order_id) { | |
| 495 | + $order = wc_get_order($order_id); | |
| 496 | 496 | |
| 497 | -			if ( 'stripe' === ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->payment_method : $order->get_payment_method() ) ) { | |
| 498 | - $charge = get_post_meta( $order_id, '_stripe_charge_id', true ); | |
| 497 | +			if ('stripe' === (version_compare(WC_VERSION, '3.0.0', '<') ? $order->payment_method : $order->get_payment_method())) { | |
| 498 | + $charge = get_post_meta($order_id, '_stripe_charge_id', true); | |
| 499 | 499 | |
| 500 | -				if ( $charge ) { | |
| 501 | - $result = WC_Stripe_API::request( array( | |
| 500 | +				if ($charge) { | |
| 501 | + $result = WC_Stripe_API::request(array( | |
| 502 | 502 | 'amount' => $order->get_total() * 100, | 
| 503 | - ), 'charges/' . $charge . '/refund' ); | |
| 503 | + ), 'charges/' . $charge . '/refund'); | |
| 504 | 504 | |
| 505 | -					if ( is_wp_error( $result ) ) { | |
| 506 | - $order->add_order_note( __( 'Unable to refund charge!', 'woocommerce-gateway-stripe' ) . ' ' . $result->get_error_message() ); | |
| 505 | +					if (is_wp_error($result)) { | |
| 506 | +						$order->add_order_note(__('Unable to refund charge!', 'woocommerce-gateway-stripe') . ' ' . $result->get_error_message()); | |
| 507 | 507 |  					} else { | 
| 508 | - $order->add_order_note( sprintf( __( 'Stripe charge refunded (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) ); | |
| 509 | - delete_post_meta( $order_id, '_stripe_charge_captured' ); | |
| 510 | - delete_post_meta( $order_id, '_stripe_charge_id' ); | |
| 508 | +						$order->add_order_note(sprintf(__('Stripe charge refunded (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id)); | |
| 509 | + delete_post_meta($order_id, '_stripe_charge_captured'); | |
| 510 | + delete_post_meta($order_id, '_stripe_charge_id'); | |
| 511 | 511 | } | 
| 512 | 512 | } | 
| 513 | 513 | } | 
| @@ -518,28 +518,28 @@ discard block | ||
| 518 | 518 | * @param array $tokens | 
| 519 | 519 | * @return array | 
| 520 | 520 | */ | 
| 521 | -		public function woocommerce_get_customer_payment_tokens( $tokens, $customer_id, $gateway_id ) { | |
| 522 | -			if ( is_user_logged_in() && 'stripe' === $gateway_id && class_exists( 'WC_Payment_Token_CC' ) ) { | |
| 523 | - $stripe_customer = new WC_Stripe_Customer( $customer_id ); | |
| 521 | +		public function woocommerce_get_customer_payment_tokens($tokens, $customer_id, $gateway_id) { | |
| 522 | +			if (is_user_logged_in() && 'stripe' === $gateway_id && class_exists('WC_Payment_Token_CC')) { | |
| 523 | + $stripe_customer = new WC_Stripe_Customer($customer_id); | |
| 524 | 524 | $stripe_cards = $stripe_customer->get_cards(); | 
| 525 | 525 | $stored_tokens = array(); | 
| 526 | 526 | |
| 527 | -				foreach ( $tokens as $token ) { | |
| 527 | +				foreach ($tokens as $token) { | |
| 528 | 528 | $stored_tokens[] = $token->get_token(); | 
| 529 | 529 | } | 
| 530 | 530 | |
| 531 | -				foreach ( $stripe_cards as $card ) { | |
| 532 | -					if ( ! in_array( $card->id, $stored_tokens ) ) { | |
| 531 | +				foreach ($stripe_cards as $card) { | |
| 532 | +					if ( ! in_array($card->id, $stored_tokens)) { | |
| 533 | 533 | $token = new WC_Payment_Token_CC(); | 
| 534 | - $token->set_token( $card->id ); | |
| 535 | - $token->set_gateway_id( 'stripe' ); | |
| 536 | - $token->set_card_type( strtolower( $card->brand ) ); | |
| 537 | - $token->set_last4( $card->last4 ); | |
| 538 | - $token->set_expiry_month( $card->exp_month ); | |
| 539 | - $token->set_expiry_year( $card->exp_year ); | |
| 540 | - $token->set_user_id( $customer_id ); | |
| 534 | + $token->set_token($card->id); | |
| 535 | +						$token->set_gateway_id('stripe'); | |
| 536 | + $token->set_card_type(strtolower($card->brand)); | |
| 537 | + $token->set_last4($card->last4); | |
| 538 | + $token->set_expiry_month($card->exp_month); | |
| 539 | + $token->set_expiry_year($card->exp_year); | |
| 540 | + $token->set_user_id($customer_id); | |
| 541 | 541 | $token->save(); | 
| 542 | - $tokens[ $token->get_id() ] = $token; | |
| 542 | + $tokens[$token->get_id()] = $token; | |
| 543 | 543 | } | 
| 544 | 544 | } | 
| 545 | 545 | } | 
| @@ -549,21 +549,21 @@ discard block | ||
| 549 | 549 | /** | 
| 550 | 550 | * Delete token from Stripe | 
| 551 | 551 | */ | 
| 552 | -		public function woocommerce_payment_token_deleted( $token_id, $token ) { | |
| 553 | -			if ( 'stripe' === $token->get_gateway_id() ) { | |
| 554 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 555 | - $stripe_customer->delete_card( $token->get_token() ); | |
| 552 | +		public function woocommerce_payment_token_deleted($token_id, $token) { | |
| 553 | +			if ('stripe' === $token->get_gateway_id()) { | |
| 554 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 555 | + $stripe_customer->delete_card($token->get_token()); | |
| 556 | 556 | } | 
| 557 | 557 | } | 
| 558 | 558 | |
| 559 | 559 | /** | 
| 560 | 560 | * Set as default in Stripe | 
| 561 | 561 | */ | 
| 562 | -		public function woocommerce_payment_token_set_default( $token_id ) { | |
| 563 | - $token = WC_Payment_Tokens::get( $token_id ); | |
| 564 | -			if ( 'stripe' === $token->get_gateway_id() ) { | |
| 565 | - $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); | |
| 566 | - $stripe_customer->set_default_card( $token->get_token() ); | |
| 562 | +		public function woocommerce_payment_token_set_default($token_id) { | |
| 563 | + $token = WC_Payment_Tokens::get($token_id); | |
| 564 | +			if ('stripe' === $token->get_gateway_id()) { | |
| 565 | + $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); | |
| 566 | + $stripe_customer->set_default_card($token->get_token()); | |
| 567 | 567 | } | 
| 568 | 568 | } | 
| 569 | 569 | |
| @@ -572,7 +572,7 @@ discard block | ||
| 572 | 572 | */ | 
| 573 | 573 |  		public static function get_minimum_amount() { | 
| 574 | 574 | // Check order amount | 
| 575 | -			switch ( get_woocommerce_currency() ) { | |
| 575 | +			switch (get_woocommerce_currency()) { | |
| 576 | 576 | case 'USD': | 
| 577 | 577 | case 'CAD': | 
| 578 | 578 | case 'EUR': | 
| @@ -616,12 +616,12 @@ discard block | ||
| 616 | 616 | * And fits on your back? | 
| 617 | 617 | * It's log, log, log | 
| 618 | 618 | */ | 
| 619 | -		public static function log( $message ) { | |
| 620 | -			if ( empty( self::$log ) ) { | |
| 619 | +		public static function log($message) { | |
| 620 | +			if (empty(self::$log)) { | |
| 621 | 621 | self::$log = new WC_Logger(); | 
| 622 | 622 | } | 
| 623 | 623 | |
| 624 | - self::$log->add( 'woocommerce-gateway-stripe', $message ); | |
| 624 | +			self::$log->add('woocommerce-gateway-stripe', $message); | |
| 625 | 625 | } | 
| 626 | 626 | } | 
| 627 | 627 | |