@@ -1,17 +1,17 @@ |
||
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 »', '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 »', '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); ?> |
@@ -884,7 +884,7 @@ |
||
884 | 884 | } |
885 | 885 | |
886 | 886 | if ( 'requires_payment_method' === $intent->status && isset( $intent->last_payment_error ) |
887 | - && 'authentication_required' === $intent->last_payment_error->code ) { |
|
887 | + && 'authentication_required' === $intent->last_payment_error->code ) { |
|
888 | 888 | $intent = WC_Stripe_API::request( array( |
889 | 889 | 'payment_method' => $intent->last_payment_error->source->id, |
890 | 890 | ), 'payment_intents/' . $intent->id . '/confirm' ); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | public function __construct() { |
86 | 86 | $this->retry_interval = 1; |
87 | 87 | $this->id = 'stripe'; |
88 | - $this->method_title = __( 'Stripe', 'woocommerce-gateway-stripe' ); |
|
88 | + $this->method_title = __('Stripe', 'woocommerce-gateway-stripe'); |
|
89 | 89 | /* translators: 1) link to Stripe register page 2) link to Stripe api keys page */ |
90 | - $this->method_description = sprintf( __( 'Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys' ); |
|
90 | + $this->method_description = sprintf(__('Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys'); |
|
91 | 91 | $this->has_fields = true; |
92 | 92 | $this->supports = array( |
93 | 93 | 'products', |
@@ -114,37 +114,37 @@ discard block |
||
114 | 114 | $this->init_settings(); |
115 | 115 | |
116 | 116 | // Get setting values. |
117 | - $this->title = $this->get_option( 'title' ); |
|
118 | - $this->description = $this->get_option( 'description' ); |
|
119 | - $this->enabled = $this->get_option( 'enabled' ); |
|
120 | - $this->testmode = 'yes' === $this->get_option( 'testmode' ); |
|
121 | - $this->inline_cc_form = 'yes' === $this->get_option( 'inline_cc_form' ); |
|
122 | - $this->capture = 'yes' === $this->get_option( 'capture', 'yes' ); |
|
123 | - $this->statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor( $this->get_option( 'statement_descriptor' ) ); |
|
124 | - $this->saved_cards = 'yes' === $this->get_option( 'saved_cards' ); |
|
125 | - $this->secret_key = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' ); |
|
126 | - $this->publishable_key = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' ); |
|
127 | - $this->payment_request = 'yes' === $this->get_option( 'payment_request', 'yes' ); |
|
128 | - |
|
129 | - WC_Stripe_API::set_secret_key( $this->secret_key ); |
|
117 | + $this->title = $this->get_option('title'); |
|
118 | + $this->description = $this->get_option('description'); |
|
119 | + $this->enabled = $this->get_option('enabled'); |
|
120 | + $this->testmode = 'yes' === $this->get_option('testmode'); |
|
121 | + $this->inline_cc_form = 'yes' === $this->get_option('inline_cc_form'); |
|
122 | + $this->capture = 'yes' === $this->get_option('capture', 'yes'); |
|
123 | + $this->statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor($this->get_option('statement_descriptor')); |
|
124 | + $this->saved_cards = 'yes' === $this->get_option('saved_cards'); |
|
125 | + $this->secret_key = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key'); |
|
126 | + $this->publishable_key = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key'); |
|
127 | + $this->payment_request = 'yes' === $this->get_option('payment_request', 'yes'); |
|
128 | + |
|
129 | + WC_Stripe_API::set_secret_key($this->secret_key); |
|
130 | 130 | |
131 | 131 | // Hooks. |
132 | - add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) ); |
|
133 | - add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) ); |
|
134 | - add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) ); |
|
135 | - add_action( 'woocommerce_admin_order_totals_after_total', array( $this, 'display_order_fee' ) ); |
|
136 | - add_action( 'woocommerce_admin_order_totals_after_total', array( $this, 'display_order_payout' ), 20 ); |
|
137 | - add_action( 'woocommerce_customer_save_address', array( $this, 'show_update_card_notice' ), 10, 2 ); |
|
138 | - add_filter( 'woocommerce_available_payment_gateways', array( $this, 'prepare_order_pay_page' ) ); |
|
139 | - add_action( 'woocommerce_account_view-order_endpoint', array( $this, 'check_intent_status_on_order_page' ), 1 ); |
|
140 | - add_filter( 'woocommerce_payment_successful_result', array( $this, 'modify_successful_payment_result' ), 99999, 2 ); |
|
141 | - add_action( 'set_logged_in_cookie', array( $this, 'set_cookie_on_current_request' ) ); |
|
142 | - add_filter( 'woocommerce_get_checkout_payment_url', array( $this, 'get_checkout_payment_url' ), 10, 2 ); |
|
143 | - |
|
144 | - if ( WC_Stripe_Helper::is_pre_orders_exists() ) { |
|
132 | + add_action('wp_enqueue_scripts', array($this, 'payment_scripts')); |
|
133 | + add_action('admin_enqueue_scripts', array($this, 'admin_scripts')); |
|
134 | + add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options')); |
|
135 | + add_action('woocommerce_admin_order_totals_after_total', array($this, 'display_order_fee')); |
|
136 | + add_action('woocommerce_admin_order_totals_after_total', array($this, 'display_order_payout'), 20); |
|
137 | + add_action('woocommerce_customer_save_address', array($this, 'show_update_card_notice'), 10, 2); |
|
138 | + add_filter('woocommerce_available_payment_gateways', array($this, 'prepare_order_pay_page')); |
|
139 | + add_action('woocommerce_account_view-order_endpoint', array($this, 'check_intent_status_on_order_page'), 1); |
|
140 | + add_filter('woocommerce_payment_successful_result', array($this, 'modify_successful_payment_result'), 99999, 2); |
|
141 | + add_action('set_logged_in_cookie', array($this, 'set_cookie_on_current_request')); |
|
142 | + add_filter('woocommerce_get_checkout_payment_url', array($this, 'get_checkout_payment_url'), 10, 2); |
|
143 | + |
|
144 | + if (WC_Stripe_Helper::is_pre_orders_exists()) { |
|
145 | 145 | $this->pre_orders = new WC_Stripe_Pre_Orders_Compat(); |
146 | 146 | |
147 | - add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this->pre_orders, 'process_pre_order_release_payment' ) ); |
|
147 | + add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this->pre_orders, 'process_pre_order_release_payment')); |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | * @return bool |
156 | 156 | */ |
157 | 157 | public function are_keys_set() { |
158 | - if ( empty( $this->secret_key ) || empty( $this->publishable_key ) ) { |
|
158 | + if (empty($this->secret_key) || empty($this->publishable_key)) { |
|
159 | 159 | return false; |
160 | 160 | } |
161 | 161 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @since 4.0.2 |
169 | 169 | */ |
170 | 170 | public function is_available() { |
171 | - if ( is_add_payment_method_page() && ! $this->saved_cards ) { |
|
171 | + if (is_add_payment_method_page() && ! $this->saved_cards) { |
|
172 | 172 | return false; |
173 | 173 | } |
174 | 174 | |
@@ -182,13 +182,13 @@ discard block |
||
182 | 182 | * @param int $user_id The ID of the current user. |
183 | 183 | * @param string $load_address The address to load. |
184 | 184 | */ |
185 | - public function show_update_card_notice( $user_id, $load_address ) { |
|
186 | - if ( ! $this->saved_cards || ! WC_Stripe_Payment_Tokens::customer_has_saved_methods( $user_id ) || 'billing' !== $load_address ) { |
|
185 | + public function show_update_card_notice($user_id, $load_address) { |
|
186 | + if ( ! $this->saved_cards || ! WC_Stripe_Payment_Tokens::customer_has_saved_methods($user_id) || 'billing' !== $load_address) { |
|
187 | 187 | return; |
188 | 188 | } |
189 | 189 | |
190 | 190 | /* translators: 1) Opening anchor tag 2) closing anchor tag */ |
191 | - wc_add_notice( sprintf( __( 'If your billing address has been changed for saved payment methods, be sure to remove any %1$ssaved payment methods%2$s on file and re-add them.', 'woocommerce-gateway-stripe' ), '<a href="' . esc_url( wc_get_endpoint_url( 'payment-methods' ) ) . '" class="wc-stripe-update-card-notice" style="text-decoration:underline;">', '</a>' ), 'notice' ); |
|
191 | + wc_add_notice(sprintf(__('If your billing address has been changed for saved payment methods, be sure to remove any %1$ssaved payment methods%2$s on file and re-add them.', 'woocommerce-gateway-stripe'), '<a href="' . esc_url(wc_get_endpoint_url('payment-methods')) . '" class="wc-stripe-update-card-notice" style="text-decoration:underline;">', '</a>'), 'notice'); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | /** |
@@ -203,24 +203,24 @@ discard block |
||
203 | 203 | |
204 | 204 | $icons_str = ''; |
205 | 205 | |
206 | - $icons_str .= isset( $icons['visa'] ) ? $icons['visa'] : ''; |
|
207 | - $icons_str .= isset( $icons['amex'] ) ? $icons['amex'] : ''; |
|
208 | - $icons_str .= isset( $icons['mastercard'] ) ? $icons['mastercard'] : ''; |
|
206 | + $icons_str .= isset($icons['visa']) ? $icons['visa'] : ''; |
|
207 | + $icons_str .= isset($icons['amex']) ? $icons['amex'] : ''; |
|
208 | + $icons_str .= isset($icons['mastercard']) ? $icons['mastercard'] : ''; |
|
209 | 209 | |
210 | - if ( 'USD' === get_woocommerce_currency() ) { |
|
211 | - $icons_str .= isset( $icons['discover'] ) ? $icons['discover'] : ''; |
|
212 | - $icons_str .= isset( $icons['jcb'] ) ? $icons['jcb'] : ''; |
|
213 | - $icons_str .= isset( $icons['diners'] ) ? $icons['diners'] : ''; |
|
210 | + if ('USD' === get_woocommerce_currency()) { |
|
211 | + $icons_str .= isset($icons['discover']) ? $icons['discover'] : ''; |
|
212 | + $icons_str .= isset($icons['jcb']) ? $icons['jcb'] : ''; |
|
213 | + $icons_str .= isset($icons['diners']) ? $icons['diners'] : ''; |
|
214 | 214 | } |
215 | 215 | |
216 | - return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id ); |
|
216 | + return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
220 | 220 | * Initialise Gateway Settings Form Fields |
221 | 221 | */ |
222 | 222 | public function init_form_fields() { |
223 | - $this->form_fields = require( dirname( __FILE__ ) . '/admin/stripe-settings.php' ); |
|
223 | + $this->form_fields = require(dirname(__FILE__) . '/admin/stripe-settings.php'); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -228,27 +228,27 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function payment_fields() { |
230 | 230 | $user = wp_get_current_user(); |
231 | - $display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards; |
|
231 | + $display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards; |
|
232 | 232 | $total = WC()->cart->total; |
233 | 233 | $user_email = ''; |
234 | 234 | $description = $this->get_description(); |
235 | - $description = ! empty( $description ) ? $description : ''; |
|
235 | + $description = ! empty($description) ? $description : ''; |
|
236 | 236 | $firstname = ''; |
237 | 237 | $lastname = ''; |
238 | 238 | |
239 | 239 | // If paying from order, we need to get total from order not cart. |
240 | - if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) { // wpcs: csrf ok. |
|
241 | - $order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) ); // wpcs: csrf ok, sanitization ok. |
|
240 | + if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) { // wpcs: csrf ok. |
|
241 | + $order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key']))); // wpcs: csrf ok, sanitization ok. |
|
242 | 242 | $total = $order->get_total(); |
243 | - $user_email = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_email : $order->get_billing_email(); |
|
243 | + $user_email = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_email : $order->get_billing_email(); |
|
244 | 244 | } else { |
245 | - if ( $user->ID ) { |
|
246 | - $user_email = get_user_meta( $user->ID, 'billing_email', true ); |
|
245 | + if ($user->ID) { |
|
246 | + $user_email = get_user_meta($user->ID, 'billing_email', true); |
|
247 | 247 | $user_email = $user_email ? $user_email : $user->user_email; |
248 | 248 | } |
249 | 249 | } |
250 | 250 | |
251 | - if ( is_add_payment_method_page() ) { |
|
251 | + if (is_add_payment_method_page()) { |
|
252 | 252 | $firstname = $user->user_firstname; |
253 | 253 | $lastname = $user->user_lastname; |
254 | 254 | } |
@@ -257,33 +257,33 @@ discard block |
||
257 | 257 | |
258 | 258 | echo '<div |
259 | 259 | id="stripe-payment-data" |
260 | - data-email="' . esc_attr( $user_email ) . '" |
|
261 | - data-full-name="' . esc_attr( $firstname . ' ' . $lastname ) . '" |
|
262 | - data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '" |
|
260 | + data-email="' . esc_attr($user_email) . '" |
|
261 | + data-full-name="' . esc_attr($firstname . ' ' . $lastname) . '" |
|
262 | + data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '" |
|
263 | 263 | >'; |
264 | 264 | |
265 | - if ( $this->testmode ) { |
|
265 | + if ($this->testmode) { |
|
266 | 266 | /* translators: link to Stripe testing page */ |
267 | - $description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the <a href="%s" target="_blank">Testing Stripe documentation</a> for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' ); |
|
267 | + $description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the <a href="%s" target="_blank">Testing Stripe documentation</a> for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing'); |
|
268 | 268 | } |
269 | 269 | |
270 | - $description = trim( $description ); |
|
270 | + $description = trim($description); |
|
271 | 271 | |
272 | - echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id ); // wpcs: xss ok. |
|
272 | + echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id); // wpcs: xss ok. |
|
273 | 273 | |
274 | - if ( $display_tokenization ) { |
|
274 | + if ($display_tokenization) { |
|
275 | 275 | $this->tokenization_script(); |
276 | 276 | $this->saved_payment_methods(); |
277 | 277 | } |
278 | 278 | |
279 | 279 | $this->elements_form(); |
280 | 280 | |
281 | - if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) { // wpcs: csrf ok. |
|
281 | + if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) { // wpcs: csrf ok. |
|
282 | 282 | |
283 | 283 | $this->save_payment_method_checkbox(); |
284 | 284 | } |
285 | 285 | |
286 | - do_action( 'wc_stripe_cards_payment_fields', $this->id ); |
|
286 | + do_action('wc_stripe_cards_payment_fields', $this->id); |
|
287 | 287 | |
288 | 288 | echo '</div>'; |
289 | 289 | |
@@ -298,12 +298,12 @@ discard block |
||
298 | 298 | */ |
299 | 299 | public function elements_form() { |
300 | 300 | ?> |
301 | - <fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;"> |
|
302 | - <?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?> |
|
301 | + <fieldset id="wc-<?php echo esc_attr($this->id); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;"> |
|
302 | + <?php do_action('woocommerce_credit_card_form_start', $this->id); ?> |
|
303 | 303 | |
304 | - <?php if ( $this->inline_cc_form ) { ?> |
|
304 | + <?php if ($this->inline_cc_form) { ?> |
|
305 | 305 | <label for="card-element"> |
306 | - <?php esc_html_e( 'Credit or debit card', 'woocommerce-gateway-stripe' ); ?> |
|
306 | + <?php esc_html_e('Credit or debit card', 'woocommerce-gateway-stripe'); ?> |
|
307 | 307 | </label> |
308 | 308 | |
309 | 309 | <div id="stripe-card-element" class="wc-stripe-elements-field"> |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | </div> |
312 | 312 | <?php } else { ?> |
313 | 313 | <div class="form-row form-row-wide"> |
314 | - <label for="stripe-card-element"><?php esc_html_e( 'Card Number', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label> |
|
314 | + <label for="stripe-card-element"><?php esc_html_e('Card Number', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label> |
|
315 | 315 | <div class="stripe-card-group"> |
316 | 316 | <div id="stripe-card-element" class="wc-stripe-elements-field"> |
317 | 317 | <!-- a Stripe Element will be inserted here. --> |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | </div> |
323 | 323 | |
324 | 324 | <div class="form-row form-row-first"> |
325 | - <label for="stripe-exp-element"><?php esc_html_e( 'Expiry Date', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label> |
|
325 | + <label for="stripe-exp-element"><?php esc_html_e('Expiry Date', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label> |
|
326 | 326 | |
327 | 327 | <div id="stripe-exp-element" class="wc-stripe-elements-field"> |
328 | 328 | <!-- a Stripe Element will be inserted here. --> |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | </div> |
331 | 331 | |
332 | 332 | <div class="form-row form-row-last"> |
333 | - <label for="stripe-cvc-element"><?php esc_html_e( 'Card Code (CVC)', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label> |
|
333 | + <label for="stripe-cvc-element"><?php esc_html_e('Card Code (CVC)', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label> |
|
334 | 334 | <div id="stripe-cvc-element" class="wc-stripe-elements-field"> |
335 | 335 | <!-- a Stripe Element will be inserted here. --> |
336 | 336 | </div> |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | <!-- Used to display form errors --> |
342 | 342 | <div class="stripe-source-errors" role="alert"></div> |
343 | 343 | <br /> |
344 | - <?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?> |
|
344 | + <?php do_action('woocommerce_credit_card_form_end', $this->id); ?> |
|
345 | 345 | <div class="clear"></div> |
346 | 346 | </fieldset> |
347 | 347 | <?php |
@@ -354,13 +354,13 @@ discard block |
||
354 | 354 | * @version 3.1.0 |
355 | 355 | */ |
356 | 356 | public function admin_scripts() { |
357 | - if ( 'woocommerce_page_wc-settings' !== get_current_screen()->id ) { |
|
357 | + if ('woocommerce_page_wc-settings' !== get_current_screen()->id) { |
|
358 | 358 | return; |
359 | 359 | } |
360 | 360 | |
361 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
361 | + $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
362 | 362 | |
363 | - wp_enqueue_script( 'woocommerce_stripe_admin', plugins_url( 'assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION, true ); |
|
363 | + wp_enqueue_script('woocommerce_stripe_admin', plugins_url('assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION, true); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | /** |
@@ -372,97 +372,97 @@ discard block |
||
372 | 372 | * @version 4.0.0 |
373 | 373 | */ |
374 | 374 | public function payment_scripts() { |
375 | - if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) || ( is_order_received_page() ) ) { // wpcs: csrf ok. |
|
375 | + if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method']) || (is_order_received_page())) { // wpcs: csrf ok. |
|
376 | 376 | return; |
377 | 377 | } |
378 | 378 | |
379 | 379 | // If Stripe is not enabled bail. |
380 | - if ( 'no' === $this->enabled ) { |
|
380 | + if ('no' === $this->enabled) { |
|
381 | 381 | return; |
382 | 382 | } |
383 | 383 | |
384 | 384 | // If keys are not set bail. |
385 | - if ( ! $this->are_keys_set() ) { |
|
386 | - WC_Stripe_Logger::log( 'Keys are not set correctly.' ); |
|
385 | + if ( ! $this->are_keys_set()) { |
|
386 | + WC_Stripe_Logger::log('Keys are not set correctly.'); |
|
387 | 387 | return; |
388 | 388 | } |
389 | 389 | |
390 | 390 | // If no SSL bail. |
391 | - if ( ! $this->testmode && ! is_ssl() ) { |
|
392 | - WC_Stripe_Logger::log( 'Stripe live mode requires SSL.' ); |
|
391 | + if ( ! $this->testmode && ! is_ssl()) { |
|
392 | + WC_Stripe_Logger::log('Stripe live mode requires SSL.'); |
|
393 | 393 | return; |
394 | 394 | } |
395 | 395 | |
396 | 396 | $current_theme = wp_get_theme(); |
397 | 397 | |
398 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
398 | + $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
399 | 399 | |
400 | - wp_register_style( 'stripe_styles', plugins_url( 'assets/css/stripe-styles.css', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION ); |
|
401 | - wp_enqueue_style( 'stripe_styles' ); |
|
400 | + wp_register_style('stripe_styles', plugins_url('assets/css/stripe-styles.css', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION); |
|
401 | + wp_enqueue_style('stripe_styles'); |
|
402 | 402 | |
403 | - wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true ); |
|
404 | - wp_register_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripe' ), WC_STRIPE_VERSION, true ); |
|
403 | + wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true); |
|
404 | + wp_register_script('woocommerce_stripe', plugins_url('assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripe'), WC_STRIPE_VERSION, true); |
|
405 | 405 | |
406 | 406 | $stripe_params = array( |
407 | 407 | 'key' => $this->publishable_key, |
408 | - 'i18n_terms' => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ), |
|
409 | - 'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ), |
|
408 | + 'i18n_terms' => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'), |
|
409 | + 'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'), |
|
410 | 410 | ); |
411 | 411 | |
412 | 412 | // If we're on the pay page we need to pass stripe.js the address of the order. |
413 | - if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) { // wpcs: csrf ok. |
|
414 | - $order_id = wc_get_order_id_by_order_key( urldecode( $_GET['key'] ) ); // wpcs: csrf ok, sanitization ok, xss ok. |
|
415 | - $order = wc_get_order( $order_id ); |
|
416 | - |
|
417 | - if ( is_a( $order, 'WC_Order' ) ) { |
|
418 | - $stripe_params['billing_first_name'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_first_name : $order->get_billing_first_name(); |
|
419 | - $stripe_params['billing_last_name'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_last_name : $order->get_billing_last_name(); |
|
420 | - $stripe_params['billing_address_1'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_address_1 : $order->get_billing_address_1(); |
|
421 | - $stripe_params['billing_address_2'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_address_2 : $order->get_billing_address_2(); |
|
422 | - $stripe_params['billing_state'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_state : $order->get_billing_state(); |
|
423 | - $stripe_params['billing_city'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_city : $order->get_billing_city(); |
|
424 | - $stripe_params['billing_postcode'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_postcode : $order->get_billing_postcode(); |
|
425 | - $stripe_params['billing_country'] = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->billing_country : $order->get_billing_country(); |
|
413 | + if (isset($_GET['pay_for_order']) && 'true' === $_GET['pay_for_order']) { // wpcs: csrf ok. |
|
414 | + $order_id = wc_get_order_id_by_order_key(urldecode($_GET['key'])); // wpcs: csrf ok, sanitization ok, xss ok. |
|
415 | + $order = wc_get_order($order_id); |
|
416 | + |
|
417 | + if (is_a($order, 'WC_Order')) { |
|
418 | + $stripe_params['billing_first_name'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_first_name : $order->get_billing_first_name(); |
|
419 | + $stripe_params['billing_last_name'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_last_name : $order->get_billing_last_name(); |
|
420 | + $stripe_params['billing_address_1'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_address_1 : $order->get_billing_address_1(); |
|
421 | + $stripe_params['billing_address_2'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_address_2 : $order->get_billing_address_2(); |
|
422 | + $stripe_params['billing_state'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_state : $order->get_billing_state(); |
|
423 | + $stripe_params['billing_city'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_city : $order->get_billing_city(); |
|
424 | + $stripe_params['billing_postcode'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_postcode : $order->get_billing_postcode(); |
|
425 | + $stripe_params['billing_country'] = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->billing_country : $order->get_billing_country(); |
|
426 | 426 | } |
427 | 427 | } |
428 | 428 | |
429 | 429 | $sepa_elements_options = apply_filters( |
430 | 430 | 'wc_stripe_sepa_elements_options', |
431 | 431 | array( |
432 | - 'supportedCountries' => array( 'SEPA' ), |
|
432 | + 'supportedCountries' => array('SEPA'), |
|
433 | 433 | 'placeholderCountry' => WC()->countries->get_base_country(), |
434 | - 'style' => array( 'base' => array( 'fontSize' => '15px' ) ), |
|
434 | + 'style' => array('base' => array('fontSize' => '15px')), |
|
435 | 435 | ) |
436 | 436 | ); |
437 | 437 | |
438 | - $stripe_params['no_prepaid_card_msg'] = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charged. Please try with alternative payment method.', 'woocommerce-gateway-stripe' ); |
|
439 | - $stripe_params['no_sepa_owner_msg'] = __( 'Please enter your IBAN account name.', 'woocommerce-gateway-stripe' ); |
|
440 | - $stripe_params['no_sepa_iban_msg'] = __( 'Please enter your IBAN account number.', 'woocommerce-gateway-stripe' ); |
|
441 | - $stripe_params['payment_intent_error'] = __( 'We couldn\'t initiate the payment. Please try again.', 'woocommerce-gateway-stripe' ); |
|
442 | - $stripe_params['sepa_mandate_notification'] = apply_filters( 'wc_stripe_sepa_mandate_notification', 'email' ); |
|
443 | - $stripe_params['allow_prepaid_card'] = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no'; |
|
438 | + $stripe_params['no_prepaid_card_msg'] = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charged. Please try with alternative payment method.', 'woocommerce-gateway-stripe'); |
|
439 | + $stripe_params['no_sepa_owner_msg'] = __('Please enter your IBAN account name.', 'woocommerce-gateway-stripe'); |
|
440 | + $stripe_params['no_sepa_iban_msg'] = __('Please enter your IBAN account number.', 'woocommerce-gateway-stripe'); |
|
441 | + $stripe_params['payment_intent_error'] = __('We couldn\'t initiate the payment. Please try again.', 'woocommerce-gateway-stripe'); |
|
442 | + $stripe_params['sepa_mandate_notification'] = apply_filters('wc_stripe_sepa_mandate_notification', 'email'); |
|
443 | + $stripe_params['allow_prepaid_card'] = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no'; |
|
444 | 444 | $stripe_params['inline_cc_form'] = $this->inline_cc_form ? 'yes' : 'no'; |
445 | - $stripe_params['is_checkout'] = ( is_checkout() && empty( $_GET['pay_for_order'] ) ) ? 'yes' : 'no'; // wpcs: csrf ok. |
|
445 | + $stripe_params['is_checkout'] = (is_checkout() && empty($_GET['pay_for_order'])) ? 'yes' : 'no'; // wpcs: csrf ok. |
|
446 | 446 | $stripe_params['return_url'] = $this->get_stripe_return_url(); |
447 | - $stripe_params['ajaxurl'] = WC_AJAX::get_endpoint( '%%endpoint%%' ); |
|
448 | - $stripe_params['stripe_nonce'] = wp_create_nonce( '_wc_stripe_nonce' ); |
|
447 | + $stripe_params['ajaxurl'] = WC_AJAX::get_endpoint('%%endpoint%%'); |
|
448 | + $stripe_params['stripe_nonce'] = wp_create_nonce('_wc_stripe_nonce'); |
|
449 | 449 | $stripe_params['statement_descriptor'] = $this->statement_descriptor; |
450 | - $stripe_params['elements_options'] = apply_filters( 'wc_stripe_elements_options', array() ); |
|
450 | + $stripe_params['elements_options'] = apply_filters('wc_stripe_elements_options', array()); |
|
451 | 451 | $stripe_params['sepa_elements_options'] = $sepa_elements_options; |
452 | - $stripe_params['invalid_owner_name'] = __( 'Billing First Name and Last Name are required.', 'woocommerce-gateway-stripe' ); |
|
453 | - $stripe_params['is_change_payment_page'] = isset( $_GET['change_payment_method'] ) ? 'yes' : 'no'; // wpcs: csrf ok. |
|
454 | - $stripe_params['is_add_payment_page'] = is_wc_endpoint_url( 'add-payment-method' ) ? 'yes' : 'no'; |
|
455 | - $stripe_params['is_pay_for_order_page'] = is_wc_endpoint_url( 'order-pay' ) ? 'yes' : 'no'; |
|
456 | - $stripe_params['elements_styling'] = apply_filters( 'wc_stripe_elements_styling', false ); |
|
457 | - $stripe_params['elements_classes'] = apply_filters( 'wc_stripe_elements_classes', false ); |
|
452 | + $stripe_params['invalid_owner_name'] = __('Billing First Name and Last Name are required.', 'woocommerce-gateway-stripe'); |
|
453 | + $stripe_params['is_change_payment_page'] = isset($_GET['change_payment_method']) ? 'yes' : 'no'; // wpcs: csrf ok. |
|
454 | + $stripe_params['is_add_payment_page'] = is_wc_endpoint_url('add-payment-method') ? 'yes' : 'no'; |
|
455 | + $stripe_params['is_pay_for_order_page'] = is_wc_endpoint_url('order-pay') ? 'yes' : 'no'; |
|
456 | + $stripe_params['elements_styling'] = apply_filters('wc_stripe_elements_styling', false); |
|
457 | + $stripe_params['elements_classes'] = apply_filters('wc_stripe_elements_classes', false); |
|
458 | 458 | |
459 | 459 | // Merge localized messages to be use in JS. |
460 | - $stripe_params = array_merge( $stripe_params, WC_Stripe_Helper::get_localized_messages() ); |
|
460 | + $stripe_params = array_merge($stripe_params, WC_Stripe_Helper::get_localized_messages()); |
|
461 | 461 | |
462 | - wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) ); |
|
462 | + wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params)); |
|
463 | 463 | |
464 | 464 | $this->tokenization_script(); |
465 | - wp_enqueue_script( 'woocommerce_stripe' ); |
|
465 | + wp_enqueue_script('woocommerce_stripe'); |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | /** |
@@ -473,14 +473,14 @@ discard block |
||
473 | 473 | * @param object $prepared_source The object with source details. |
474 | 474 | * @throws WC_Stripe_Exception An exception if the card is prepaid, but prepaid cards are not allowed. |
475 | 475 | */ |
476 | - public function maybe_disallow_prepaid_card( $prepared_source ) { |
|
476 | + public function maybe_disallow_prepaid_card($prepared_source) { |
|
477 | 477 | // Check if we don't allow prepaid credit cards. |
478 | - if ( apply_filters( 'wc_stripe_allow_prepaid_card', true ) || ! $this->is_prepaid_card( $prepared_source->source_object ) ) { |
|
478 | + if (apply_filters('wc_stripe_allow_prepaid_card', true) || ! $this->is_prepaid_card($prepared_source->source_object)) { |
|
479 | 479 | return; |
480 | 480 | } |
481 | 481 | |
482 | - $localized_message = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charged. Please try with alternative payment method.', 'woocommerce-gateway-stripe' ); |
|
483 | - throw new WC_Stripe_Exception( print_r( $prepared_source->source_object, true ), $localized_message ); |
|
482 | + $localized_message = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charged. Please try with alternative payment method.', 'woocommerce-gateway-stripe'); |
|
483 | + throw new WC_Stripe_Exception(print_r($prepared_source->source_object, true), $localized_message); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | /** |
@@ -490,10 +490,10 @@ discard block |
||
490 | 490 | * @param object $prepared_source The source that should be verified. |
491 | 491 | * @throws WC_Stripe_Exception An exception if the source ID is missing. |
492 | 492 | */ |
493 | - public function check_source( $prepared_source ) { |
|
494 | - if ( empty( $prepared_source->source ) ) { |
|
495 | - $localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' ); |
|
496 | - throw new WC_Stripe_Exception( print_r( $prepared_source, true ), $localized_message ); |
|
493 | + public function check_source($prepared_source) { |
|
494 | + if (empty($prepared_source->source)) { |
|
495 | + $localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe'); |
|
496 | + throw new WC_Stripe_Exception(print_r($prepared_source, true), $localized_message); |
|
497 | 497 | } |
498 | 498 | } |
499 | 499 | |
@@ -505,17 +505,17 @@ discard block |
||
505 | 505 | * @param WC_Order $order The order those payment is being processed. |
506 | 506 | * @return bool A flag that indicates that the customer does not exist and should be removed. |
507 | 507 | */ |
508 | - public function maybe_remove_non_existent_customer( $error, $order ) { |
|
509 | - if ( ! $this->is_no_such_customer_error( $error ) ) { |
|
508 | + public function maybe_remove_non_existent_customer($error, $order) { |
|
509 | + if ( ! $this->is_no_such_customer_error($error)) { |
|
510 | 510 | return false; |
511 | 511 | } |
512 | 512 | |
513 | - if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
514 | - delete_user_meta( $order->customer_user, '_stripe_customer_id' ); |
|
515 | - delete_post_meta( $order->get_id(), '_stripe_customer_id' ); |
|
513 | + if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
514 | + delete_user_meta($order->customer_user, '_stripe_customer_id'); |
|
515 | + delete_post_meta($order->get_id(), '_stripe_customer_id'); |
|
516 | 516 | } else { |
517 | - delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' ); |
|
518 | - $order->delete_meta_data( '_stripe_customer_id' ); |
|
517 | + delete_user_meta($order->get_customer_id(), '_stripe_customer_id'); |
|
518 | + $order->delete_meta_data('_stripe_customer_id'); |
|
519 | 519 | $order->save(); |
520 | 520 | } |
521 | 521 | |
@@ -531,16 +531,16 @@ discard block |
||
531 | 531 | * @param boolean $force_save_source Whether the payment source must be saved, like when dealing with a Subscription setup. |
532 | 532 | * @return array Redirection data for `process_payment`. |
533 | 533 | */ |
534 | - public function complete_free_order( $order, $prepared_source, $force_save_source ) { |
|
534 | + public function complete_free_order($order, $prepared_source, $force_save_source) { |
|
535 | 535 | $response = array( |
536 | 536 | 'result' => 'success', |
537 | - 'redirect' => $this->get_return_url( $order ), |
|
537 | + 'redirect' => $this->get_return_url($order), |
|
538 | 538 | ); |
539 | 539 | |
540 | - if ( $force_save_source ) { |
|
541 | - $intent_secret = $this->setup_intent( $order, $prepared_source ); |
|
540 | + if ($force_save_source) { |
|
541 | + $intent_secret = $this->setup_intent($order, $prepared_source); |
|
542 | 542 | |
543 | - if ( ! empty( $intent_secret ) ) { |
|
543 | + if ( ! empty($intent_secret)) { |
|
544 | 544 | $response['setup_intent_secret'] = $intent_secret; |
545 | 545 | return $response; |
546 | 546 | } |
@@ -568,76 +568,76 @@ discard block |
||
568 | 568 | * @throws Exception If payment will not be accepted. |
569 | 569 | * @return array|void |
570 | 570 | */ |
571 | - public function process_payment( $order_id, $retry = true, $force_save_source = false, $previous_error = false ) { |
|
571 | + public function process_payment($order_id, $retry = true, $force_save_source = false, $previous_error = false) { |
|
572 | 572 | try { |
573 | - $order = wc_get_order( $order_id ); |
|
573 | + $order = wc_get_order($order_id); |
|
574 | 574 | |
575 | 575 | // ToDo: `process_pre_order` saves the source to the order for a later payment. |
576 | 576 | // This might not work well with PaymentIntents. |
577 | - if ( $this->maybe_process_pre_orders( $order_id ) ) { |
|
578 | - return $this->pre_orders->process_pre_order( $order_id ); |
|
577 | + if ($this->maybe_process_pre_orders($order_id)) { |
|
578 | + return $this->pre_orders->process_pre_order($order_id); |
|
579 | 579 | } |
580 | 580 | |
581 | 581 | // Check whether there is an existing intent. |
582 | - $intent = $this->get_intent_from_order( $order ); |
|
583 | - if ( isset( $intent->object ) && 'setup_intent' === $intent->object ) { |
|
582 | + $intent = $this->get_intent_from_order($order); |
|
583 | + if (isset($intent->object) && 'setup_intent' === $intent->object) { |
|
584 | 584 | $intent = false; // This function can only deal with *payment* intents |
585 | 585 | } |
586 | 586 | |
587 | 587 | $stripe_customer_id = null; |
588 | - if ( $intent ) { |
|
588 | + if ($intent) { |
|
589 | 589 | $stripe_customer_id = $intent->customer; |
590 | 590 | } |
591 | 591 | |
592 | - $prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source, $stripe_customer_id ); |
|
592 | + $prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source, $stripe_customer_id); |
|
593 | 593 | |
594 | - $this->maybe_disallow_prepaid_card( $prepared_source ); |
|
595 | - $this->check_source( $prepared_source ); |
|
596 | - $this->save_source_to_order( $order, $prepared_source ); |
|
594 | + $this->maybe_disallow_prepaid_card($prepared_source); |
|
595 | + $this->check_source($prepared_source); |
|
596 | + $this->save_source_to_order($order, $prepared_source); |
|
597 | 597 | |
598 | - if ( 0 >= $order->get_total() ) { |
|
599 | - return $this->complete_free_order( $order, $prepared_source, $force_save_source ); |
|
598 | + if (0 >= $order->get_total()) { |
|
599 | + return $this->complete_free_order($order, $prepared_source, $force_save_source); |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | // This will throw exception if not valid. |
603 | - $this->validate_minimum_order_amount( $order ); |
|
603 | + $this->validate_minimum_order_amount($order); |
|
604 | 604 | |
605 | - WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" ); |
|
605 | + WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}"); |
|
606 | 606 | |
607 | - if ( $intent ) { |
|
608 | - $intent = $this->update_existing_intent( $intent, $order, $prepared_source ); |
|
607 | + if ($intent) { |
|
608 | + $intent = $this->update_existing_intent($intent, $order, $prepared_source); |
|
609 | 609 | } else { |
610 | - $intent = $this->create_intent( $order, $prepared_source ); |
|
610 | + $intent = $this->create_intent($order, $prepared_source); |
|
611 | 611 | } |
612 | 612 | |
613 | 613 | // Confirm the intent after locking the order to make sure webhooks will not interfere. |
614 | - if ( empty( $intent->error ) ) { |
|
615 | - $this->lock_order_payment( $order, $intent ); |
|
616 | - $intent = $this->confirm_intent( $intent, $order, $prepared_source ); |
|
614 | + if (empty($intent->error)) { |
|
615 | + $this->lock_order_payment($order, $intent); |
|
616 | + $intent = $this->confirm_intent($intent, $order, $prepared_source); |
|
617 | 617 | } |
618 | 618 | |
619 | - if ( ! empty( $intent->error ) ) { |
|
620 | - $this->maybe_remove_non_existent_customer( $intent->error, $order ); |
|
619 | + if ( ! empty($intent->error)) { |
|
620 | + $this->maybe_remove_non_existent_customer($intent->error, $order); |
|
621 | 621 | |
622 | 622 | // We want to retry. |
623 | - if ( $this->is_retryable_error( $intent->error ) ) { |
|
624 | - return $this->retry_after_error( $intent, $order, $retry, $force_save_source, $previous_error ); |
|
623 | + if ($this->is_retryable_error($intent->error)) { |
|
624 | + return $this->retry_after_error($intent, $order, $retry, $force_save_source, $previous_error); |
|
625 | 625 | } |
626 | 626 | |
627 | - $this->unlock_order_payment( $order ); |
|
628 | - $this->throw_localized_message( $intent, $order ); |
|
627 | + $this->unlock_order_payment($order); |
|
628 | + $this->throw_localized_message($intent, $order); |
|
629 | 629 | } |
630 | 630 | |
631 | - if ( ! empty( $intent ) ) { |
|
631 | + if ( ! empty($intent)) { |
|
632 | 632 | // Use the last charge within the intent to proceed. |
633 | - $response = end( $intent->charges->data ); |
|
633 | + $response = end($intent->charges->data); |
|
634 | 634 | |
635 | 635 | // If the intent requires a 3DS flow, redirect to it. |
636 | - if ( 'requires_action' === $intent->status ) { |
|
637 | - $this->unlock_order_payment( $order ); |
|
636 | + if ('requires_action' === $intent->status) { |
|
637 | + $this->unlock_order_payment($order); |
|
638 | 638 | |
639 | - if ( is_wc_endpoint_url( 'order-pay' ) ) { |
|
640 | - $redirect_url = add_query_arg( 'wc-stripe-confirmation', 1, $order->get_checkout_payment_url( false ) ); |
|
639 | + if (is_wc_endpoint_url('order-pay')) { |
|
640 | + $redirect_url = add_query_arg('wc-stripe-confirmation', 1, $order->get_checkout_payment_url(false)); |
|
641 | 641 | |
642 | 642 | return array( |
643 | 643 | 'result' => 'success', |
@@ -652,7 +652,7 @@ discard block |
||
652 | 652 | |
653 | 653 | return array( |
654 | 654 | 'result' => 'success', |
655 | - 'redirect' => $this->get_return_url( $order ), |
|
655 | + 'redirect' => $this->get_return_url($order), |
|
656 | 656 | 'payment_intent_secret' => $intent->client_secret, |
657 | 657 | ); |
658 | 658 | } |
@@ -660,30 +660,30 @@ discard block |
||
660 | 660 | } |
661 | 661 | |
662 | 662 | // Process valid response. |
663 | - $this->process_response( $response, $order ); |
|
663 | + $this->process_response($response, $order); |
|
664 | 664 | |
665 | 665 | // Remove cart. |
666 | - if ( isset( WC()->cart ) ) { |
|
666 | + if (isset(WC()->cart)) { |
|
667 | 667 | WC()->cart->empty_cart(); |
668 | 668 | } |
669 | 669 | |
670 | 670 | // Unlock the order. |
671 | - $this->unlock_order_payment( $order ); |
|
671 | + $this->unlock_order_payment($order); |
|
672 | 672 | |
673 | 673 | // Return thank you page redirect. |
674 | 674 | return array( |
675 | 675 | 'result' => 'success', |
676 | - 'redirect' => $this->get_return_url( $order ), |
|
676 | + 'redirect' => $this->get_return_url($order), |
|
677 | 677 | ); |
678 | 678 | |
679 | - } catch ( WC_Stripe_Exception $e ) { |
|
680 | - wc_add_notice( $e->getLocalizedMessage(), 'error' ); |
|
681 | - WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() ); |
|
679 | + } catch (WC_Stripe_Exception $e) { |
|
680 | + wc_add_notice($e->getLocalizedMessage(), 'error'); |
|
681 | + WC_Stripe_Logger::log('Error: ' . $e->getMessage()); |
|
682 | 682 | |
683 | - do_action( 'wc_gateway_stripe_process_payment_error', $e, $order ); |
|
683 | + do_action('wc_gateway_stripe_process_payment_error', $e, $order); |
|
684 | 684 | |
685 | 685 | /* translators: error message */ |
686 | - $order->update_status( 'failed' ); |
|
686 | + $order->update_status('failed'); |
|
687 | 687 | |
688 | 688 | return array( |
689 | 689 | 'result' => 'fail', |
@@ -699,17 +699,17 @@ discard block |
||
699 | 699 | * |
700 | 700 | * @param int $order_id The ID of the order. |
701 | 701 | */ |
702 | - public function display_order_fee( $order_id ) { |
|
703 | - if ( apply_filters( 'wc_stripe_hide_display_order_fee', false, $order_id ) ) { |
|
702 | + public function display_order_fee($order_id) { |
|
703 | + if (apply_filters('wc_stripe_hide_display_order_fee', false, $order_id)) { |
|
704 | 704 | return; |
705 | 705 | } |
706 | 706 | |
707 | - $order = wc_get_order( $order_id ); |
|
707 | + $order = wc_get_order($order_id); |
|
708 | 708 | |
709 | - $fee = WC_Stripe_Helper::get_stripe_fee( $order ); |
|
710 | - $currency = WC_Stripe_Helper::get_stripe_currency( $order ); |
|
709 | + $fee = WC_Stripe_Helper::get_stripe_fee($order); |
|
710 | + $currency = WC_Stripe_Helper::get_stripe_currency($order); |
|
711 | 711 | |
712 | - if ( ! $fee || ! $currency ) { |
|
712 | + if ( ! $fee || ! $currency) { |
|
713 | 713 | return; |
714 | 714 | } |
715 | 715 | |
@@ -717,12 +717,12 @@ discard block |
||
717 | 717 | |
718 | 718 | <tr> |
719 | 719 | <td class="label stripe-fee"> |
720 | - <?php echo wc_help_tip( __( 'This represents the fee Stripe collects for the transaction.', 'woocommerce-gateway-stripe' ) ); // wpcs: xss ok. ?> |
|
721 | - <?php esc_html_e( 'Stripe Fee:', 'woocommerce-gateway-stripe' ); ?> |
|
720 | + <?php echo wc_help_tip(__('This represents the fee Stripe collects for the transaction.', 'woocommerce-gateway-stripe')); // wpcs: xss ok. ?> |
|
721 | + <?php esc_html_e('Stripe Fee:', 'woocommerce-gateway-stripe'); ?> |
|
722 | 722 | </td> |
723 | 723 | <td width="1%"></td> |
724 | 724 | <td class="total"> |
725 | - - <?php echo wc_price( $fee, array( 'currency' => $currency ) ); // wpcs: xss ok. ?> |
|
725 | + - <?php echo wc_price($fee, array('currency' => $currency)); // wpcs: xss ok. ?> |
|
726 | 726 | </td> |
727 | 727 | </tr> |
728 | 728 | |
@@ -736,17 +736,17 @@ discard block |
||
736 | 736 | * |
737 | 737 | * @param int $order_id The ID of the order. |
738 | 738 | */ |
739 | - public function display_order_payout( $order_id ) { |
|
740 | - if ( apply_filters( 'wc_stripe_hide_display_order_payout', false, $order_id ) ) { |
|
739 | + public function display_order_payout($order_id) { |
|
740 | + if (apply_filters('wc_stripe_hide_display_order_payout', false, $order_id)) { |
|
741 | 741 | return; |
742 | 742 | } |
743 | 743 | |
744 | - $order = wc_get_order( $order_id ); |
|
744 | + $order = wc_get_order($order_id); |
|
745 | 745 | |
746 | - $net = WC_Stripe_Helper::get_stripe_net( $order ); |
|
747 | - $currency = WC_Stripe_Helper::get_stripe_currency( $order ); |
|
746 | + $net = WC_Stripe_Helper::get_stripe_net($order); |
|
747 | + $currency = WC_Stripe_Helper::get_stripe_currency($order); |
|
748 | 748 | |
749 | - if ( ! $net || ! $currency ) { |
|
749 | + if ( ! $net || ! $currency) { |
|
750 | 750 | return; |
751 | 751 | } |
752 | 752 | |
@@ -754,12 +754,12 @@ discard block |
||
754 | 754 | |
755 | 755 | <tr> |
756 | 756 | <td class="label stripe-payout"> |
757 | - <?php echo wc_help_tip( __( 'This represents the net total that will be credited to your Stripe bank account. This may be in the currency that is set in your Stripe account.', 'woocommerce-gateway-stripe' ) ); // wpcs: xss ok. ?> |
|
758 | - <?php esc_html_e( 'Stripe Payout:', 'woocommerce-gateway-stripe' ); ?> |
|
757 | + <?php echo wc_help_tip(__('This represents the net total that will be credited to your Stripe bank account. This may be in the currency that is set in your Stripe account.', 'woocommerce-gateway-stripe')); // wpcs: xss ok. ?> |
|
758 | + <?php esc_html_e('Stripe Payout:', 'woocommerce-gateway-stripe'); ?> |
|
759 | 759 | </td> |
760 | 760 | <td width="1%"></td> |
761 | 761 | <td class="total"> |
762 | - <?php echo wc_price( $net, array( 'currency' => $currency ) ); // wpcs: xss ok. ?> |
|
762 | + <?php echo wc_price($net, array('currency' => $currency)); // wpcs: xss ok. ?> |
|
763 | 763 | </td> |
764 | 764 | </tr> |
765 | 765 | |
@@ -774,18 +774,18 @@ discard block |
||
774 | 774 | * @param WC_Order $order The order to add a note to. |
775 | 775 | * @throws WC_Stripe_Exception An exception with the right message. |
776 | 776 | */ |
777 | - public function throw_localized_message( $response, $order ) { |
|
777 | + public function throw_localized_message($response, $order) { |
|
778 | 778 | $localized_messages = WC_Stripe_Helper::get_localized_messages(); |
779 | 779 | |
780 | - if ( 'card_error' === $response->error->type ) { |
|
781 | - $localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message; |
|
780 | + if ('card_error' === $response->error->type) { |
|
781 | + $localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message; |
|
782 | 782 | } else { |
783 | - $localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message; |
|
783 | + $localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message; |
|
784 | 784 | } |
785 | 785 | |
786 | - $order->add_order_note( $localized_message ); |
|
786 | + $order->add_order_note($localized_message); |
|
787 | 787 | |
788 | - throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message ); |
|
788 | + throw new WC_Stripe_Exception(print_r($response, true), $localized_message); |
|
789 | 789 | } |
790 | 790 | |
791 | 791 | /** |
@@ -800,22 +800,22 @@ discard block |
||
800 | 800 | * @throws WC_Stripe_Exception If the payment is not accepted. |
801 | 801 | * @return array|void |
802 | 802 | */ |
803 | - public function retry_after_error( $response, $order, $retry, $force_save_source, $previous_error ) { |
|
804 | - if ( ! $retry ) { |
|
805 | - $localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' ); |
|
806 | - $order->add_order_note( $localized_message ); |
|
807 | - throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions. |
|
803 | + public function retry_after_error($response, $order, $retry, $force_save_source, $previous_error) { |
|
804 | + if ( ! $retry) { |
|
805 | + $localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe'); |
|
806 | + $order->add_order_note($localized_message); |
|
807 | + throw new WC_Stripe_Exception(print_r($response, true), $localized_message); // phpcs:ignore WordPress.PHP.DevelopmentFunctions. |
|
808 | 808 | } |
809 | 809 | |
810 | 810 | // Don't do anymore retries after this. |
811 | - if ( 5 <= $this->retry_interval ) { |
|
812 | - return $this->process_payment( $order->get_id(), false, $force_save_source, $response->error, $previous_error ); |
|
811 | + if (5 <= $this->retry_interval) { |
|
812 | + return $this->process_payment($order->get_id(), false, $force_save_source, $response->error, $previous_error); |
|
813 | 813 | } |
814 | 814 | |
815 | - sleep( $this->retry_interval ); |
|
815 | + sleep($this->retry_interval); |
|
816 | 816 | $this->retry_interval++; |
817 | 817 | |
818 | - return $this->process_payment( $order->get_id(), true, $force_save_source, $response->error, $previous_error ); |
|
818 | + return $this->process_payment($order->get_id(), true, $force_save_source, $response->error, $previous_error); |
|
819 | 819 | } |
820 | 820 | |
821 | 821 | /** |
@@ -826,23 +826,23 @@ discard block |
||
826 | 826 | * @param WC_Payment_Gateway[] $gateways A list of all available gateways. |
827 | 827 | * @return WC_Payment_Gateway[] Either the same list or an empty one in the right conditions. |
828 | 828 | */ |
829 | - public function prepare_order_pay_page( $gateways ) { |
|
830 | - if ( ! is_wc_endpoint_url( 'order-pay' ) || ! isset( $_GET['wc-stripe-confirmation'] ) ) { // wpcs: csrf ok. |
|
829 | + public function prepare_order_pay_page($gateways) { |
|
830 | + if ( ! is_wc_endpoint_url('order-pay') || ! isset($_GET['wc-stripe-confirmation'])) { // wpcs: csrf ok. |
|
831 | 831 | return $gateways; |
832 | 832 | } |
833 | 833 | |
834 | 834 | try { |
835 | 835 | $this->prepare_intent_for_order_pay_page(); |
836 | - } catch ( WC_Stripe_Exception $e ) { |
|
836 | + } catch (WC_Stripe_Exception $e) { |
|
837 | 837 | // Just show the full order pay page if there was a problem preparing the Payment Intent |
838 | 838 | return $gateways; |
839 | 839 | } |
840 | 840 | |
841 | - add_filter( 'woocommerce_checkout_show_terms', '__return_false' ); |
|
842 | - add_filter( 'woocommerce_pay_order_button_html', '__return_false' ); |
|
843 | - add_filter( 'woocommerce_available_payment_gateways', '__return_empty_array' ); |
|
844 | - add_filter( 'woocommerce_no_available_payment_methods_message', array( $this, 'change_no_available_methods_message' ) ); |
|
845 | - add_action( 'woocommerce_pay_order_after_submit', array( $this, 'render_payment_intent_inputs' ) ); |
|
841 | + add_filter('woocommerce_checkout_show_terms', '__return_false'); |
|
842 | + add_filter('woocommerce_pay_order_button_html', '__return_false'); |
|
843 | + add_filter('woocommerce_available_payment_gateways', '__return_empty_array'); |
|
844 | + add_filter('woocommerce_no_available_payment_methods_message', array($this, 'change_no_available_methods_message')); |
|
845 | + add_action('woocommerce_pay_order_after_submit', array($this, 'render_payment_intent_inputs')); |
|
846 | 846 | |
847 | 847 | return array(); |
848 | 848 | } |
@@ -855,7 +855,7 @@ discard block |
||
855 | 855 | * @return string the new message. |
856 | 856 | */ |
857 | 857 | public function change_no_available_methods_message() { |
858 | - return wpautop( __( "Almost there!\n\nYour order has already been created, the only thing that still needs to be done is for you to authorize the payment with your bank.", 'woocommerce-gateway-stripe' ) ); |
|
858 | + return wpautop(__("Almost there!\n\nYour order has already been created, the only thing that still needs to be done is for you to authorize the payment with your bank.", 'woocommerce-gateway-stripe')); |
|
859 | 859 | } |
860 | 860 | |
861 | 861 | /** |
@@ -866,23 +866,23 @@ discard block |
||
866 | 866 | * @throws WC_Stripe_Exception |
867 | 867 | * @since 4.3 |
868 | 868 | */ |
869 | - public function prepare_intent_for_order_pay_page( $order = null ) { |
|
870 | - if ( ! isset( $order ) || empty( $order ) ) { |
|
871 | - $order = wc_get_order( absint( get_query_var( 'order-pay' ) ) ); |
|
869 | + public function prepare_intent_for_order_pay_page($order = null) { |
|
870 | + if ( ! isset($order) || empty($order)) { |
|
871 | + $order = wc_get_order(absint(get_query_var('order-pay'))); |
|
872 | 872 | } |
873 | - $intent = $this->get_intent_from_order( $order ); |
|
873 | + $intent = $this->get_intent_from_order($order); |
|
874 | 874 | |
875 | - if ( ! $intent ) { |
|
876 | - throw new WC_Stripe_Exception( 'Payment Intent not found', __( 'Payment Intent not found for order #' . $order->get_id(), 'woocommerce-gateway-stripe' ) ); |
|
875 | + if ( ! $intent) { |
|
876 | + throw new WC_Stripe_Exception('Payment Intent not found', __('Payment Intent not found for order #' . $order->get_id(), 'woocommerce-gateway-stripe')); |
|
877 | 877 | } |
878 | 878 | |
879 | - if ( 'requires_payment_method' === $intent->status && isset( $intent->last_payment_error ) |
|
880 | - && 'authentication_required' === $intent->last_payment_error->code ) { |
|
881 | - $intent = WC_Stripe_API::request( array( |
|
879 | + if ('requires_payment_method' === $intent->status && isset($intent->last_payment_error) |
|
880 | + && 'authentication_required' === $intent->last_payment_error->code) { |
|
881 | + $intent = WC_Stripe_API::request(array( |
|
882 | 882 | 'payment_method' => $intent->last_payment_error->source->id, |
883 | - ), 'payment_intents/' . $intent->id . '/confirm' ); |
|
884 | - if ( isset( $intent->error ) ) { |
|
885 | - throw new WC_Stripe_Exception( print_r( $intent, true ), $intent->error->message ); |
|
883 | + ), 'payment_intents/' . $intent->id . '/confirm'); |
|
884 | + if (isset($intent->error)) { |
|
885 | + throw new WC_Stripe_Exception(print_r($intent, true), $intent->error->message); |
|
886 | 886 | } |
887 | 887 | } |
888 | 888 | |
@@ -897,26 +897,26 @@ discard block |
||
897 | 897 | * @throws WC_Stripe_Exception |
898 | 898 | * @since 4.2 |
899 | 899 | */ |
900 | - public function render_payment_intent_inputs( $order = null ) { |
|
901 | - if ( ! isset( $order ) || empty( $order ) ) { |
|
902 | - $order = wc_get_order( absint( get_query_var( 'order-pay' ) ) ); |
|
900 | + public function render_payment_intent_inputs($order = null) { |
|
901 | + if ( ! isset($order) || empty($order)) { |
|
902 | + $order = wc_get_order(absint(get_query_var('order-pay'))); |
|
903 | 903 | } |
904 | - if ( ! isset( $this->order_pay_intent ) ) { |
|
905 | - $this->prepare_intent_for_order_pay_page( $order ); |
|
904 | + if ( ! isset($this->order_pay_intent)) { |
|
905 | + $this->prepare_intent_for_order_pay_page($order); |
|
906 | 906 | } |
907 | 907 | |
908 | 908 | $verification_url = add_query_arg( |
909 | 909 | array( |
910 | 910 | 'order' => $order->get_id(), |
911 | - 'nonce' => wp_create_nonce( 'wc_stripe_confirm_pi' ), |
|
912 | - 'redirect_to' => rawurlencode( $this->get_return_url( $order ) ), |
|
911 | + 'nonce' => wp_create_nonce('wc_stripe_confirm_pi'), |
|
912 | + 'redirect_to' => rawurlencode($this->get_return_url($order)), |
|
913 | 913 | 'is_pay_for_order' => true, |
914 | 914 | ), |
915 | - WC_AJAX::get_endpoint( 'wc_stripe_verify_intent' ) |
|
915 | + WC_AJAX::get_endpoint('wc_stripe_verify_intent') |
|
916 | 916 | ); |
917 | 917 | |
918 | - echo '<input type="hidden" id="stripe-intent-id" value="' . esc_attr( $this->order_pay_intent->client_secret ) . '" />'; |
|
919 | - echo '<input type="hidden" id="stripe-intent-return" value="' . esc_attr( $verification_url ) . '" />'; |
|
918 | + echo '<input type="hidden" id="stripe-intent-id" value="' . esc_attr($this->order_pay_intent->client_secret) . '" />'; |
|
919 | + echo '<input type="hidden" id="stripe-intent-return" value="' . esc_attr($verification_url) . '" />'; |
|
920 | 920 | } |
921 | 921 | |
922 | 922 | /** |
@@ -926,11 +926,11 @@ discard block |
||
926 | 926 | * @param WC_Payment_Token $token Payment Token. |
927 | 927 | * @return string Generated payment method HTML |
928 | 928 | */ |
929 | - public function get_saved_payment_method_option_html( $token ) { |
|
930 | - $html = parent::get_saved_payment_method_option_html( $token ); |
|
929 | + public function get_saved_payment_method_option_html($token) { |
|
930 | + $html = parent::get_saved_payment_method_option_html($token); |
|
931 | 931 | $error_wrapper = '<div class="stripe-source-errors" role="alert"></div>'; |
932 | 932 | |
933 | - return preg_replace( '~</(\w+)>\s*$~', "$error_wrapper</$1>", $html ); |
|
933 | + return preg_replace('~</(\w+)>\s*$~', "$error_wrapper</$1>", $html); |
|
934 | 934 | } |
935 | 935 | |
936 | 936 | /** |
@@ -940,18 +940,18 @@ discard block |
||
940 | 940 | * @since 4.2.0 |
941 | 941 | * @param int $order_id The ID that will be used for the thank you page. |
942 | 942 | */ |
943 | - public function check_intent_status_on_order_page( $order_id ) { |
|
944 | - if ( empty( $order_id ) || absint( $order_id ) <= 0 ) { |
|
943 | + public function check_intent_status_on_order_page($order_id) { |
|
944 | + if (empty($order_id) || absint($order_id) <= 0) { |
|
945 | 945 | return; |
946 | 946 | } |
947 | 947 | |
948 | - $order = wc_get_order( absint( $order_id ) ); |
|
948 | + $order = wc_get_order(absint($order_id)); |
|
949 | 949 | |
950 | - if ( ! $order ) { |
|
950 | + if ( ! $order) { |
|
951 | 951 | return; |
952 | 952 | } |
953 | 953 | |
954 | - $this->verify_intent_after_checkout( $order ); |
|
954 | + $this->verify_intent_after_checkout($order); |
|
955 | 955 | } |
956 | 956 | |
957 | 957 | /** |
@@ -965,8 +965,8 @@ discard block |
||
965 | 965 | * @param int $order_id The ID of the order which is being paid for. |
966 | 966 | * @return array |
967 | 967 | */ |
968 | - public function modify_successful_payment_result( $result, $order_id ) { |
|
969 | - if ( ! isset( $result['payment_intent_secret'] ) && ! isset( $result['setup_intent_secret'] ) ) { |
|
968 | + public function modify_successful_payment_result($result, $order_id) { |
|
969 | + if ( ! isset($result['payment_intent_secret']) && ! isset($result['setup_intent_secret'])) { |
|
970 | 970 | // Only redirects with intents need to be modified. |
971 | 971 | return $result; |
972 | 972 | } |
@@ -975,16 +975,16 @@ discard block |
||
975 | 975 | $verification_url = add_query_arg( |
976 | 976 | array( |
977 | 977 | 'order' => $order_id, |
978 | - 'nonce' => wp_create_nonce( 'wc_stripe_confirm_pi' ), |
|
979 | - 'redirect_to' => rawurlencode( $result['redirect'] ), |
|
978 | + 'nonce' => wp_create_nonce('wc_stripe_confirm_pi'), |
|
979 | + 'redirect_to' => rawurlencode($result['redirect']), |
|
980 | 980 | ), |
981 | - WC_AJAX::get_endpoint( 'wc_stripe_verify_intent' ) |
|
981 | + WC_AJAX::get_endpoint('wc_stripe_verify_intent') |
|
982 | 982 | ); |
983 | 983 | |
984 | - if ( isset( $result['payment_intent_secret'] ) ) { |
|
985 | - $redirect = sprintf( '#confirm-pi-%s:%s', $result['payment_intent_secret'], rawurlencode( $verification_url ) ); |
|
986 | - } else if ( isset( $result['setup_intent_secret'] ) ) { |
|
987 | - $redirect = sprintf( '#confirm-si-%s:%s', $result['setup_intent_secret'], rawurlencode( $verification_url ) ); |
|
984 | + if (isset($result['payment_intent_secret'])) { |
|
985 | + $redirect = sprintf('#confirm-pi-%s:%s', $result['payment_intent_secret'], rawurlencode($verification_url)); |
|
986 | + } else if (isset($result['setup_intent_secret'])) { |
|
987 | + $redirect = sprintf('#confirm-si-%s:%s', $result['setup_intent_secret'], rawurlencode($verification_url)); |
|
988 | 988 | } |
989 | 989 | |
990 | 990 | return array( |
@@ -996,8 +996,8 @@ discard block |
||
996 | 996 | /** |
997 | 997 | * Proceed with current request using new login session (to ensure consistent nonce). |
998 | 998 | */ |
999 | - public function set_cookie_on_current_request( $cookie ) { |
|
1000 | - $_COOKIE[ LOGGED_IN_COOKIE ] = $cookie; |
|
999 | + public function set_cookie_on_current_request($cookie) { |
|
1000 | + $_COOKIE[LOGGED_IN_COOKIE] = $cookie; |
|
1001 | 1001 | } |
1002 | 1002 | |
1003 | 1003 | /** |
@@ -1007,48 +1007,48 @@ discard block |
||
1007 | 1007 | * @since 4.2.0 |
1008 | 1008 | * @param WC_Order $order The order which is in a transitional state. |
1009 | 1009 | */ |
1010 | - public function verify_intent_after_checkout( $order ) { |
|
1011 | - $payment_method = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->payment_method : $order->get_payment_method(); |
|
1012 | - if ( $payment_method !== $this->id ) { |
|
1010 | + public function verify_intent_after_checkout($order) { |
|
1011 | + $payment_method = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->payment_method : $order->get_payment_method(); |
|
1012 | + if ($payment_method !== $this->id) { |
|
1013 | 1013 | // If this is not the payment method, an intent would not be available. |
1014 | 1014 | return; |
1015 | 1015 | } |
1016 | 1016 | |
1017 | - $intent = $this->get_intent_from_order( $order ); |
|
1018 | - if ( ! $intent ) { |
|
1017 | + $intent = $this->get_intent_from_order($order); |
|
1018 | + if ( ! $intent) { |
|
1019 | 1019 | // No intent, redirect to the order received page for further actions. |
1020 | 1020 | return; |
1021 | 1021 | } |
1022 | 1022 | |
1023 | 1023 | // A webhook might have modified or locked the order while the intent was retreived. This ensures we are reading the right status. |
1024 | - clean_post_cache( $order->get_id() ); |
|
1025 | - $order = wc_get_order( $order->get_id() ); |
|
1024 | + clean_post_cache($order->get_id()); |
|
1025 | + $order = wc_get_order($order->get_id()); |
|
1026 | 1026 | |
1027 | - if ( ! $order->has_status( array( 'pending', 'failed' ) ) ) { |
|
1027 | + if ( ! $order->has_status(array('pending', 'failed'))) { |
|
1028 | 1028 | // If payment has already been completed, this function is redundant. |
1029 | 1029 | return; |
1030 | 1030 | } |
1031 | 1031 | |
1032 | - if ( $this->lock_order_payment( $order, $intent ) ) { |
|
1032 | + if ($this->lock_order_payment($order, $intent)) { |
|
1033 | 1033 | return; |
1034 | 1034 | } |
1035 | 1035 | |
1036 | - if ( 'setup_intent' === $intent->object && 'succeeded' === $intent->status ) { |
|
1036 | + if ('setup_intent' === $intent->object && 'succeeded' === $intent->status) { |
|
1037 | 1037 | WC()->cart->empty_cart(); |
1038 | - if ( WC_Stripe_Helper::is_pre_orders_exists() && WC_Pre_Orders_Order::order_contains_pre_order( $order ) ) { |
|
1039 | - WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order ); |
|
1038 | + if (WC_Stripe_Helper::is_pre_orders_exists() && WC_Pre_Orders_Order::order_contains_pre_order($order)) { |
|
1039 | + WC_Pre_Orders_Order::mark_order_as_pre_ordered($order); |
|
1040 | 1040 | } else { |
1041 | 1041 | $order->payment_complete(); |
1042 | 1042 | } |
1043 | - } else if ( 'succeeded' === $intent->status || 'requires_capture' === $intent->status ) { |
|
1043 | + } else if ('succeeded' === $intent->status || 'requires_capture' === $intent->status) { |
|
1044 | 1044 | // Proceed with the payment completion. |
1045 | - $this->process_response( end( $intent->charges->data ), $order ); |
|
1046 | - } else if ( 'requires_payment_method' === $intent->status ) { |
|
1045 | + $this->process_response(end($intent->charges->data), $order); |
|
1046 | + } else if ('requires_payment_method' === $intent->status) { |
|
1047 | 1047 | // `requires_payment_method` means that SCA got denied for the current payment method. |
1048 | - $this->failed_sca_auth( $order, $intent ); |
|
1048 | + $this->failed_sca_auth($order, $intent); |
|
1049 | 1049 | } |
1050 | 1050 | |
1051 | - $this->unlock_order_payment( $order ); |
|
1051 | + $this->unlock_order_payment($order); |
|
1052 | 1052 | } |
1053 | 1053 | |
1054 | 1054 | /** |
@@ -1058,18 +1058,18 @@ discard block |
||
1058 | 1058 | * @param WC_Order $order The order which should be checked. |
1059 | 1059 | * @param object $intent The intent, associated with the order. |
1060 | 1060 | */ |
1061 | - public function failed_sca_auth( $order, $intent ) { |
|
1061 | + public function failed_sca_auth($order, $intent) { |
|
1062 | 1062 | // If the order has already failed, do not repeat the same message. |
1063 | - if ( $order->has_status( 'failed' ) ) { |
|
1063 | + if ($order->has_status('failed')) { |
|
1064 | 1064 | return; |
1065 | 1065 | } |
1066 | 1066 | |
1067 | 1067 | // Load the right message and update the status. |
1068 | - $status_message = isset( $intent->last_payment_error ) |
|
1068 | + $status_message = isset($intent->last_payment_error) |
|
1069 | 1069 | /* translators: 1) The error message that was received from Stripe. */ |
1070 | - ? sprintf( __( 'Stripe SCA authentication failed. Reason: %s', 'woocommerce-gateway-stripe' ), $intent->last_payment_error->message ) |
|
1071 | - : __( 'Stripe SCA authentication failed.', 'woocommerce-gateway-stripe' ); |
|
1072 | - $order->update_status( 'failed', $status_message ); |
|
1070 | + ? sprintf(__('Stripe SCA authentication failed. Reason: %s', 'woocommerce-gateway-stripe'), $intent->last_payment_error->message) |
|
1071 | + : __('Stripe SCA authentication failed.', 'woocommerce-gateway-stripe'); |
|
1072 | + $order->update_status('failed', $status_message); |
|
1073 | 1073 | } |
1074 | 1074 | |
1075 | 1075 | /** |
@@ -1080,10 +1080,10 @@ discard block |
||
1080 | 1080 | * |
1081 | 1081 | * @return string Checkout URL for the given order. |
1082 | 1082 | */ |
1083 | - public function get_checkout_payment_url( $pay_url, $order ) { |
|
1083 | + public function get_checkout_payment_url($pay_url, $order) { |
|
1084 | 1084 | global $wp; |
1085 | - if ( isset( $_GET['wc-stripe-confirmation'] ) && isset( $wp->query_vars['order-pay'] ) && $wp->query_vars['order-pay'] == $order->get_id() ) { |
|
1086 | - $pay_url = add_query_arg( 'wc-stripe-confirmation', 1, $pay_url ); |
|
1085 | + if (isset($_GET['wc-stripe-confirmation']) && isset($wp->query_vars['order-pay']) && $wp->query_vars['order-pay'] == $order->get_id()) { |
|
1086 | + $pay_url = add_query_arg('wc-stripe-confirmation', 1, $pay_url); |
|
1087 | 1087 | } |
1088 | 1088 | return $pay_url; |
1089 | 1089 | } |
@@ -1,5 +1,5 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -21,9 +21,9 @@ discard block |
||
21 | 21 | * @since 4.1.0 |
22 | 22 | */ |
23 | 23 | public function __construct() { |
24 | - add_action( 'admin_notices', array( $this, 'admin_notices' ) ); |
|
25 | - add_action( 'wp_loaded', array( $this, 'hide_notices' ) ); |
|
26 | - add_action( 'woocommerce_stripe_updated', array( $this, 'stripe_updated' ) ); |
|
24 | + add_action('admin_notices', array($this, 'admin_notices')); |
|
25 | + add_action('wp_loaded', array($this, 'hide_notices')); |
|
26 | + add_action('woocommerce_stripe_updated', array($this, 'stripe_updated')); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | * @since 1.0.0 |
33 | 33 | * @version 4.0.0 |
34 | 34 | */ |
35 | - public function add_admin_notice( $slug, $class, $message, $dismissible = false ) { |
|
36 | - $this->notices[ $slug ] = array( |
|
35 | + public function add_admin_notice($slug, $class, $message, $dismissible = false) { |
|
36 | + $this->notices[$slug] = array( |
|
37 | 37 | 'class' => $class, |
38 | 38 | 'message' => $message, |
39 | 39 | 'dismissible' => $dismissible, |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * @version 4.0.0 |
48 | 48 | */ |
49 | 49 | public function admin_notices() { |
50 | - if ( ! current_user_can( 'manage_woocommerce' ) ) { |
|
50 | + if ( ! current_user_can('manage_woocommerce')) { |
|
51 | 51 | return; |
52 | 52 | } |
53 | 53 | |
@@ -57,17 +57,17 @@ discard block |
||
57 | 57 | // All other payment methods. |
58 | 58 | $this->payment_methods_check_environment(); |
59 | 59 | |
60 | - foreach ( (array) $this->notices as $notice_key => $notice ) { |
|
61 | - echo '<div class="' . esc_attr( $notice['class'] ) . '" style="position:relative;">'; |
|
60 | + foreach ((array) $this->notices as $notice_key => $notice) { |
|
61 | + echo '<div class="' . esc_attr($notice['class']) . '" style="position:relative;">'; |
|
62 | 62 | |
63 | - if ( $notice['dismissible'] ) { |
|
63 | + if ($notice['dismissible']) { |
|
64 | 64 | ?> |
65 | - <a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-stripe-hide-notice', $notice_key ), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce' ) ); ?>" class="woocommerce-message-close notice-dismiss" style="position:relative;float:right;padding:9px 0px 9px 9px 9px;text-decoration:none;"></a> |
|
65 | + <a href="<?php echo esc_url(wp_nonce_url(add_query_arg('wc-stripe-hide-notice', $notice_key), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce')); ?>" class="woocommerce-message-close notice-dismiss" style="position:relative;float:right;padding:9px 0px 9px 9px 9px;text-decoration:none;"></a> |
|
66 | 66 | <?php |
67 | 67 | } |
68 | 68 | |
69 | 69 | echo '<p>'; |
70 | - echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array(), 'target' => array() ) ) ); |
|
70 | + echo wp_kses($notice['message'], array('a' => array('href' => array(), 'target' => array()))); |
|
71 | 71 | echo '</p></div>'; |
72 | 72 | } |
73 | 73 | } |
@@ -100,110 +100,110 @@ discard block |
||
100 | 100 | * @version 4.0.0 |
101 | 101 | */ |
102 | 102 | public function stripe_check_environment() { |
103 | - $show_style_notice = get_option( 'wc_stripe_show_style_notice' ); |
|
104 | - $show_ssl_notice = get_option( 'wc_stripe_show_ssl_notice' ); |
|
105 | - $show_keys_notice = get_option( 'wc_stripe_show_keys_notice' ); |
|
106 | - $show_3ds_notice = get_option( 'wc_stripe_show_3ds_notice' ); |
|
107 | - $show_phpver_notice = get_option( 'wc_stripe_show_phpver_notice' ); |
|
108 | - $show_wcver_notice = get_option( 'wc_stripe_show_wcver_notice' ); |
|
109 | - $show_curl_notice = get_option( 'wc_stripe_show_curl_notice' ); |
|
110 | - $show_sca_notice = get_option( 'wc_stripe_show_sca_notice' ); |
|
111 | - $options = get_option( 'woocommerce_stripe_settings' ); |
|
112 | - $testmode = ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) ? true : false; |
|
113 | - $test_pub_key = isset( $options['test_publishable_key'] ) ? $options['test_publishable_key'] : ''; |
|
114 | - $test_secret_key = isset( $options['test_secret_key'] ) ? $options['test_secret_key'] : ''; |
|
115 | - $live_pub_key = isset( $options['publishable_key'] ) ? $options['publishable_key'] : ''; |
|
116 | - $live_secret_key = isset( $options['secret_key'] ) ? $options['secret_key'] : ''; |
|
117 | - $three_d_secure = isset( $options['three_d_secure'] ) && 'yes' === $options['three_d_secure']; |
|
118 | - |
|
119 | - if ( isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) { |
|
120 | - if ( empty( $show_3ds_notice ) && $three_d_secure ) { |
|
103 | + $show_style_notice = get_option('wc_stripe_show_style_notice'); |
|
104 | + $show_ssl_notice = get_option('wc_stripe_show_ssl_notice'); |
|
105 | + $show_keys_notice = get_option('wc_stripe_show_keys_notice'); |
|
106 | + $show_3ds_notice = get_option('wc_stripe_show_3ds_notice'); |
|
107 | + $show_phpver_notice = get_option('wc_stripe_show_phpver_notice'); |
|
108 | + $show_wcver_notice = get_option('wc_stripe_show_wcver_notice'); |
|
109 | + $show_curl_notice = get_option('wc_stripe_show_curl_notice'); |
|
110 | + $show_sca_notice = get_option('wc_stripe_show_sca_notice'); |
|
111 | + $options = get_option('woocommerce_stripe_settings'); |
|
112 | + $testmode = (isset($options['testmode']) && 'yes' === $options['testmode']) ? true : false; |
|
113 | + $test_pub_key = isset($options['test_publishable_key']) ? $options['test_publishable_key'] : ''; |
|
114 | + $test_secret_key = isset($options['test_secret_key']) ? $options['test_secret_key'] : ''; |
|
115 | + $live_pub_key = isset($options['publishable_key']) ? $options['publishable_key'] : ''; |
|
116 | + $live_secret_key = isset($options['secret_key']) ? $options['secret_key'] : ''; |
|
117 | + $three_d_secure = isset($options['three_d_secure']) && 'yes' === $options['three_d_secure']; |
|
118 | + |
|
119 | + if (isset($options['enabled']) && 'yes' === $options['enabled']) { |
|
120 | + if (empty($show_3ds_notice) && $three_d_secure) { |
|
121 | 121 | $url = 'https://stripe.com/docs/payments/3d-secure#three-ds-radar'; |
122 | 122 | |
123 | 123 | /* translators: 1) A URL that explains Stripe Radar. */ |
124 | - $message = __( 'WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe' ); |
|
124 | + $message = __('WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe'); |
|
125 | 125 | |
126 | - $this->add_admin_notice( '3ds', 'notice notice-warning', sprintf( $message, $url ), true ); |
|
126 | + $this->add_admin_notice('3ds', 'notice notice-warning', sprintf($message, $url), true); |
|
127 | 127 | } |
128 | 128 | |
129 | - if ( empty( $show_style_notice ) ) { |
|
129 | + if (empty($show_style_notice)) { |
|
130 | 130 | /* translators: 1) int version 2) int version */ |
131 | - $message = __( 'WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe' ); |
|
131 | + $message = __('WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe'); |
|
132 | 132 | |
133 | - $this->add_admin_notice( 'style', 'notice notice-warning', $message, true ); |
|
133 | + $this->add_admin_notice('style', 'notice notice-warning', $message, true); |
|
134 | 134 | |
135 | 135 | return; |
136 | 136 | } |
137 | 137 | |
138 | - if ( empty( $show_phpver_notice ) ) { |
|
139 | - if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) { |
|
138 | + if (empty($show_phpver_notice)) { |
|
139 | + if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) { |
|
140 | 140 | /* translators: 1) int version 2) int version */ |
141 | - $message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' ); |
|
141 | + $message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe'); |
|
142 | 142 | |
143 | - $this->add_admin_notice( 'phpver', 'error', sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() ), true ); |
|
143 | + $this->add_admin_notice('phpver', 'error', sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion()), true); |
|
144 | 144 | |
145 | 145 | return; |
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
149 | - if ( empty( $show_wcver_notice ) ) { |
|
150 | - if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) { |
|
149 | + if (empty($show_wcver_notice)) { |
|
150 | + if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) { |
|
151 | 151 | /* translators: 1) int version 2) int version */ |
152 | - $message = __( 'WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' ); |
|
152 | + $message = __('WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe'); |
|
153 | 153 | |
154 | - $this->add_admin_notice( 'wcver', 'notice notice-warning', sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION ), true ); |
|
154 | + $this->add_admin_notice('wcver', 'notice notice-warning', sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION), true); |
|
155 | 155 | |
156 | 156 | return; |
157 | 157 | } |
158 | 158 | } |
159 | 159 | |
160 | - if ( empty( $show_curl_notice ) ) { |
|
161 | - if ( ! function_exists( 'curl_init' ) ) { |
|
162 | - $this->add_admin_notice( 'curl', 'notice notice-warning', __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' ), true ); |
|
160 | + if (empty($show_curl_notice)) { |
|
161 | + if ( ! function_exists('curl_init')) { |
|
162 | + $this->add_admin_notice('curl', 'notice notice-warning', __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe'), true); |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | |
166 | - if ( empty( $show_keys_notice ) ) { |
|
166 | + if (empty($show_keys_notice)) { |
|
167 | 167 | $secret = WC_Stripe_API::get_secret_key(); |
168 | 168 | |
169 | - if ( empty( $secret ) && ! ( isset( $_GET['page'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'] ) ) { |
|
169 | + if (empty($secret) && ! (isset($_GET['page'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'])) { |
|
170 | 170 | $setting_link = $this->get_setting_link(); |
171 | 171 | /* translators: 1) link */ |
172 | - $this->add_admin_notice( 'keys', 'notice notice-warning', sprintf( __( 'Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true ); |
|
172 | + $this->add_admin_notice('keys', 'notice notice-warning', sprintf(__('Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | // Check if keys are entered properly per live/test mode. |
176 | - if ( $testmode ) { |
|
176 | + if ($testmode) { |
|
177 | 177 | if ( |
178 | - ! empty( $test_pub_key ) && ! preg_match( '/^pk_test_/', $test_pub_key ) |
|
179 | - || ( ! empty( $test_secret_key ) && ! preg_match( '/^sk_test_/', $test_secret_key ) |
|
180 | - && ! empty( $test_secret_key ) && ! preg_match( '/^rk_test_/', $test_secret_key ) ) ) { |
|
178 | + ! empty($test_pub_key) && ! preg_match('/^pk_test_/', $test_pub_key) |
|
179 | + || ( ! empty($test_secret_key) && ! preg_match('/^sk_test_/', $test_secret_key) |
|
180 | + && ! empty($test_secret_key) && ! preg_match('/^rk_test_/', $test_secret_key)) ) { |
|
181 | 181 | $setting_link = $this->get_setting_link(); |
182 | 182 | /* translators: 1) link */ |
183 | - $this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true ); |
|
183 | + $this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true); |
|
184 | 184 | } |
185 | 185 | } else { |
186 | 186 | if ( |
187 | - ! empty( $live_pub_key ) && ! preg_match( '/^pk_live_/', $live_pub_key ) |
|
188 | - || ( ! empty( $live_secret_key ) && ! preg_match( '/^sk_live_/', $live_secret_key ) |
|
189 | - && ! empty( $live_secret_key ) && ! preg_match( '/^rk_live_/', $live_secret_key ) ) ) { |
|
187 | + ! empty($live_pub_key) && ! preg_match('/^pk_live_/', $live_pub_key) |
|
188 | + || ( ! empty($live_secret_key) && ! preg_match('/^sk_live_/', $live_secret_key) |
|
189 | + && ! empty($live_secret_key) && ! preg_match('/^rk_live_/', $live_secret_key)) ) { |
|
190 | 190 | $setting_link = $this->get_setting_link(); |
191 | 191 | /* translators: 1) link */ |
192 | - $this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true ); |
|
192 | + $this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | } |
196 | 196 | |
197 | - if ( empty( $show_ssl_notice ) ) { |
|
197 | + if (empty($show_ssl_notice)) { |
|
198 | 198 | // Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected. |
199 | - if ( ! wc_checkout_is_https() ) { |
|
199 | + if ( ! wc_checkout_is_https()) { |
|
200 | 200 | /* translators: 1) link */ |
201 | - $this->add_admin_notice( 'ssl', 'notice notice-warning', sprintf( __( 'Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ), true ); |
|
201 | + $this->add_admin_notice('ssl', 'notice notice-warning', sprintf(__('Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security'), true); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 | |
205 | - if ( empty( $show_sca_notice ) ) { |
|
206 | - $this->add_admin_notice( 'sca', 'notice notice-success', sprintf( __( 'Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe' ), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/' ), true ); |
|
205 | + if (empty($show_sca_notice)) { |
|
206 | + $this->add_admin_notice('sca', 'notice notice-success', sprintf(__('Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe'), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/'), true); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | } |
@@ -216,17 +216,17 @@ discard block |
||
216 | 216 | public function payment_methods_check_environment() { |
217 | 217 | $payment_methods = $this->get_payment_methods(); |
218 | 218 | |
219 | - foreach ( $payment_methods as $method => $class ) { |
|
220 | - $show_notice = get_option( 'wc_stripe_show_' . strtolower( $method ) . '_notice' ); |
|
219 | + foreach ($payment_methods as $method => $class) { |
|
220 | + $show_notice = get_option('wc_stripe_show_' . strtolower($method) . '_notice'); |
|
221 | 221 | $gateway = new $class(); |
222 | 222 | |
223 | - if ( 'yes' !== $gateway->enabled || 'no' === $show_notice ) { |
|
223 | + if ('yes' !== $gateway->enabled || 'no' === $show_notice) { |
|
224 | 224 | continue; |
225 | 225 | } |
226 | 226 | |
227 | - if ( ! in_array( get_woocommerce_currency(), $gateway->get_supported_currency() ) ) { |
|
227 | + if ( ! in_array(get_woocommerce_currency(), $gateway->get_supported_currency())) { |
|
228 | 228 | /* translators: %1$s Payment method, %2$s List of supported currencies */ |
229 | - $this->add_admin_notice( $method, 'notice notice-error', sprintf( __( '%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe' ), $method, implode( ', ', $gateway->get_supported_currency() ) ), true ); |
|
229 | + $this->add_admin_notice($method, 'notice notice-error', sprintf(__('%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe'), $method, implode(', ', $gateway->get_supported_currency())), true); |
|
230 | 230 | } |
231 | 231 | } |
232 | 232 | } |
@@ -238,68 +238,68 @@ discard block |
||
238 | 238 | * @version 4.0.0 |
239 | 239 | */ |
240 | 240 | public function hide_notices() { |
241 | - if ( isset( $_GET['wc-stripe-hide-notice'] ) && isset( $_GET['_wc_stripe_notice_nonce'] ) ) { |
|
242 | - if ( ! wp_verify_nonce( $_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce' ) ) { |
|
243 | - wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe' ) ); |
|
241 | + if (isset($_GET['wc-stripe-hide-notice']) && isset($_GET['_wc_stripe_notice_nonce'])) { |
|
242 | + if ( ! wp_verify_nonce($_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce')) { |
|
243 | + wp_die(__('Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe')); |
|
244 | 244 | } |
245 | 245 | |
246 | - if ( ! current_user_can( 'manage_woocommerce' ) ) { |
|
247 | - wp_die( __( 'Cheatin’ huh?', 'woocommerce-gateway-stripe' ) ); |
|
246 | + if ( ! current_user_can('manage_woocommerce')) { |
|
247 | + wp_die(__('Cheatin’ huh?', 'woocommerce-gateway-stripe')); |
|
248 | 248 | } |
249 | 249 | |
250 | - $notice = wc_clean( $_GET['wc-stripe-hide-notice'] ); |
|
250 | + $notice = wc_clean($_GET['wc-stripe-hide-notice']); |
|
251 | 251 | |
252 | - switch ( $notice ) { |
|
252 | + switch ($notice) { |
|
253 | 253 | case 'style': |
254 | - update_option( 'wc_stripe_show_style_notice', 'no' ); |
|
254 | + update_option('wc_stripe_show_style_notice', 'no'); |
|
255 | 255 | break; |
256 | 256 | case 'phpver': |
257 | - update_option( 'wc_stripe_show_phpver_notice', 'no' ); |
|
257 | + update_option('wc_stripe_show_phpver_notice', 'no'); |
|
258 | 258 | break; |
259 | 259 | case 'wcver': |
260 | - update_option( 'wc_stripe_show_wcver_notice', 'no' ); |
|
260 | + update_option('wc_stripe_show_wcver_notice', 'no'); |
|
261 | 261 | break; |
262 | 262 | case 'curl': |
263 | - update_option( 'wc_stripe_show_curl_notice', 'no' ); |
|
263 | + update_option('wc_stripe_show_curl_notice', 'no'); |
|
264 | 264 | break; |
265 | 265 | case 'ssl': |
266 | - update_option( 'wc_stripe_show_ssl_notice', 'no' ); |
|
266 | + update_option('wc_stripe_show_ssl_notice', 'no'); |
|
267 | 267 | break; |
268 | 268 | case 'keys': |
269 | - update_option( 'wc_stripe_show_keys_notice', 'no' ); |
|
269 | + update_option('wc_stripe_show_keys_notice', 'no'); |
|
270 | 270 | break; |
271 | 271 | case '3ds': |
272 | - update_option( 'wc_stripe_show_3ds_notice', 'no' ); |
|
272 | + update_option('wc_stripe_show_3ds_notice', 'no'); |
|
273 | 273 | break; |
274 | 274 | case 'Alipay': |
275 | - update_option( 'wc_stripe_show_alipay_notice', 'no' ); |
|
275 | + update_option('wc_stripe_show_alipay_notice', 'no'); |
|
276 | 276 | break; |
277 | 277 | case 'Bancontact': |
278 | - update_option( 'wc_stripe_show_bancontact_notice', 'no' ); |
|
278 | + update_option('wc_stripe_show_bancontact_notice', 'no'); |
|
279 | 279 | break; |
280 | 280 | case 'EPS': |
281 | - update_option( 'wc_stripe_show_eps_notice', 'no' ); |
|
281 | + update_option('wc_stripe_show_eps_notice', 'no'); |
|
282 | 282 | break; |
283 | 283 | case 'Giropay': |
284 | - update_option( 'wc_stripe_show_giropay_notice', 'no' ); |
|
284 | + update_option('wc_stripe_show_giropay_notice', 'no'); |
|
285 | 285 | break; |
286 | 286 | case 'iDeal': |
287 | - update_option( 'wc_stripe_show_ideal_notice', 'no' ); |
|
287 | + update_option('wc_stripe_show_ideal_notice', 'no'); |
|
288 | 288 | break; |
289 | 289 | case 'Multibanco': |
290 | - update_option( 'wc_stripe_show_multibanco_notice', 'no' ); |
|
290 | + update_option('wc_stripe_show_multibanco_notice', 'no'); |
|
291 | 291 | break; |
292 | 292 | case 'P24': |
293 | - update_option( 'wc_stripe_show_p24_notice', 'no' ); |
|
293 | + update_option('wc_stripe_show_p24_notice', 'no'); |
|
294 | 294 | break; |
295 | 295 | case 'SEPA': |
296 | - update_option( 'wc_stripe_show_sepa_notice', 'no' ); |
|
296 | + update_option('wc_stripe_show_sepa_notice', 'no'); |
|
297 | 297 | break; |
298 | 298 | case 'SOFORT': |
299 | - update_option( 'wc_stripe_show_sofort_notice', 'no' ); |
|
299 | + update_option('wc_stripe_show_sofort_notice', 'no'); |
|
300 | 300 | break; |
301 | 301 | case 'sca': |
302 | - update_option( 'wc_stripe_show_sca_notice', 'no' ); |
|
302 | + update_option('wc_stripe_show_sca_notice', 'no'); |
|
303 | 303 | break; |
304 | 304 | } |
305 | 305 | } |
@@ -313,11 +313,11 @@ discard block |
||
313 | 313 | * @return string Setting link |
314 | 314 | */ |
315 | 315 | public function get_setting_link() { |
316 | - $use_id_as_section = function_exists( 'WC' ) ? version_compare( WC()->version, '2.6', '>=' ) : false; |
|
316 | + $use_id_as_section = function_exists('WC') ? version_compare(WC()->version, '2.6', '>=') : false; |
|
317 | 317 | |
318 | - $section_slug = $use_id_as_section ? 'stripe' : strtolower( 'WC_Gateway_Stripe' ); |
|
318 | + $section_slug = $use_id_as_section ? 'stripe' : strtolower('WC_Gateway_Stripe'); |
|
319 | 319 | |
320 | - return admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=' . $section_slug ); |
|
320 | + return admin_url('admin.php?page=wc-settings&tab=checkout§ion=' . $section_slug); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
@@ -326,16 +326,16 @@ discard block |
||
326 | 326 | * @since 4.3.0 |
327 | 327 | */ |
328 | 328 | public function stripe_updated() { |
329 | - $previous_version = get_option( 'wc_stripe_version' ); |
|
329 | + $previous_version = get_option('wc_stripe_version'); |
|
330 | 330 | |
331 | 331 | // Only show the style notice if the plugin was installed and older than 4.1.4. |
332 | - if ( empty( $previous_version ) || version_compare( $previous_version, '4.1.4', 'ge' ) ) { |
|
333 | - update_option( 'wc_stripe_show_style_notice', 'no' ); |
|
332 | + if (empty($previous_version) || version_compare($previous_version, '4.1.4', 'ge')) { |
|
333 | + update_option('wc_stripe_show_style_notice', 'no'); |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | // Only show the SCA notice on pre-4.3.0 installs. |
337 | - if ( empty( $previous_version ) || version_compare( $previous_version, '4.3.0', 'ge' ) ) { |
|
338 | - update_option( 'wc_stripe_show_sca_notice', 'no' ); |
|
337 | + if (empty($previous_version) || version_compare($previous_version, '4.3.0', 'ge')) { |
|
338 | + update_option('wc_stripe_show_sca_notice', 'no'); |
|
339 | 339 | } |
340 | 340 | } |
341 | 341 | } |
@@ -1,5 +1,5 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | /** |
@@ -1,13 +1,13 @@ discard block |
||
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 |
||
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 »', '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 »', '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 |
||
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); |
@@ -1,5 +1,5 @@ discard block |
||
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 |
||
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 |
||
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')); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -11,7 +11,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -6,14 +6,14 @@ discard block |
||
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 |
||
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); |