Completed
Pull Request — master (#1160)
by Marcin
01:51
created
templates/emails/failed-renewal-authentication.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 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
 ?>
6 6
 
7
-<?php do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
7
+<?php do_action('woocommerce_email_header', $email_heading, $email); ?>
8 8
 
9 9
 <p>
10 10
 	<?php
11 11
 	// translators: %1$s: name of the blog, %2$s: link to payment re-authentication URL, note: no full stop due to url at the end
12
-	echo wp_kses( sprintf( _x( 'The automatic payment to renew your subscription with %1$s has failed. To reactivate the subscription, please login and authorize the renewal from your account page: %2$s', 'In failed renewal authentication email', 'woocommerce-gateway-stripe' ), esc_html( get_bloginfo( 'name' ) ), '<a href="' . esc_url( $authorization_url ) . '">' . esc_html__( 'Authorize the payment &raquo;', 'woocommerce-gateway-stripe' ) . '</a>' ), array( 'a' => array( 'href' => true ) ) ); ?>
12
+	echo wp_kses(sprintf(_x('The automatic payment to renew your subscription with %1$s has failed. To reactivate the subscription, please login and authorize the renewal from your account page: %2$s', 'In failed renewal authentication email', 'woocommerce-gateway-stripe'), esc_html(get_bloginfo('name')), '<a href="' . esc_url($authorization_url) . '">' . esc_html__('Authorize the payment &raquo;', 'woocommerce-gateway-stripe') . '</a>'), array('a' => array('href' => true))); ?>
13 13
 </p>
14 14
 
15
-<?php do_action( 'woocommerce_subscriptions_email_order_details', $order, $sent_to_admin, $plain_text, $email ); ?>
15
+<?php do_action('woocommerce_subscriptions_email_order_details', $order, $sent_to_admin, $plain_text, $email); ?>
16 16
 
17
-<?php do_action( 'woocommerce_email_footer', $email ); ?>
17
+<?php do_action('woocommerce_email_footer', $email); ?>
Please login to merge, or discard this patch.
includes/compat/class-wc-stripe-email-failed-authentication.php 1 patch
Spacing   +14 added lines, -14 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
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 				'email_heading'     => $this->get_heading(),
31 31
 				'sent_to_admin'     => false,
32 32
 				'plain_text'        => false,
33
-				'authorization_url' => $this->get_authorization_url( $this->object ),
33
+				'authorization_url' => $this->get_authorization_url($this->object),
34 34
 				'email'             => $this,
35 35
 			),
36 36
 			'',
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 				'email_heading'     => $this->get_heading(),
54 54
 				'sent_to_admin'     => false,
55 55
 				'plain_text'        => true,
56
-				'authorization_url' => $this->get_authorization_url( $this->object ),
56
+				'authorization_url' => $this->get_authorization_url($this->object),
57 57
 				'email'             => $this,
58 58
 			),
59 59
 			'',
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * @param WC_Order $order The order whose payment needs authentication.
69 69
 	 * @return string
70 70
 	 */
