Completed
Pull Request — master (#1083)
by Radoslav
01:45
created
includes/compat/class-wc-stripe-email-failed-authentication-retry.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @extends     WC_Email_Failed_Order
11 11
  */
12 12
 
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	exit;
15 15
 }
16 16
 
@@ -26,17 +26,17 @@  discard block
 block discarded – undo
26 26
 	 */
27 27
 	public function __construct() {
28 28
 		$this->id          = 'failed_authentication_requested';
29
-		$this->title       = __( 'Payment Authentication Requested Email', 'woocommerce-gateway-stripe' );
30
-		$this->description = __( 'Payment authentication requested emails are sent to chosen recipient(s) when an attempt to automatically process a subscription renewal payment fails because the transaction requires an SCA verification, the customer is requested to authenticate the payment, and a retry rule has been applied to notify the customer again within a certain time period.', 'woocommerce-gateway-stripe' );
29
+		$this->title       = __('Payment Authentication Requested Email', 'woocommerce-gateway-stripe');
30
+		$this->description = __('Payment authentication requested emails are sent to chosen recipient(s) when an attempt to automatically process a subscription renewal payment fails because the transaction requires an SCA verification, the customer is requested to authenticate the payment, and a retry rule has been applied to notify the customer again within a certain time period.', 'woocommerce-gateway-stripe');
31 31
 
32
-		$this->heading = __( 'Automatic renewal payment failed due to authentication required', 'woocommerce-gateway-stripe' );
33
-		$this->subject = __( '[{site_title}] Automatic payment failed for {order_number}. Customer asked to authenticate payment and will be notified again {retry_time}', 'woocommerce-gateway-stripe' );
32
+		$this->heading = __('Automatic renewal payment failed due to authentication required', 'woocommerce-gateway-stripe');
33
+		$this->subject = __('[{site_title}] Automatic payment failed for {order_number}. Customer asked to authenticate payment and will be notified again {retry_time}', 'woocommerce-gateway-stripe');
34 34
 
35 35
 		$this->template_html  = 'emails/failed-renewal-authentication-requested.php';
36 36
 		$this->template_plain = 'emails/plain/failed-renewal-authentication-requested.php';
37
-		$this->template_base  = plugin_dir_path( WC_STRIPE_MAIN_FILE ) . 'templates/';
37
+		$this->template_base  = plugin_dir_path(WC_STRIPE_MAIN_FILE) . 'templates/';
38 38
 
39
-		$this->recipient = $this->get_option( 'recipient', get_option( 'admin_email' ) );
39
+		$this->recipient = $this->get_option('recipient', get_option('admin_email'));
40 40
 
41 41
 		// We want all the parent's methods, with none of its properties, so call its parent's constructor, rather than my parent constructor.
42 42
 		WC_Email::__construct();
@@ -66,26 +66,26 @@  discard block
 block discarded – undo
66 66
 	 * @param int           $order_id The order ID.
67 67
 	 * @param WC_Order|null $order Order object.
68 68
 	 */
69
-	public function trigger( $order_id, $order = null ) {
69
+	public function trigger($order_id, $order = null) {
70 70
 		$this->object = $order;
71 71
 
72 72
 		$this->find['retry-time'] = '{retry_time}';
73
-		if ( class_exists( 'WCS_Retry_Manager' ) && function_exists( 'wcs_get_human_time_diff' ) ) {
74
-			$this->retry = WCS_Retry_Manager::store()->get_last_retry_for_order( wcs_get_objects_property( $order, 'id' ) );
75
-			$this->replace['retry-time'] = wcs_get_human_time_diff( $this->retry->get_time() );
73
+		if (class_exists('WCS_Retry_Manager') && function_exists('wcs_get_human_time_diff')) {
74
+			$this->retry = WCS_Retry_Manager::store()->get_last_retry_for_order(wcs_get_objects_property($order, 'id'));
75
+			$this->replace['retry-time'] = wcs_get_human_time_diff($this->retry->get_time());
76 76
 		} else {
77
-			WC_Stripe_Logger::log( 'WCS_Retry_Manager class or does not exist. Not able to send admnin email about customer notification for authentication required for renewal payment.' );
77
+			WC_Stripe_Logger::log('WCS_Retry_Manager class or does not exist. Not able to send admnin email about customer notification for authentication required for renewal payment.');
78 78
 			return;
79 79
 		}
80 80
 
81 81
 		$this->find['order-number']    = '{order_number}';
82 82
 		$this->replace['order-number'] = $this->object->get_order_number();
83 83
 
84
-		if ( ! $this->is_enabled() || ! $this->get_recipient() ) {
84
+		if ( ! $this->is_enabled() || ! $this->get_recipient()) {
85 85
 			return;
86 86
 		}
87 87
 
88
-		$this->send( $this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments() );
88
+		$this->send($this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments());
89 89
 	}
90 90
 
91 91
 	/**
Please login to merge, or discard this patch.
includes/compat/class-wc-stripe-email-failed-renewal-authentication.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit; // Exit if accessed directly.
4 4
 }
5 5
 
@@ -14,20 +14,20 @@  discard block
 block discarded – undo
14 14
 	 *
15 15
 	 * @param WC_Email[] $email_classes All existing instances of WooCommerce emails.
16 16
 	 */
17
-	public function __construct( $email_classes = array() ) {
17
+	public function __construct($email_classes = array()) {
18 18
 		$this->id             = 'failed_renewal_authentication';
19
-		$this->title          = __( 'Failed Subscription Renewal SCA Authentication', 'woocommerce-gateway-stripe' );
20
-		$this->description    = __( 'Sent to a customer when a renewal fails because the transaction requires an SCA verification. The email contains renewal order information and payment links.', 'woocommerce-gateway-stripe' );
19
+		$this->title          = __('Failed Subscription Renewal SCA Authentication', 'woocommerce-gateway-stripe');
20
+		$this->description    = __('Sent to a customer when a renewal fails because the transaction requires an SCA verification. The email contains renewal order information and payment links.', 'woocommerce-gateway-stripe');
21 21
 		$this->customer_email = true;
22 22
 
23 23
 		$this->template_html  = 'emails/failed-renewal-authentication.php';
24 24
 		$this->template_plain = 'emails/plain/failed-renewal-authentication.php';
25
-		$this->template_base  = plugin_dir_path( WC_STRIPE_MAIN_FILE ) . 'templates/';
25
+		$this->template_base  = plugin_dir_path(WC_STRIPE_MAIN_FILE) . 'templates/';
26 26
 
27 27
 		// Triggers the email at the correct hook.
28
-		add_action( 'wc_gateway_stripe_process_payment_authentication_required', array( $this, 'trigger' ) );
28
+		add_action('wc_gateway_stripe_process_payment_authentication_required', array($this, 'trigger'));
29 29
 
30
-		if ( isset( $email_classes['WCS_Email_Customer_Renewal_Invoice'] ) ) {
30
+		if (isset($email_classes['WCS_Email_Customer_Renewal_Invoice'])) {
31 31
 			$this->original_email = $email_classes['WCS_Email_Customer_Renewal_Invoice'];
32 32
 		}
33 33
 
@@ -40,21 +40,21 @@  discard block
 block discarded – undo
40 40
 	 *
41 41
 	 * @param WC_Order $order The order that is being paid.
42 42
 	 */
43
-	public function trigger( $order ) {
44
-		if ( function_exists( 'wcs_order_contains_subscription' ) && ( wcs_order_contains_subscription( $order->get_id() ) || wcs_is_subscription( $order->get_id() ) || wcs_order_contains_renewal( $order->get_id() ) ) ) {
45
-			parent::trigger( $order );
43
+	public function trigger($order) {
44
+		if (function_exists('wcs_order_contains_subscription') && (wcs_order_contains_subscription($order->get_id()) || wcs_is_subscription($order->get_id()) || wcs_order_contains_renewal($order->get_id()))) {
45
+			parent::trigger($order);
46 46
 
47 47
 			// Prevent the renewal email from WooCommerce Subscriptions from being sent.
48
-			if ( isset( $this->original_email ) ) {
49
-				remove_action( 'woocommerce_generated_manual_renewal_order_renewal_notification', array( $this->original_email, 'trigger' ) );
50
-				remove_action( 'woocommerce_order_status_failed_renewal_notification', array( $this->original_email, 'trigger' ) );
48
+			if (isset($this->original_email)) {
49
+				remove_action('woocommerce_generated_manual_renewal_order_renewal_notification', array($this->original_email, 'trigger'));
50
+				remove_action('woocommerce_order_status_failed_renewal_notification', array($this->original_email, 'trigger'));
51 51
 			}
52 52
 
53 53
 			// Prevent the retry email from WooCommerce Subscriptions from being sent.
54
-			add_filter( 'wcs_get_retry_rule_raw', array( $this, 'prevent_retry_notification_email' ), 100, 3 );
54
+			add_filter('wcs_get_retry_rule_raw', array($this, 'prevent_retry_notification_email'), 100, 3);
55 55
 
56 56
 			// Send email to store owner indicating communication is happening with the customer to request authentication.
57
-			add_filter( 'wcs_get_retry_rule_raw', array( $this, 'set_store_owner_custom_email' ), 100, 3 );
57
+			add_filter('wcs_get_retry_rule_raw', array($this, 'set_store_owner_custom_email'), 100, 3);
58 58
 		}
59 59
 	}
60 60
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return string
65 65
 	 */
66 66
 	public function get_default_subject() {
67
-		return __( 'Payment authorization needed for renewal of {site_title} order {order_number}', 'woocommerce-gateway-stripe' );
67
+		return __('Payment authorization needed for renewal of {site_title} order {order_number}', 'woocommerce-gateway-stripe');
68 68
 	}
69 69
 
70 70
 	/**
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 * @return string
74 74
 	 */
75 75
 	public function get_default_heading() {
76
-		return __( 'Payment authorization needed for renewal of order {order_number}', 'woocommerce-gateway-stripe' );
76
+		return __('Payment authorization needed for renewal of order {order_number}', 'woocommerce-gateway-stripe');
77 77
 	}
78 78
 
79 79
 	/**
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 	 * @param int   $order_id     The ID of the order that needs payment.
85 85
 	 * @return array
86 86
 	 */
87
-	public function prevent_retry_notification_email( $rule_array, $retry_number, $order_id ) {
88
-		if ( wcs_get_objects_property( $this->object, 'id' ) === $order_id ) {
87
+	public function prevent_retry_notification_email($rule_array, $retry_number, $order_id) {
88
+		if (wcs_get_objects_property($this->object, 'id') === $order_id) {
89 89
 			$rule_array['email_template_customer'] = '';
90 90
 		}
91 91
 
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 	 * @param int   $order_id     The ID of the order that needs payment.
101 101
 	 * @return array
102 102
 	 */
103
-	public function set_store_owner_custom_email( $rule_array, $retry_number, $order_id ) {
103
+	public function set_store_owner_custom_email($rule_array, $retry_number, $order_id) {
104 104
 		if (
105
-			wcs_get_objects_property( $this->object, 'id' ) === $order_id &&
105
+			wcs_get_objects_property($this->object, 'id') === $order_id &&
106 106
 			'' !== $rule_array['email_template_admin'] // Only send our email if a retry admin email was already going to be sent.
107 107
 		) {
108 108
 			$rule_array['email_template_admin'] = 'WC_Stripe_Email_Failed_Authentication_Retry';
Please login to merge, or discard this patch.
woocommerce-gateway-stripe.php 1 patch
Spacing   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  *
16 16
  */
17 17
 
18
-if ( ! defined( 'ABSPATH' ) ) {
18
+if ( ! defined('ABSPATH')) {
19 19
 	exit;
20 20
 }
21 21
 
@@ -29,29 +29,29 @@  discard block
 block discarded – undo
29 29
  */
30 30
 function woocommerce_stripe_missing_wc_notice() {
31 31
 	/* translators: 1. URL link. */
32
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
32
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
33 33
 }
34 34
 
35
-add_action( 'plugins_loaded', 'woocommerce_gateway_stripe_init' );
35
+add_action('plugins_loaded', 'woocommerce_gateway_stripe_init');
36 36
 
37 37
 function woocommerce_gateway_stripe_init() {
38
-	load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
38
+	load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
39 39
 
40
-	if ( ! class_exists( 'WooCommerce' ) ) {
41
-		add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
40
+	if ( ! class_exists('WooCommerce')) {
41
+		add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
42 42
 		return;
43 43
 	}
44 44
 
45
-	if ( ! class_exists( 'WC_Stripe' ) ) :
45
+	if ( ! class_exists('WC_Stripe')) :
46 46
 		/**
47 47
 		 * Required minimums and constants
48 48
 		 */
49
-		define( 'WC_STRIPE_VERSION', '4.3.0' );
50
-		define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
51
-		define( 'WC_STRIPE_MIN_WC_VER', '2.6.0' );
52
-		define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
53
-		define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
54
-		define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
49
+		define('WC_STRIPE_VERSION', '4.3.0');
50
+		define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
51
+		define('WC_STRIPE_MIN_WC_VER', '2.6.0');
52
+		define('WC_STRIPE_MAIN_FILE', __FILE__);
53
+		define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
54
+		define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
55 55
 
56 56
 		class WC_Stripe {
57 57
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 			 * @return Singleton The *Singleton* instance.
67 67
 			 */
68 68
 			public static function get_instance() {
69
-				if ( null === self::$instance ) {
69
+				if (null === self::$instance) {
70 70
 					self::$instance = new self();
71 71
 				}
72 72
 				return self::$instance;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			 * *Singleton* via the `new` operator from outside of this class.
94 94
 			 */
95 95
 			private function __construct() {
96
-				add_action( 'admin_init', array( $this, 'install' ) );
96
+				add_action('admin_init', array($this, 'install'));
97 97
 				$this->init();
98 98
 			}
99 99
 
@@ -104,52 +104,52 @@  discard block
 block discarded – undo
104 104
 			 * @version 4.0.0
105 105
 			 */
106 106
 			public function init() {
107
-				if ( is_admin() ) {
108
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-privacy.php';
107
+				if (is_admin()) {
108
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-privacy.php';
109 109
 				}
110 110
 
111
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php';
112
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php';
113
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php';
114
-				include_once dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php';
115
-				require_once dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
116
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php';
117
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php';
118
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php';
119
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
120
-				require_once dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php';
121
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
122
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
123
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
124
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
125
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
126
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
127
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
128
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
129
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
130
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
131
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php';
132
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
133
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-order-handler.php';
134
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-tokens.php';
135
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php';
136
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-intent-controller.php';
137
-
138
-				if ( is_admin() ) {
139
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php';
111
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-exception.php';
112
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-logger.php';
113
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-helper.php';
114
+				include_once dirname(__FILE__) . '/includes/class-wc-stripe-api.php';
115
+				require_once dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
116
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php';
117
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php';
118
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php';
119
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
120
+				require_once dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php';
121
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
122
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
123
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
124
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
125
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
126
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
127
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
128
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
129
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
130
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
131
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php';
132
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
133
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-order-handler.php';
134
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-payment-tokens.php';
135
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-customer.php';
136
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-intent-controller.php';
137
+
138
+				if (is_admin()) {
139
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php';
140 140
 				}
141 141
 
142 142
 				// REMOVE IN THE FUTURE.
143
-				require_once dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
143
+				require_once dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
144 144
 
145
-				add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
146
-				add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
145
+				add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
146
+				add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
147 147
 
148 148
 				// Modify emails emails.
149
-				add_filter( 'woocommerce_email_classes', array( $this, 'add_emails' ), 20 );
149
+				add_filter('woocommerce_email_classes', array($this, 'add_emails'), 20);
150 150
 
151
-				if ( version_compare( WC_VERSION, '3.4', '<' ) ) {
152
-					add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
151
+				if (version_compare(WC_VERSION, '3.4', '<')) {
152
+					add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
153 153
 				}
154 154
 			}
155 155
 
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 			 * @version 4.0.0
161 161
 			 */
162 162
 			public function update_plugin_version() {
163
-				delete_option( 'wc_stripe_version' );
164
-				update_option( 'wc_stripe_version', WC_STRIPE_VERSION );
163
+				delete_option('wc_stripe_version');
164
+				update_option('wc_stripe_version', WC_STRIPE_VERSION);
165 165
 			}
166 166
 
167 167
 			/**
@@ -171,15 +171,15 @@  discard block
 block discarded – undo
171 171
 			 * @version 3.1.0
172 172
 			 */
173 173
 			public function install() {
174
-				if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
174
+				if ( ! is_plugin_active(plugin_basename(__FILE__))) {
175 175
 					return;
176 176
 				}
177 177
 
178
-				if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
179
-					do_action( 'woocommerce_stripe_updated' );
178
+				if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
179
+					do_action('woocommerce_stripe_updated');
180 180
 
181
-					if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
182
-						define( 'WC_STRIPE_INSTALLING', true );
181
+					if ( ! defined('WC_STRIPE_INSTALLING')) {
182
+						define('WC_STRIPE_INSTALLING', true);
183 183
 					}
184 184
 
185 185
 					$this->update_plugin_version();
@@ -192,13 +192,13 @@  discard block
 block discarded – undo
192 192
 			 * @since 1.0.0
193 193
 			 * @version 4.0.0
194 194
 			 */
195
-			public function plugin_action_links( $links ) {
195
+			public function plugin_action_links($links) {
196 196
 				$plugin_links = array(
197
-					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
198
-					'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
199
-					'<a href="https://woocommerce.com/my-account/create-a-ticket?broken=primary&select=18627">' . esc_html__( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
197
+					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
198
+					'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__('Docs', 'woocommerce-gateway-stripe') . '</a>',
199
+					'<a href="https://woocommerce.com/my-account/create-a-ticket?broken=primary&select=18627">' . esc_html__('Support', 'woocommerce-gateway-stripe') . '</a>',
200 200
 				);
201
-				return array_merge( $plugin_links, $links );
201
+				return array_merge($plugin_links, $links);
202 202
 			}
203 203
 
204 204
 			/**
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
 			 * @since 1.0.0
208 208
 			 * @version 4.0.0
209 209
 			 */
210
-			public function add_gateways( $methods ) {
211
-				if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
210
+			public function add_gateways($methods) {
211
+				if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
212 212
 					$methods[] = 'WC_Stripe_Subs_Compat';
213 213
 					$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
214 214
 				} else {
@@ -234,28 +234,28 @@  discard block
 block discarded – undo
234 234
 			 * @since 4.0.0
235 235
 			 * @version 4.0.0
236 236
 			 */
237
-			public function filter_gateway_order_admin( $sections ) {
238
-				unset( $sections['stripe'] );
239
-				unset( $sections['stripe_bancontact'] );
240
-				unset( $sections['stripe_sofort'] );
241
-				unset( $sections['stripe_giropay'] );
242
-				unset( $sections['stripe_eps'] );
243
-				unset( $sections['stripe_ideal'] );
244
-				unset( $sections['stripe_p24'] );
245
-				unset( $sections['stripe_alipay'] );
246
-				unset( $sections['stripe_sepa'] );
247
-				unset( $sections['stripe_multibanco'] );
237
+			public function filter_gateway_order_admin($sections) {
238
+				unset($sections['stripe']);
239
+				unset($sections['stripe_bancontact']);
240
+				unset($sections['stripe_sofort']);
241
+				unset($sections['stripe_giropay']);
242
+				unset($sections['stripe_eps']);
243
+				unset($sections['stripe_ideal']);
244
+				unset($sections['stripe_p24']);
245
+				unset($sections['stripe_alipay']);
246
+				unset($sections['stripe_sepa']);
247
+				unset($sections['stripe_multibanco']);
248 248
 
249 249
 				$sections['stripe']            = 'Stripe';
250
-				$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
251
-				$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
252
-				$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
253
-				$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
254
-				$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
255
-				$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
256
-				$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
257
-				$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
258
-				$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
250
+				$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
251
+				$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
252
+				$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
253
+				$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
254
+				$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
255
+				$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
256
+				$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
257
+				$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
258
+				$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
259 259
 
260 260
 				return $sections;
261 261
 			}
@@ -266,16 +266,16 @@  discard block
 block discarded – undo
266 266
 			 * @param WC_Email[] $email_classes All existing emails.
267 267
 			 * @return WC_Email[]
268 268
 			 */
269
-			public function add_emails( $email_classes ) {
269
+			public function add_emails($email_classes) {
270 270
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication.php';
271 271
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-renewal-authentication.php';
272 272
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-preorder-authentication.php';
273 273
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication-retry.php';
274 274
 
275 275
 				// Add all emails, generated by the gateway.
276
-				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication( $email_classes );
277
-				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication( $email_classes );
278
-				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry( $email_classes );
276
+				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication($email_classes);
277
+				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication($email_classes);
278
+				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry($email_classes);
279 279
 
280 280
 				return $email_classes;
281 281
 			}
Please login to merge, or discard this patch.
includes/class-wc-stripe-apple-pay-registration.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * @since 4.0.6
6 6
  */
7 7
 
8
-if ( ! defined( 'ABSPATH' ) ) {
8
+if ( ! defined('ABSPATH')) {
9 9
 	exit;
10 10
 }
11 11
 
@@ -60,23 +60,23 @@  discard block
 block discarded – undo
60 60
 	public $apple_pay_verify_notice;
61 61
 
62 62
 	public function __construct() {
63
-		add_action( 'woocommerce_stripe_updated', array( $this, 'update_verification_file' ) );
63
+		add_action('woocommerce_stripe_updated', array($this, 'update_verification_file'));
64 64
 
65
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
66
-		$this->stripe_enabled          = $this->get_option( 'enabled' );
67
-		$this->payment_request         = 'yes' === $this->get_option( 'payment_request', 'yes' );
68
-		$this->apple_pay_domain_set    = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' );
65
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
66
+		$this->stripe_enabled          = $this->get_option('enabled');
67
+		$this->payment_request         = 'yes' === $this->get_option('payment_request', 'yes');
68
+		$this->apple_pay_domain_set    = 'yes' === $this->get_option('apple_pay_domain_set', 'no');
69 69
 		$this->apple_pay_verify_notice = '';
70
-		$this->testmode                = 'yes' === $this->get_option( 'testmode', 'no' );
71
-		$this->secret_key              = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
70
+		$this->testmode                = 'yes' === $this->get_option('testmode', 'no');
71
+		$this->secret_key              = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
72 72
 
73
-		if ( empty( $this->stripe_settings ) ) {
73
+		if (empty($this->stripe_settings)) {
74 74
 			return;
75 75
 		}
76 76
 
77 77
 		$this->init_apple_pay();
78 78
 
79
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
79
+		add_action('admin_notices', array($this, 'admin_notices'));
80 80
 	}
81 81
 
82 82
 	/**
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
 	 * @param string default
88 88
 	 * @return string $setting_value
89 89
 	 */
90
-	public function get_option( $setting = '', $default = '' ) {
91
-		if ( empty( $this->stripe_settings ) ) {
90
+	public function get_option($setting = '', $default = '') {
91
+		if (empty($this->stripe_settings)) {
92 92
 			return $default;
93 93
 		}
94 94
 
95
-		if ( ! empty( $this->stripe_settings[ $setting ] ) ) {
96
-			return $this->stripe_settings[ $setting ];
95
+		if ( ! empty($this->stripe_settings[$setting])) {
96
+			return $this->stripe_settings[$setting];
97 97
 		}
98 98
 
99 99
 		return $default;
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 	public function init_apple_pay() {
109 109
 		if (
110 110
 			is_admin() &&
111
-			isset( $_GET['page'] ) && 'wc-settings' === $_GET['page'] &&
112
-			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
113
-			isset( $_GET['section'] ) && 'stripe' === $_GET['section'] &&
111
+			isset($_GET['page']) && 'wc-settings' === $_GET['page'] &&
112
+			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
113
+			isset($_GET['section']) && 'stripe' === $_GET['section'] &&
114 114
 			$this->payment_request
115 115
 		) {
116 116
 			$this->process_apple_pay_verification();
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 	 * @version 3.1.0
125 125
 	 * @param string $secret_key
126 126
 	 */
127
-	private function register_apple_pay_domain( $secret_key = '' ) {
128
-		if ( empty( $secret_key ) ) {
129
-			throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) );
127
+	private function register_apple_pay_domain($secret_key = '') {
128
+		if (empty($secret_key)) {
129
+			throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe'));
130 130
 		}
131 131
 
132 132
 		$endpoint = 'https://api.stripe.com/v1/apple_pay/domains';
@@ -144,22 +144,22 @@  discard block
 block discarded – undo
144 144
 			$endpoint,
145 145
 			array(
146 146
 				'headers' => $headers,
147
-				'body'    => http_build_query( $data ),
147
+				'body'    => http_build_query($data),
148 148
 			)
149 149
 		);
150 150
 
151
-		if ( is_wp_error( $response ) ) {
151
+		if (is_wp_error($response)) {
152 152
 			/* translators: error message */
153
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
153
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message()));
154 154
 		}
155 155
 
156
-		if ( 200 !== $response['response']['code'] ) {
157
-			$parsed_response = json_decode( $response['body'] );
156
+		if (200 !== $response['response']['code']) {
157
+			$parsed_response = json_decode($response['body']);
158 158
 
159 159
 			$this->apple_pay_verify_notice = $parsed_response->error->message;
160 160
 
161 161
 			/* translators: error message */
162
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) );
162
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message));
163 163
 		}
164 164
 	}
165 165
 
@@ -172,31 +172,31 @@  discard block
 block discarded – undo
172 172
 	 * @since 4.3.0
173 173
 	 * @return bool True on success, false on failure.
174 174
 	 */
175
-	public function update_verification_file( $force = false ) {
176
-			$path     = untrailingslashit( $_SERVER['DOCUMENT_ROOT'] );
175
+	public function update_verification_file($force = false) {
176
+			$path     = untrailingslashit($_SERVER['DOCUMENT_ROOT']);
177 177
 			$dir      = '.well-known';
178 178
 			$file     = 'apple-developer-merchantid-domain-association';
179 179
 			$fullpath = $path . '/' . $dir . '/' . $file;
180 180
 
181
-			$existing_contents = @file_get_contents( $fullpath );
182
-			$new_contents = @file_get_contents( WC_STRIPE_PLUGIN_PATH . '/' . $file );
183
-			if ( ( ! $existing_contents && ! $force ) || $existing_contents === $new_contents ) {
181
+			$existing_contents = @file_get_contents($fullpath);
182
+			$new_contents = @file_get_contents(WC_STRIPE_PLUGIN_PATH . '/' . $file);
183
+			if (( ! $existing_contents && ! $force) || $existing_contents === $new_contents) {
184 184
 				return true;
185 185
 			}
186 186
 
187
-			if ( ! file_exists( $path . '/' . $dir ) ) {
188
-				if ( ! @mkdir( $path . '/' . $dir, 0755 ) ) { // @codingStandardsIgnoreLine
189
-					WC_Stripe_Logger::log( 'Error: ' . __( 'Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe' ) );
187
+			if ( ! file_exists($path . '/' . $dir)) {
188
+				if ( ! @mkdir($path . '/' . $dir, 0755)) { // @codingStandardsIgnoreLine
189
+					WC_Stripe_Logger::log('Error: ' . __('Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe'));
190 190
 					return false;
191 191
 				}
192 192
 			}
193 193
 
194
-			if ( ! @copy( WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath ) ) { // @codingStandardsIgnoreLine
195
-				WC_Stripe_Logger::log( 'Error: ' . __( 'Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe' ) );
194
+			if ( ! @copy(WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath)) { // @codingStandardsIgnoreLine
195
+				WC_Stripe_Logger::log('Error: ' . __('Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe'));
196 196
 				return false;
197 197
 			}
198 198
 
199
-			WC_Stripe_Logger::log( 'Domain association file updated.' );
199
+			WC_Stripe_Logger::log('Domain association file updated.');
200 200
 			return true;
201 201
 	}
202 202
 
@@ -207,31 +207,31 @@  discard block
 block discarded – undo
207 207
 	 * @version 3.1.0
208 208
 	 */
209 209
 	public function process_apple_pay_verification() {
210
-		if ( ! $this->update_verification_file( true ) ) {
210
+		if ( ! $this->update_verification_file(true)) {
211 211
 			$this->stripe_settings['apple_pay_domain_set'] = 'no';
212
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
212
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
213 213
 			return;
214 214
 		}
215 215
 
216 216
 		try {
217 217
 			// At this point then the domain association folder and file should be available.
218 218
 			// Proceed to verify/and or verify again.
219
-			$this->register_apple_pay_domain( $this->secret_key );
219
+			$this->register_apple_pay_domain($this->secret_key);
220 220
 
221 221
 			// No errors to this point, verification success!
222 222
 			$this->stripe_settings['apple_pay_domain_set'] = 'yes';
223 223
 			$this->apple_pay_domain_set                    = true;
224 224
 
225
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
225
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
226 226
 
227
-			WC_Stripe_Logger::log( 'Your domain has been verified with Apple Pay!' );
227
+			WC_Stripe_Logger::log('Your domain has been verified with Apple Pay!');
228 228
 
229
-		} catch ( Exception $e ) {
229
+		} catch (Exception $e) {
230 230
 			$this->stripe_settings['apple_pay_domain_set'] = 'no';
231 231
 
232
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
232
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
233 233
 
234
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
234
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
235 235
 		}
236 236
 	}
237 237
 
@@ -241,15 +241,15 @@  discard block
 block discarded – undo
241 241
 	 * @since 4.0.6
242 242
 	 */
243 243
 	public function admin_notices() {
244
-		if ( ! $this->stripe_enabled ) {
244
+		if ( ! $this->stripe_enabled) {
245 245
 			return;
246 246
 		}
247 247
 
248
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
248
+		if ( ! current_user_can('manage_woocommerce')) {
249 249
 			return;
250 250
 		}
251 251
 
252
-		if ( $this->payment_request && ! empty( $this->apple_pay_verify_notice ) ) {
252
+		if ($this->payment_request && ! empty($this->apple_pay_verify_notice)) {
253 253
 			$allowed_html = array(
254 254
 				'a' => array(
255 255
 					'href'  => array(),
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 				),
258 258
 			);
259 259
 
260
-			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses( make_clickable( $this->apple_pay_verify_notice ), $allowed_html ) . '</p></div>';
260
+			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses(make_clickable($this->apple_pay_verify_notice), $allowed_html) . '</p></div>';
261 261
 		}
262 262
 
263 263
 		/**
@@ -265,9 +265,9 @@  discard block
 block discarded – undo
265 265
 		 * when setting screen is displayed. So if domain verification is not set,
266 266
 		 * something went wrong so lets notify user.
267 267
 		 */
268
-		if ( ! empty( $this->secret_key ) && $this->payment_request && ! $this->apple_pay_domain_set ) {
268
+		if ( ! empty($this->secret_key) && $this->payment_request && ! $this->apple_pay_domain_set) {
269 269
 			/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
270
-			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf( __( 'Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe' ), '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', '</a>' ) . '</p></div>';
270
+			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf(__('Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe'), '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', '</a>') . '</p></div>';
271 271
 		}
272 272
 	}
273 273
 }
Please login to merge, or discard this patch.
includes/class-wc-stripe-order-handler.php 1 patch
Spacing   +105 added lines, -105 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit;
4 4
 }
5 5
 
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
 
24 24
 		$this->retry_interval = 1;
25 25
 
26
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
27
-		add_action( 'woocommerce_order_status_processing', array( $this, 'capture_payment' ) );
28
-		add_action( 'woocommerce_order_status_completed', array( $this, 'capture_payment' ) );
29
-		add_action( 'woocommerce_order_status_cancelled', array( $this, 'cancel_payment' ) );
30
-		add_action( 'woocommerce_order_status_refunded', array( $this, 'cancel_payment' ) );
26
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
27
+		add_action('woocommerce_order_status_processing', array($this, 'capture_payment'));
28
+		add_action('woocommerce_order_status_completed', array($this, 'capture_payment'));
29
+		add_action('woocommerce_order_status_cancelled', array($this, 'cancel_payment'));
30
+		add_action('woocommerce_order_status_refunded', array($this, 'cancel_payment'));
31 31
 	}
32 32
 
33 33
 	/**
@@ -51,25 +51,25 @@  discard block
 block discarded – undo
51 51
 	 * @param bool $retry
52 52
 	 * @param mix $previous_error Any error message from previous request.
53 53
 	 */
54
-	public function process_redirect_payment( $order_id, $retry = true, $previous_error = false ) {
54
+	public function process_redirect_payment($order_id, $retry = true, $previous_error = false) {
55 55
 		try {
56
-			$source = wc_clean( $_GET['source'] );
56
+			$source = wc_clean($_GET['source']);
57 57
 
58
-			if ( empty( $source ) ) {
58
+			if (empty($source)) {
59 59
 				return;
60 60
 			}
61 61
 
62
-			if ( empty( $order_id ) ) {
62
+			if (empty($order_id)) {
63 63
 				return;
64 64
 			}
65 65
 
66
-			$order = wc_get_order( $order_id );
66
+			$order = wc_get_order($order_id);
67 67
 
68
-			if ( ! is_object( $order ) ) {
68
+			if ( ! is_object($order)) {
69 69
 				return;
70 70
 			}
71 71
 
72
-			if ( $order->has_status( array( 'processing', 'completed', 'on-hold' ) ) ) {
72
+			if ($order->has_status(array('processing', 'completed', 'on-hold'))) {
73 73
 				return;
74 74
 			}
75 75
 
@@ -77,124 +77,124 @@  discard block
 block discarded – undo
77 77
 			$response = null;
78 78
 
79 79
 			// This will throw exception if not valid.
80
-			$this->validate_minimum_order_amount( $order );
80
+			$this->validate_minimum_order_amount($order);
81 81
 
82
-			WC_Stripe_Logger::log( "Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
82
+			WC_Stripe_Logger::log("Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
83 83
 
84 84
 			/**
85 85
 			 * First check if the source is chargeable at this time. If not,
86 86
 			 * webhook will take care of it later.
87 87
 			 */
88
-			$source_info = WC_Stripe_API::retrieve( 'sources/' . $source );
88
+			$source_info = WC_Stripe_API::retrieve('sources/' . $source);
89 89
 
90
-			if ( ! empty( $source_info->error ) ) {
91
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), $source_info->error->message );
90
+			if ( ! empty($source_info->error)) {
91
+				throw new WC_Stripe_Exception(print_r($source_info, true), $source_info->error->message);
92 92
 			}
93 93
 
94
-			if ( 'failed' === $source_info->status || 'canceled' === $source_info->status ) {
95
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), __( 'Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe' ) );
94
+			if ('failed' === $source_info->status || 'canceled' === $source_info->status) {
95
+				throw new WC_Stripe_Exception(print_r($source_info, true), __('Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe'));
96 96
 			}
97 97
 
98 98
 			// If already consumed, then ignore request.
99
-			if ( 'consumed' === $source_info->status ) {
99
+			if ('consumed' === $source_info->status) {
100 100
 				return;
101 101
 			}
102 102
 
103 103
 			// If not chargeable, then ignore request.
104
-			if ( 'chargeable' !== $source_info->status ) {
104
+			if ('chargeable' !== $source_info->status) {
105 105
 				return;
106 106
 			}
107 107
 
108 108
 			// Prep source object.
109 109
 			$source_object           = new stdClass();
110 110
 			$source_object->token_id = '';
111
-			$source_object->customer = $this->get_stripe_customer_id( $order );
111
+			$source_object->customer = $this->get_stripe_customer_id($order);
112 112
 			$source_object->source   = $source_info->id;
113 113
 			$source_object->status   = 'chargeable';
114 114
 
115 115
 			/* If we're doing a retry and source is chargeable, we need to pass
116 116
 			 * a different idempotency key and retry for success.
117 117
 			 */
118
-			if ( $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
119
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
118
+			if ($this->need_update_idempotency_key($source_object, $previous_error)) {
119
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
120 120
 			}
121 121
 
122 122
 			// Make the request.
123
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
123
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
124 124
 			$headers  = $response['headers'];
125 125
 			$response = $response['body'];
126 126
 
127
-			if ( ! empty( $response->error ) ) {
127
+			if ( ! empty($response->error)) {
128 128
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
129
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
130
-					if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
131
-						delete_user_meta( $order->customer_user, '_stripe_customer_id' );
132
-						delete_post_meta( $order_id, '_stripe_customer_id' );
129
+				if ($this->is_no_such_customer_error($response->error)) {
130
+					if (WC_Stripe_Helper::is_wc_lt('3.0')) {
131
+						delete_user_meta($order->customer_user, '_stripe_customer_id');
132
+						delete_post_meta($order_id, '_stripe_customer_id');
133 133
 					} else {
134
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
135
-						$order->delete_meta_data( '_stripe_customer_id' );
134
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
135
+						$order->delete_meta_data('_stripe_customer_id');
136 136
 						$order->save();
137 137
 					}
138 138
 				}
139 139
 
140
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
140
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
141 141
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
142
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
142
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
143 143
 					$wc_token->delete();
144
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
145
-					$order->add_order_note( $localized_message );
146
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
144
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
145
+					$order->add_order_note($localized_message);
146
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
147 147
 				}
148 148
 
149 149
 				// We want to retry.
150
-				if ( $this->is_retryable_error( $response->error ) ) {
151
-					if ( $retry ) {
150
+				if ($this->is_retryable_error($response->error)) {
151
+					if ($retry) {
152 152
 						// Don't do anymore retries after this.
153
-						if ( 5 <= $this->retry_interval ) {
154
-							return $this->process_redirect_payment( $order_id, false, $response->error );
153
+						if (5 <= $this->retry_interval) {
154
+							return $this->process_redirect_payment($order_id, false, $response->error);
155 155
 						}
156 156
 
157
-						sleep( $this->retry_interval );
157
+						sleep($this->retry_interval);
158 158
 
159 159
 						$this->retry_interval++;
160
-						return $this->process_redirect_payment( $order_id, true, $response->error );
160
+						return $this->process_redirect_payment($order_id, true, $response->error);
161 161
 					} else {
162
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
163
-						$order->add_order_note( $localized_message );
164
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
162
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
163
+						$order->add_order_note($localized_message);
164
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
165 165
 					}
166 166
 				}
167 167
 
168 168
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
169 169
 
170
-				if ( 'card_error' === $response->error->type ) {
171
-					$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
170
+				if ('card_error' === $response->error->type) {
171
+					$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
172 172
 				} else {
173
-					$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
173
+					$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
174 174
 				}
175 175
 
176
-				throw new WC_Stripe_Exception( print_r( $response, true ), $message );
176
+				throw new WC_Stripe_Exception(print_r($response, true), $message);
177 177
 			}
178 178
 
179 179
 			// To prevent double processing the order on WC side.
180
-			if ( ! $this->is_original_request( $headers ) ) {
180
+			if ( ! $this->is_original_request($headers)) {
181 181
 				return;
182 182
 			}
183 183
 
184
-			do_action( 'wc_gateway_stripe_process_redirect_payment', $response, $order );
184
+			do_action('wc_gateway_stripe_process_redirect_payment', $response, $order);
185 185
 
186
-			$this->process_response( $response, $order );
186
+			$this->process_response($response, $order);
187 187
 
188
-		} catch ( WC_Stripe_Exception $e ) {
189
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
188
+		} catch (WC_Stripe_Exception $e) {
189
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
190 190
 
191
-			do_action( 'wc_gateway_stripe_process_redirect_payment_error', $e, $order );
191
+			do_action('wc_gateway_stripe_process_redirect_payment_error', $e, $order);
192 192
 
193 193
 			/* translators: error message */
194
-			$order->update_status( 'failed', sprintf( __( 'Stripe payment failed: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() ) );
194
+			$order->update_status('failed', sprintf(__('Stripe payment failed: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage()));
195 195
 
196
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
197
-			wp_safe_redirect( wc_get_checkout_url() );
196
+			wc_add_notice($e->getLocalizedMessage(), 'error');
197
+			wp_safe_redirect(wc_get_checkout_url());
198 198
 			exit;
199 199
 		}
200 200
 	}
@@ -206,13 +206,13 @@  discard block
 block discarded – undo
206 206
 	 * @version 4.0.0
207 207
 	 */
208 208
 	public function maybe_process_redirect_order() {
209
-		if ( ! is_order_received_page() || empty( $_GET['client_secret'] ) || empty( $_GET['source'] ) ) {
209
+		if ( ! is_order_received_page() || empty($_GET['client_secret']) || empty($_GET['source'])) {
210 210
 			return;
211 211
 		}
212 212
 
213
-		$order_id = wc_clean( $_GET['order_id'] );
213
+		$order_id = wc_clean($_GET['order_id']);
214 214
 
215
-		$this->process_redirect_payment( $order_id );
215
+		$this->process_redirect_payment($order_id);
216 216
 	}
217 217
 
218 218
 	/**
@@ -222,92 +222,92 @@  discard block
 block discarded – undo
222 222
 	 * @version 4.0.0
223 223
 	 * @param  int $order_id
224 224
 	 */
225
-	public function capture_payment( $order_id ) {
226
-		$order = wc_get_order( $order_id );
225
+	public function capture_payment($order_id) {
226
+		$order = wc_get_order($order_id);
227 227
 
228
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
229
-			$charge             = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
230
-			$captured           = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
228
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
229
+			$charge             = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
230
+			$captured           = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
231 231
 			$is_stripe_captured = false;
232 232
 
233
-			if ( $charge && 'no' === $captured ) {
233
+			if ($charge && 'no' === $captured) {
234 234
 				$order_total = $order->get_total();
235 235
 
236
-				if ( 0 < $order->get_total_refunded() ) {
236
+				if (0 < $order->get_total_refunded()) {
237 237
 					$order_total = $order_total - $order->get_total_refunded();
238 238
 				}
239 239
 
240
-				$intent = $this->get_intent_from_order( $order );
241
-				if ( $intent ) {
240
+				$intent = $this->get_intent_from_order($order);
241
+				if ($intent) {
242 242
 					// If the order has a Payment Intent, then the Intent itself must be captured, not the Charge
243
-					if ( ! empty( $intent->error ) ) {
243
+					if ( ! empty($intent->error)) {
244 244
 						/* translators: error message */
245
-						$order->add_order_note( sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $intent->error->message ) );
246
-					} elseif ( 'requires_capture' === $intent->status ) {
245
+						$order->add_order_note(sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $intent->error->message));
246
+					} elseif ('requires_capture' === $intent->status) {
247 247
 						$result = WC_Stripe_API::request(
248 248
 							array(
249
-								'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
249
+								'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
250 250
 								'expand[]' => 'charges.data.balance_transaction',
251 251
 							),
252 252
 							'payment_intents/' . $intent->id . '/capture'
253 253
 						);
254 254
 
255
-						if ( ! empty( $result->error ) ) {
255
+						if ( ! empty($result->error)) {
256 256
 							/* translators: error message */
257
-							$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
257
+							$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
258 258
 						} else {
259 259
 							$is_stripe_captured = true;
260
-							$result = end( $result->charges->data );
260
+							$result = end($result->charges->data);
261 261
 						}
262
-					} elseif ( 'succeeded' === $intent->status ) {
262
+					} elseif ('succeeded' === $intent->status) {
263 263
 						$is_stripe_captured = true;
264 264
 					}
265 265
 				} else {
266 266
 					// The order doesn't have a Payment Intent, fall back to capturing the Charge directly
267 267
 
268 268
 					// First retrieve charge to see if it has been captured.
269
-					$result = WC_Stripe_API::retrieve( 'charges/' . $charge );
269
+					$result = WC_Stripe_API::retrieve('charges/' . $charge);
270 270
 
271
-					if ( ! empty( $result->error ) ) {
271
+					if ( ! empty($result->error)) {
272 272
 						/* translators: error message */
273
-						$order->add_order_note( sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
274
-					} elseif ( false === $result->captured ) {
273
+						$order->add_order_note(sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
274
+					} elseif (false === $result->captured) {
275 275
 						$result = WC_Stripe_API::request(
276 276
 							array(
277
-								'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
277
+								'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
278 278
 								'expand[]' => 'balance_transaction',
279 279
 							),
280 280
 							'charges/' . $charge . '/capture'
281 281
 						);
282 282
 
283
-						if ( ! empty( $result->error ) ) {
283
+						if ( ! empty($result->error)) {
284 284
 							/* translators: error message */
285
-							$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
285
+							$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
286 286
 						} else {
287 287
 							$is_stripe_captured = true;
288 288
 						}
289
-					} elseif ( true === $result->captured ) {
289
+					} elseif (true === $result->captured) {
290 290
 						$is_stripe_captured = true;
291 291
 					}
292 292
 				}
293 293
 
294
-				if ( $is_stripe_captured ) {
294
+				if ($is_stripe_captured) {
295 295
 					/* translators: transaction id */
296
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
297
-					WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
296
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
297
+					WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
298 298
 
299 299
 					// Store other data such as fees
300
-					WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_transaction_id', $result->id ) : $order->set_transaction_id( $result->id );
300
+					WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
301 301
 
302
-					if ( is_callable( array( $order, 'save' ) ) ) {
302
+					if (is_callable(array($order, 'save'))) {
303 303
 						$order->save();
304 304
 					}
305 305
 
306
-					$this->update_fees( $order, $result->balance_transaction->id );
306
+					$this->update_fees($order, $result->balance_transaction->id);
307 307
 				}
308 308
 
309 309
 				// This hook fires when admin manually changes order status to processing or completed.
310
-				do_action( 'woocommerce_stripe_process_manual_capture', $order, $result );
310
+				do_action('woocommerce_stripe_process_manual_capture', $order, $result);
311 311
 			}
312 312
 		}
313 313
 	}
@@ -319,19 +319,19 @@  discard block
 block discarded – undo
319 319
 	 * @version 4.2.2
320 320
 	 * @param  int $order_id
321 321
 	 */
322
-	public function cancel_payment( $order_id ) {
323
-		$order = wc_get_order( $order_id );
324
-
325
-		if ( 'stripe' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method() ) ) {
326
-			$captured = WC_Stripe_Helper::is_wc_lt( '3.0' )
327
-				? get_post_meta( $order_id, '_stripe_charge_captured', true )
328
-				: $order->get_meta( '_stripe_charge_captured', true );
329
-			if ( 'no' === $captured ) {
330
-				$this->process_refund( $order_id );
322
+	public function cancel_payment($order_id) {
323
+		$order = wc_get_order($order_id);
324
+
325
+		if ('stripe' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method())) {
326
+			$captured = WC_Stripe_Helper::is_wc_lt('3.0')
327
+				? get_post_meta($order_id, '_stripe_charge_captured', true)
328
+				: $order->get_meta('_stripe_charge_captured', true);
329
+			if ('no' === $captured) {
330
+				$this->process_refund($order_id);
331 331
 			}
332 332
 
333 333
 			// This hook fires when admin manually changes order status to cancel.
334
-			do_action( 'woocommerce_stripe_process_manual_cancel', $order );
334
+			do_action('woocommerce_stripe_process_manual_cancel', $order);
335 335
 		}
336 336
 	}
337 337
 }
Please login to merge, or discard this patch.