71
-	public function get_authorization_url( $order ) {
72
-		return add_query_arg( 'wc-stripe-confirmation', 1, $order->get_checkout_payment_url( false ) );
71
+	public function get_authorization_url($order) {
72
+		return add_query_arg('wc-stripe-confirmation', 1, $order->get_checkout_payment_url(false));
73 73
 	}
74 74
 
75 75
 	/**
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 
82 82
 		$this->form_fields = array(
83 83
 			'enabled'    => array(
84
-				'title'   => _x( 'Enable/Disable', 'an email notification', 'woocommerce-gateway-stripe' ),
84
+				'title'   => _x('Enable/Disable', 'an email notification', 'woocommerce-gateway-stripe'),
85 85
 				'type'    => 'checkbox',
86
-				'label'   => __( 'Enable this email notification', 'woocommerce-gateway-stripe' ),
86
+				'label'   => __('Enable this email notification', 'woocommerce-gateway-stripe'),
87 87
 				'default' => 'yes',
88 88
 			),
89 89
 
@@ -98,29 +98,29 @@  discard block
 block discarded – undo
98 98
 	 *
99 99
 	 * @param WC_Order $order The renewal order whose payment failed.
100 100
 	 */
101
-	public function trigger( $order ) {
102
-		if ( ! $this->is_enabled() ) {
101
+	public function trigger($order) {
102
+		if ( ! $this->is_enabled()) {
103 103
 			return;
104 104
 		}
105 105
 
106 106
 		$this->object = $order;
107 107
 
108
-		if ( method_exists( $order, 'get_billing_email' ) ) {
108
+		if (method_exists($order, 'get_billing_email')) {
109 109
 			$this->recipient = $order->get_billing_email();
110 110
 		} else {
111 111
 			$this->recipient = $order->billing_email;
112 112
 		}
113 113
 
114 114
 		$this->find['order_date'] = '{order_date}';
115
-		if ( function_exists( 'wc_format_datetime' ) ) { // WC 3.0+
116
-			$this->replace['order_date'] = wc_format_datetime( $order->get_date_created() );
115
+		if (function_exists('wc_format_datetime')) { // WC 3.0+
116
+			$this->replace['order_date'] = wc_format_datetime($order->get_date_created());
117 117
 		} else { // WC < 3.0
118
-			$this->replace['order_date'] = $order->date_created->date_i18n( wc_date_format() );
118
+			$this->replace['order_date'] = $order->date_created->date_i18n(wc_date_format());
119 119
 		}
120 120
 
121 121
 		$this->find['order_number']    = '{order_number}';
122 122
 		$this->replace['order_number'] = $order->get_order_number();
123 123
 
124
-		$this->send( $this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments() );
124
+		$this->send($this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments());
125 125
 	}
126 126
 }
Please login to merge, or discard this patch.
includes/compat/class-wc-stripe-email-failed-preorder-authentication.php 1 patch
Spacing   +18 added lines, -18 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
 
@@ -21,20 +21,20 @@  discard block
 block discarded – undo
21 21
 	 *
22 22
 	 * @param WC_Email[] $email_classes All existing instances of WooCommerce emails.
23 23
 	 */
24
-	public function __construct( $email_classes = array() ) {
24
+	public function __construct($email_classes = array()) {
25 25
 		$this->id             = 'failed_preorder_sca_authentication';
26
-		$this->title          = __( 'Pre-order Payment Action Needed', 'woocommerce-gateway-stripe' );
27
-		$this->description    = __( 'This is an order notification sent to the customer once a pre-order is complete, but additional payment steps are required.', 'woocommerce-gateway-stripe' );
26
+		$this->title          = __('Pre-order Payment Action Needed', 'woocommerce-gateway-stripe');
27
+		$this->description    = __('This is an order notification sent to the customer once a pre-order is complete, but additional payment steps are required.', 'woocommerce-gateway-stripe');
28 28
 		$this->customer_email = true;
29 29
 
30 30
 		$this->template_html  = 'emails/failed-preorder-authentication.php';
31 31
 		$this->template_plain = 'emails/plain/failed-preorder-authentication.php';
32
-		$this->template_base  = plugin_dir_path( WC_STRIPE_MAIN_FILE ) . 'templates/';
32
+		$this->template_base  = plugin_dir_path(WC_STRIPE_MAIN_FILE) . 'templates/';
33 33
 
34 34
 		// Use the "authentication required" hook to add the correct, later hook.
35
-		add_action( 'wc_gateway_stripe_process_payment_authentication_required', array( $this, 'trigger' ) );
35
+		add_action('wc_gateway_stripe_process_payment_authentication_required', array($this, 'trigger'));
36 36
 
37
-		if ( isset( $email_classes['WC_Pre_Orders_Email_Pre_Order_Available'] ) ) {
37
+		if (isset($email_classes['WC_Pre_Orders_Email_Pre_Order_Available'])) {
38 38
 			$this->original_email = $email_classes['WC_Pre_Orders_Email_Pre_Order_Available'];
39 39
 		}
40 40
 
@@ -48,13 +48,13 @@  discard block
 block discarded – undo
48 48
 	 *
49 49
 	 * @param WC_Order $order The order whose payment is failing.
50 50
 	 */
51
-	public function trigger( $order ) {
52
-		if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Order::order_contains_pre_order( $order->get_id() ) ) {
53
-			if ( isset( $this->original_email ) ) {
54
-				remove_action( 'wc_pre_order_status_completed_notification', array( $this->original_email, 'trigger' ), 10, 2 );
51
+	public function trigger($order) {
52
+		if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Order::order_contains_pre_order($order->get_id())) {
53
+			if (isset($this->original_email)) {
54
+				remove_action('wc_pre_order_status_completed_notification', array($this->original_email, 'trigger'), 10, 2);
55 55
 			}
56 56
 
57
-			add_action( 'wc_pre_orders_pre_order_completed', array( $this, 'send_email' ), 10, 2 );
57
+			add_action('wc_pre_orders_pre_order_completed', array($this, 'send_email'), 10, 2);
58 58
 		}
59 59
 	}
60 60
 
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
64 64
 	 * @param WC_Order $order The order that is being paid.
65 65
 	 * @param string   $message The message, which should be added to the email.
66 66
 	 */
67
-	public function send_email( $order, $message ) {
67
+	public function send_email($order, $message) {
68 68
 		$this->custom_message = $message;
69 69
 
70
-		parent::trigger( $order );
70
+		parent::trigger($order);
71 71
 
72 72
 		// Restore the action of the original email for other bulk actions.
73
-		if ( isset( $this->original_email ) ) {
74
-			add_action( 'wc_pre_order_status_completed_notification', array( $this->original_email, 'trigger' ), 10, 2 );
73
+		if (isset($this->original_email)) {
74
+			add_action('wc_pre_order_status_completed_notification', array($this->original_email, 'trigger'), 10, 2);
75 75
 		}
76 76
 	}
77 77
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 * @return string
82 82
 	 */
83 83
 	public function get_default_subject() {
84
-		return __( 'Payment authorization needed for pre-order {order_number}', 'woocommerce-gateway-stripe' );
84
+		return __('Payment authorization needed for pre-order {order_number}', 'woocommerce-gateway-stripe');
85 85
 	}
86 86
 
87 87
 	/**
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 * @return string
91 91
 	 */
92 92
 	public function get_default_heading() {
93
-		return __( 'Payment authorization needed for pre-order {order_number}', 'woocommerce-gateway-stripe' );
93
+		return __('Payment authorization needed for pre-order {order_number}', 'woocommerce-gateway-stripe');
94 94
 	}
95 95
 
96 96
 	/**
Please login to merge, or discard this patch.
templates/emails/failed-preorder-authentication.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  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
 ?>
6 6
 
7
-<?php do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
7
+<?php do_action('woocommerce_email_header', $email_heading, $email); ?>
8 8
 
9 9
 <?php
10
-$pre_wc_30 = version_compare( WC_VERSION, '3.0', '<' );
10
+$pre_wc_30 = version_compare(WC_VERSION, '3.0', '<');
11 11
 $billing_email = $pre_wc_30 ? $order->billing_email : $order->get_billing_email();
12 12
 $billing_phone = $pre_wc_30 ? $order->billing_phone : $order->get_billing_phone();
13 13
 
@@ -16,19 +16,19 @@  discard block
 block discarded – undo
16 16
 	echo wp_kses(
17 17
 		sprintf(
18 18
 			// translators: %s is a link to the payment re-authentication URL.
19
-			_x( 'Your pre-order is now available, but payment cannot be completed automatically. %s', 'In failed SCA authentication for a pre-order.', 'woocommerce-gateway-stripe' ),
20
-			'<a href="' . esc_url( $authorization_url ) . '">' . esc_html__( 'Authorize the payment now &raquo;', 'woocommerce-gateway-stripe' ) . '</a>'
19
+			_x('Your pre-order is now available, but payment cannot be completed automatically. %s', 'In failed SCA authentication for a pre-order.', 'woocommerce-gateway-stripe'),
20
+			'<a href="' . esc_url($authorization_url) . '">' . esc_html__('Authorize the payment now &raquo;', 'woocommerce-gateway-stripe') . '</a>'
21 21
 		),
22
-		array( 'a' => array( 'href' => true ) )
22
+		array('a' => array('href' => true))
23 23
 	);
24 24
 ?></p>
25 25
 
26
-<?php if ( $email->get_custom_message() ) : ?>
27
-	<blockquote><?php echo wpautop( wptexturize( $email->get_custom_message() ) ); ?></blockquote>
26
+<?php if ($email->get_custom_message()) : ?>
27
+	<blockquote><?php echo wpautop(wptexturize($email->get_custom_message())); ?></blockquote>
28 28
 <?php endif; ?>
29 29
 
30 30
 <?php
31
-do_action( 'woocommerce_email_before_order_table', $order, false, $plain_text, $email );
31
+do_action('woocommerce_email_before_order_table', $order, false, $plain_text, $email);
32 32
 
33 33
 /*
34 34
  * @hooked WC_Emails::order_details() Shows the order details table.
@@ -36,28 +36,28 @@  discard block
 block discarded – undo
36 36
  * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
37 37
  * @since 2.5.0
38 38
  */
39
-do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
39
+do_action('woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email);
40 40
 
41 41
 /*
42 42
  * @hooked WC_Emails::order_meta() Shows order meta data.
43 43
  */
44
-do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
44
+do_action('woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email);
45 45
 
46
-do_action( 'woocommerce_email_after_order_table', $order, false, $plain_text, $email );
46
+do_action('woocommerce_email_after_order_table', $order, false, $plain_text, $email);
47 47
 
48 48
 /*
49 49
  * @hooked WC_Emails::customer_details() Shows customer details
50 50
  * @hooked WC_Emails::email_address() Shows email address
51 51
  */
52
-do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
52
+do_action('woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email);
53 53
 
54 54
 ?>
55 55
 <p>
56
-<?php esc_html_e( 'Thanks for shopping with us.', 'woocommerce-gateway-stripe' ); ?>
56
+<?php esc_html_e('Thanks for shopping with us.', 'woocommerce-gateway-stripe'); ?>
57 57
 </p>
58 58
 <?php
59 59
 
60 60
 /*
61 61
  * @hooked WC_Emails::email_footer() Output the email footer
62 62
  */
63
-do_action( 'woocommerce_email_footer', $email );
63
+do_action('woocommerce_email_footer', $email);
Please login to merge, or discard this patch.
templates/emails/plain/failed-preorder-authentication.php 1 patch
Spacing   +6 added lines, -6 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
 
@@ -7,14 +7,14 @@  discard block
 block discarded – undo
7 7
 
8 8
 printf(
9 9
 	// translators: %s is a link to the payment re-authentication URL.
10
-	_x( 'Your pre-order is now available, but payment cannot be completed automatically. Please complete the payment now: %s', 'woocommerce-gateway-stripe' ),
10
+	_x('Your pre-order is now available, but payment cannot be completed automatically. Please complete the payment now: %s', 'woocommerce-gateway-stripe'),
11 11
 	$authorization_url
12 12
 );
13 13
 
14
-if ( $email->get_custom_message() ) :
14
+if ($email->get_custom_message()) :
15 15
 
16 16
 	echo "----------\n\n";
17
-	echo wptexturize( $email->get_custom_message() ) . "\n\n";
17
+	echo wptexturize($email->get_custom_message()) . "\n\n";
18 18
 	echo "----------\n\n";
19 19
 
20 20
 endif;
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 
23 23
 echo "\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n";
24 24
 
25
-do_action( 'woocommerce_subscriptions_email_order_details', $order, $sent_to_admin, $plain_text, $email );
25
+do_action('woocommerce_subscriptions_email_order_details', $order, $sent_to_admin, $plain_text, $email);
26 26
 
27 27
 echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
28 28
 
29
-echo apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) );
29
+echo apply_filters('woocommerce_email_footer_text', get_option('woocommerce_email_footer_text'));
Please login to merge, or discard this patch.
includes/compat/class-wc-stripe-pre-orders-compat.php 1 patch
Spacing   +49 added lines, -49 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
 
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 	public $saved_cards;
12 12
 
13 13
 	public function __construct() {
14
-		$this->saved_cards = WC_Stripe_Helper::get_settings( 'stripe', 'saved_cards' );
14
+		$this->saved_cards = WC_Stripe_Helper::get_settings('stripe', 'saved_cards');
15 15
 	}
16 16
 
17 17
 	/**
@@ -19,22 +19,22 @@  discard block
 block discarded – undo
19 19
 	 * @param  int  $order_id
20 20
 	 * @return boolean
21 21
 	 */
22
-	public function is_pre_order( $order_id ) {
23
-		return WC_Pre_Orders_Order::order_contains_pre_order( $order_id );
22
+	public function is_pre_order($order_id) {
23
+		return WC_Pre_Orders_Order::order_contains_pre_order($order_id);
24 24
 	}
25 25
 
26 26
 	/**
27 27
 	 * Remove order meta
28 28
 	 * @param object $order
29 29
 	 */
30
-	public function remove_order_source_before_retry( $order ) {
31
-		if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
32
-			delete_post_meta( $order->id, '_stripe_source_id' );
30
+	public function remove_order_source_before_retry($order) {
31
+		if (WC_Stripe_Helper::is_wc_lt('3.0')) {
32
+			delete_post_meta($order->id, '_stripe_source_id');
33 33
 			// For BW compat will remove in the future.
34
-			delete_post_meta( $order->id, '_stripe_card_id' );
34
+			delete_post_meta($order->id, '_stripe_card_id');
35 35
 		} else {
36
-			$order->delete_meta_data( '_stripe_source_id' );
37
-			$order->delete_meta_data( '_stripe_card_id' );
36
+			$order->delete_meta_data('_stripe_source_id');
37
+			$order->delete_meta_data('_stripe_card_id');
38 38
 			$order->save();
39 39
 		}
40 40
 	}
@@ -43,31 +43,31 @@  discard block
 block discarded – undo
43 43
 	 * Process the pre-order when pay upon release is used.
44 44
 	 * @param int $order_id
45 45
 	 */
46
-	public function process_pre_order( $order_id ) {
46
+	public function process_pre_order($order_id) {
47 47
 		try {
48
-			$order = wc_get_order( $order_id );
48
+			$order = wc_get_order($order_id);
49 49
 
50 50
 			// This will throw exception if not valid.
51
-			$this->validate_minimum_order_amount( $order );
51
+			$this->validate_minimum_order_amount($order);
52 52
 
53
-			$prepared_source = $this->prepare_source( get_current_user_id(), true );
53
+			$prepared_source = $this->prepare_source(get_current_user_id(), true);
54 54
 
55 55
 			// We need a source on file to continue.
56
-			if ( empty( $prepared_source->customer ) || empty( $prepared_source->source ) ) {
57
-				throw new WC_Stripe_Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) );
56
+			if (empty($prepared_source->customer) || empty($prepared_source->source)) {
57
+				throw new WC_Stripe_Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe'));
58 58
 			}
59 59
 
60 60
 			// Setup the response early to allow later modifications.
61 61
 			$response = array(
62 62
 				'result'   => 'success',
63
-				'redirect' => $this->get_return_url( $order ),
63
+				'redirect' => $this->get_return_url($order),
64 64
 			);
65 65
 
66
-			$this->save_source_to_order( $order, $prepared_source );
66
+			$this->save_source_to_order($order, $prepared_source);
67 67
 
68 68
 			// Try setting up a payment intent.
69
-			$intent_secret = $this->setup_intent( $order, $prepared_source );
70
-			if ( ! empty( $intent_secret ) ) {
69
+			$intent_secret = $this->setup_intent($order, $prepared_source);
70
+			if ( ! empty($intent_secret)) {
71 71
 				$response['setup_intent_secret'] = $intent_secret;
72 72
 				return $response;
73 73
 			}
@@ -76,17 +76,17 @@  discard block
 block discarded – undo
76 76
 			WC()->cart->empty_cart();
77 77
 
78 78
 			// Is pre ordered!
79
-			WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order );
79
+			WC_Pre_Orders_Order::mark_order_as_pre_ordered($order);
80 80
 
81 81
 			// Return thank you page redirect
82 82
 			return $response;
83
-		} catch ( WC_Stripe_Exception $e ) {
84
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
85
-			WC_Stripe_Logger::log( 'Pre Orders Error: ' . $e->getMessage() );
83
+		} catch (WC_Stripe_Exception $e) {
84
+			wc_add_notice($e->getLocalizedMessage(), 'error');
85
+			WC_Stripe_Logger::log('Pre Orders Error: ' . $e->getMessage());
86 86
 
87 87
 			return array(
88 88
 				'result'   => 'success',
89
-				'redirect' => $order->get_checkout_payment_url( true ),
89
+				'redirect' => $order->get_checkout_payment_url(true),
90 90
 			);
91 91
 		}
92 92
 	}
@@ -99,50 +99,50 @@  discard block
 block discarded – undo
99 99
 	 *
100 100
 	 * @return void
101 101
 	 */
102
-	public function process_pre_order_release_payment( $order, $retry = true ) {
102
+	public function process_pre_order_release_payment($order, $retry = true) {
103 103
 		try {
104
-			$source   = $this->prepare_order_source( $order );
105
-			$response = $this->create_and_confirm_intent_for_off_session( $order, $source );
104
+			$source   = $this->prepare_order_source($order);
105
+			$response = $this->create_and_confirm_intent_for_off_session($order, $source);
106 106
 
107
-			$is_authentication_required = $this->is_authentication_required_for_payment( $response );
107
+			$is_authentication_required = $this->is_authentication_required_for_payment($response);
108 108
 
109
-			if ( ! empty( $response->error ) && ! $is_authentication_required ) {
110
-				if ( ! $retry ) {
111
-					throw new Exception( $response->error->message );
109
+			if ( ! empty($response->error) && ! $is_authentication_required) {
110
+				if ( ! $retry) {
111
+					throw new Exception($response->error->message);
112 112
 				}
113
-				$this->remove_order_source_before_retry( $order );
114
-				$this->process_pre_order_release_payment( $order, false );
115
-			} else if ( $is_authentication_required ) {
116
-				$charge = end( $response->error->payment_intent->charges->data );
113
+				$this->remove_order_source_before_retry($order);
114
+				$this->process_pre_order_release_payment($order, false);
115
+			} else if ($is_authentication_required) {
116
+				$charge = end($response->error->payment_intent->charges->data);
117 117
 				$id = $charge->id;
118
-				$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
118
+				$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
119 119
 
120
-				WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, '_transaction_id', $id ) : $order->set_transaction_id( $id );
121
-				$order->update_status( 'failed', sprintf( __( 'Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe' ), $id ) );
122
-				if ( is_callable( array( $order, 'save' ) ) ) {
120
+				WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, '_transaction_id', $id) : $order->set_transaction_id($id);
121
+				$order->update_status('failed', sprintf(__('Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe'), $id));
122
+				if (is_callable(array($order, 'save'))) {
123 123
 					$order->save();
124 124
 				}
125 125
 
126 126
 				WC_Emails::instance();
127 127
 
128
-				do_action( 'wc_gateway_stripe_process_payment_authentication_required', $order );
128
+				do_action('wc_gateway_stripe_process_payment_authentication_required', $order);
129 129
 
130
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
130
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
131 131
 			} else {
132 132
 				// Successful
133
-				$this->process_response( end( $response->charges->data ), $order );
133
+				$this->process_response(end($response->charges->data), $order);
134 134
 			}
135
-		} catch ( Exception $e ) {
136
-			$error_message = is_callable( array( $e, 'getLocalizedMessage' ) ) ? $e->getLocalizedMessage() : $e->getMessage();
135
+		} catch (Exception $e) {
136
+			$error_message = is_callable(array($e, 'getLocalizedMessage')) ? $e->getLocalizedMessage() : $e->getMessage();
137 137
 			/* translators: error message */
138
-			$order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $error_message );
138
+			$order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $error_message);
139 139
 
140 140
 			// Mark order as failed if not already set,
141 141
 			// otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times
142
-			if ( ! $order->has_status( 'failed' ) ) {
143
-				$order->update_status( 'failed', $order_note );
142
+			if ( ! $order->has_status('failed')) {
143
+				$order->update_status('failed', $order_note);
144 144
 			} else {
145
-				$order->add_order_note( $order_note );
145
+				$order->add_order_note($order_note);
146 146
 			}
147 147
 		}
148 148
 	}
Please login to merge, or discard this patch.
templates/emails/failed-renewal-authentication-requested.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@  discard block
 block discarded – undo
6 6
  * @version 4.3.0
7 7
  */
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
13 13
 /**
14 14
  * Output the email header.
15 15
  */
16
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
16
+do_action('woocommerce_email_header', $email_heading, $email); ?>
17 17
 
18 18
 <p>
19 19
 	<?php
@@ -27,31 +27,31 @@  discard block
 block discarded – undo
27 27
 			),
28 28
 			$order->get_order_number(),
29 29
 			$order->get_formatted_billing_full_name(),
30
-			wcs_get_human_time_diff( $retry->get_time() )
30
+			wcs_get_human_time_diff($retry->get_time())
31 31
 		)
32 32
 	);
33 33
 	?>
34 34
 </p>
35
-<p><?php esc_html_e( 'The renewal order is as follows:', 'woocommerce-gateway-stripe' ); ?></p>
35
+<p><?php esc_html_e('The renewal order is as follows:', 'woocommerce-gateway-stripe'); ?></p>
36 36
 
37 37
 <?php
38 38
 
39 39
 /**
40 40
  * Shows the order details table.
41 41
  */
42
-do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
42
+do_action('woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email);
43 43
 
44 44
 /**
45 45
 * Shows order meta data.
46 46
 */
47
-do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
47
+do_action('woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email);
48 48
 
49 49
 /**
50 50
 * Shows customer details, and email address.
51 51
 */
52
-do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
52
+do_action('woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email);
53 53
 
54 54
 /**
55 55
 * Output the email footer.
56 56
 */
57
-do_action( 'woocommerce_email_footer', $email );
57
+do_action('woocommerce_email_footer', $email);
Please login to merge, or discard this patch.
templates/emails/plain/failed-renewal-authentication-requested.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @version 4.3.0
7 7
  */
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
@@ -21,29 +21,29 @@  discard block
 block discarded – undo
21 21
 	),
22 22
 	$order->get_order_number(),
23 23
 	$order->get_formatted_billing_full_name(),
24
-	wcs_get_human_time_diff( $retry->get_time() )
24
+	wcs_get_human_time_diff($retry->get_time())
25 25
 ) . "\n\n";
26
-printf( __( 'The renewal order is as follows:', 'woocommerce-gateway-stripe' ) ) . "\n\n";
26
+printf(__('The renewal order is as follows:', 'woocommerce-gateway-stripe')) . "\n\n";
27 27
 
28 28
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
29 29
 
30 30
 /**
31 31
  * Shows the order details table.
32 32
  */
33
-do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
33
+do_action('woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email);
34 34
 
35 35
 echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
36 36
 
37 37
 /**
38 38
 * Shows order meta data.
39 39
 */
40
-do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
40
+do_action('woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email);
41 41
 
42 42
 /**
43 43
 * Shows customer details, and email address.
44 44
 */
45
-do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
45
+do_action('woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email);
46 46
 
47 47
 echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
48 48
 
49
-echo apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) );
49
+echo apply_filters('woocommerce_email_footer_text', get_option('woocommerce_email_footer_text'));
Please login to merge, or discard this patch.
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.