|
@@ -1,5 +1,5 @@ discard block |
|
|
block discarded – undo |
|
1
|
1
|
<?php |
|
2
|
|
-if ( ! defined( 'ABSPATH' ) ) { |
|
|
2
|
+if ( ! defined('ABSPATH')) { |
|
3
|
3
|
exit; |
|
4
|
4
|
} |
|
5
|
5
|
|
|
@@ -120,8 +120,8 @@ discard block |
|
|
block discarded – undo |
|
120
|
120
|
*/ |
|
121
|
121
|
public function __construct() { |
|
122
|
122
|
$this->id = 'stripe'; |
|
123
|
|
- $this->method_title = __( 'Stripe', 'woocommerce-gateway-stripe' ); |
|
124
|
|
- $this->method_description = sprintf( __( 'Stripe works by adding credit card 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' ); |
|
|
123
|
+ $this->method_title = __('Stripe', 'woocommerce-gateway-stripe'); |
|
|
124
|
+ $this->method_description = sprintf(__('Stripe works by adding credit card 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'); |
|
125
|
125
|
$this->has_fields = true; |
|
126
|
126
|
$this->view_transaction_url = 'https://dashboard.stripe.com/payments/%s'; |
|
127
|
127
|
$this->supports = array( |
|
@@ -149,43 +149,43 @@ discard block |
|
|
block discarded – undo |
|
149
|
149
|
$this->init_settings(); |
|
150
|
150
|
|
|
151
|
151
|
// Get setting values. |
|
152
|
|
- $this->title = $this->get_option( 'title' ); |
|
153
|
|
- $this->description = $this->get_option( 'description' ); |
|
154
|
|
- $this->enabled = $this->get_option( 'enabled' ); |
|
155
|
|
- $this->testmode = 'yes' === $this->get_option( 'testmode' ); |
|
156
|
|
- $this->capture = 'yes' === $this->get_option( 'capture', 'yes' ); |
|
157
|
|
- $this->statement_descriptor = $this->get_option( 'statement_descriptor', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) ); |
|
158
|
|
- $this->stripe_checkout = 'yes' === $this->get_option( 'stripe_checkout' ); |
|
159
|
|
- $this->stripe_checkout_locale = $this->get_option( 'stripe_checkout_locale' ); |
|
160
|
|
- $this->stripe_checkout_image = $this->get_option( 'stripe_checkout_image', '' ); |
|
161
|
|
- $this->saved_cards = 'yes' === $this->get_option( 'saved_cards' ); |
|
162
|
|
- $this->secret_key = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' ); |
|
163
|
|
- $this->publishable_key = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' ); |
|
164
|
|
- $this->bitcoin = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' ); |
|
165
|
|
- $this->apple_pay = 'yes' === $this->get_option( 'apple_pay', 'yes' ); |
|
166
|
|
- $this->apple_pay_domain_set = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' ); |
|
167
|
|
- $this->apple_pay_button = $this->get_option( 'apple_pay_button', 'black' ); |
|
168
|
|
- $this->logging = 'yes' === $this->get_option( 'logging' ); |
|
|
152
|
+ $this->title = $this->get_option('title'); |
|
|
153
|
+ $this->description = $this->get_option('description'); |
|
|
154
|
+ $this->enabled = $this->get_option('enabled'); |
|
|
155
|
+ $this->testmode = 'yes' === $this->get_option('testmode'); |
|
|
156
|
+ $this->capture = 'yes' === $this->get_option('capture', 'yes'); |
|
|
157
|
+ $this->statement_descriptor = $this->get_option('statement_descriptor', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES)); |
|
|
158
|
+ $this->stripe_checkout = 'yes' === $this->get_option('stripe_checkout'); |
|
|
159
|
+ $this->stripe_checkout_locale = $this->get_option('stripe_checkout_locale'); |
|
|
160
|
+ $this->stripe_checkout_image = $this->get_option('stripe_checkout_image', ''); |
|
|
161
|
+ $this->saved_cards = 'yes' === $this->get_option('saved_cards'); |
|
|
162
|
+ $this->secret_key = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key'); |
|
|
163
|
+ $this->publishable_key = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key'); |
|
|
164
|
+ $this->bitcoin = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin'); |
|
|
165
|
+ $this->apple_pay = 'yes' === $this->get_option('apple_pay', 'yes'); |
|
|
166
|
+ $this->apple_pay_domain_set = 'yes' === $this->get_option('apple_pay_domain_set', 'no'); |
|
|
167
|
+ $this->apple_pay_button = $this->get_option('apple_pay_button', 'black'); |
|
|
168
|
+ $this->logging = 'yes' === $this->get_option('logging'); |
|
169
|
169
|
$this->apple_pay_verify_notice = ''; |
|
170
|
170
|
|
|
171
|
|
- if ( $this->stripe_checkout ) { |
|
172
|
|
- $this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' ); |
|
|
171
|
+ if ($this->stripe_checkout) { |
|
|
172
|
+ $this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe'); |
|
173
|
173
|
} |
|
174
|
174
|
|
|
175
|
|
- if ( $this->testmode ) { |
|
176
|
|
- $this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' ); |
|
177
|
|
- $this->description = trim( $this->description ); |
|
|
175
|
+ if ($this->testmode) { |
|
|
176
|
+ $this->description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing'); |
|
|
177
|
+ $this->description = trim($this->description); |
|
178
|
178
|
} |
|
179
|
179
|
|
|
180
|
|
- WC_Stripe_API::set_secret_key( $this->secret_key ); |
|
|
180
|
+ WC_Stripe_API::set_secret_key($this->secret_key); |
|
181
|
181
|
|
|
182
|
182
|
$this->init_apple_pay(); |
|
183
|
183
|
|
|
184
|
184
|
// Hooks. |
|
185
|
|
- add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) ); |
|
186
|
|
- add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) ); |
|
187
|
|
- add_action( 'admin_notices', array( $this, 'admin_notices' ) ); |
|
188
|
|
- add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) ); |
|
|
185
|
+ add_action('wp_enqueue_scripts', array($this, 'payment_scripts')); |
|
|
186
|
+ add_action('admin_enqueue_scripts', array($this, 'admin_scripts')); |
|
|
187
|
+ add_action('admin_notices', array($this, 'admin_notices')); |
|
|
188
|
+ add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options')); |
|
189
|
189
|
} |
|
190
|
190
|
|
|
191
|
191
|
/** |
|
@@ -195,24 +195,24 @@ discard block |
|
|
block discarded – undo |
|
195
|
195
|
* @return string |
|
196
|
196
|
*/ |
|
197
|
197
|
public function get_icon() { |
|
198
|
|
- $ext = version_compare( WC()->version, '2.6', '>=' ) ? '.svg' : '.png'; |
|
199
|
|
- $style = version_compare( WC()->version, '2.6', '>=' ) ? 'style="margin-left: 0.3em"' : ''; |
|
|
198
|
+ $ext = version_compare(WC()->version, '2.6', '>=') ? '.svg' : '.png'; |
|
|
199
|
+ $style = version_compare(WC()->version, '2.6', '>=') ? 'style="margin-left: 0.3em"' : ''; |
|
200
|
200
|
|
|
201
|
|
- $icon = '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext ) . '" alt="Visa" width="32" ' . $style . ' />'; |
|
202
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext ) . '" alt="Mastercard" width="32" ' . $style . ' />'; |
|
203
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext ) . '" alt="Amex" width="32" ' . $style . ' />'; |
|
|
201
|
+ $icon = '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/visa' . $ext) . '" alt="Visa" width="32" ' . $style . ' />'; |
|
|
202
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/mastercard' . $ext) . '" alt="Mastercard" width="32" ' . $style . ' />'; |
|
|
203
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/amex' . $ext) . '" alt="Amex" width="32" ' . $style . ' />'; |
|
204
|
204
|
|
|
205
|
|
- if ( 'USD' === get_woocommerce_currency() ) { |
|
206
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext ) . '" alt="Discover" width="32" ' . $style . ' />'; |
|
207
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext ) . '" alt="JCB" width="32" ' . $style . ' />'; |
|
208
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext ) . '" alt="Diners" width="32" ' . $style . ' />'; |
|
|
205
|
+ if ('USD' === get_woocommerce_currency()) { |
|
|
206
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/discover' . $ext) . '" alt="Discover" width="32" ' . $style . ' />'; |
|
|
207
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/jcb' . $ext) . '" alt="JCB" width="32" ' . $style . ' />'; |
|
|
208
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(WC()->plugin_url() . '/assets/images/icons/credit-cards/diners' . $ext) . '" alt="Diners" width="32" ' . $style . ' />'; |
|
209
|
209
|
} |
|
210
|
210
|
|
|
211
|
|
- if ( $this->bitcoin && $this->stripe_checkout ) { |
|
212
|
|
- $icon .= '<img src="' . WC_HTTPS::force_https_url( plugins_url( '/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE ) ) . '" alt="Bitcoin" width="24" ' . $style . ' />'; |
|
|
211
|
+ if ($this->bitcoin && $this->stripe_checkout) { |
|
|
212
|
+ $icon .= '<img src="' . WC_HTTPS::force_https_url(plugins_url('/assets/images/bitcoin' . $ext, WC_STRIPE_MAIN_FILE)) . '" alt="Bitcoin" width="24" ' . $style . ' />'; |
|
213
|
213
|
} |
|
214
|
214
|
|
|
215
|
|
- return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id ); |
|
|
215
|
+ return apply_filters('woocommerce_gateway_icon', $icon, $this->id); |
|
216
|
216
|
} |
|
217
|
217
|
|
|
218
|
218
|
/** |
|
@@ -223,11 +223,11 @@ discard block |
|
|
block discarded – undo |
|
223
|
223
|
* |
|
224
|
224
|
* @return float|int |
|
225
|
225
|
*/ |
|
226
|
|
- public function get_stripe_amount( $total, $currency = '' ) { |
|
227
|
|
- if ( ! $currency ) { |
|
|
226
|
+ public function get_stripe_amount($total, $currency = '') { |
|
|
227
|
+ if ( ! $currency) { |
|
228
|
228
|
$currency = get_woocommerce_currency(); |
|
229
|
229
|
} |
|
230
|
|
- switch ( strtoupper( $currency ) ) { |
|
|
230
|
+ switch (strtoupper($currency)) { |
|
231
|
231
|
// Zero decimal currencies. |
|
232
|
232
|
case 'BIF' : |
|
233
|
233
|
case 'CLP' : |
|
@@ -244,10 +244,10 @@ discard block |
|
|
block discarded – undo |
|
244
|
244
|
case 'XAF' : |
|
245
|
245
|
case 'XOF' : |
|
246
|
246
|
case 'XPF' : |
|
247
|
|
- $total = absint( $total ); |
|
|
247
|
+ $total = absint($total); |
|
248
|
248
|
break; |
|
249
|
249
|
default : |
|
250
|
|
- $total = round( $total, 2 ) * 100; // In cents. |
|
|
250
|
+ $total = round($total, 2) * 100; // In cents. |
|
251
|
251
|
break; |
|
252
|
252
|
} |
|
253
|
253
|
return $total; |
|
@@ -262,9 +262,9 @@ discard block |
|
|
block discarded – undo |
|
262
|
262
|
public function init_apple_pay() { |
|
263
|
263
|
if ( |
|
264
|
264
|
is_admin() && |
|
265
|
|
- isset( $_GET['page'] ) && 'wc-settings' === $_GET['page'] && |
|
266
|
|
- isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] && |
|
267
|
|
- isset( $_GET['section'] ) && 'stripe' === $_GET['section'] && |
|
|
265
|
+ isset($_GET['page']) && 'wc-settings' === $_GET['page'] && |
|
|
266
|
+ isset($_GET['tab']) && 'checkout' === $_GET['tab'] && |
|
|
267
|
+ isset($_GET['section']) && 'stripe' === $_GET['section'] && |
|
268
|
268
|
$this->apple_pay |
|
269
|
269
|
) { |
|
270
|
270
|
$this->process_apple_pay_verification(); |
|
@@ -278,9 +278,9 @@ discard block |
|
|
block discarded – undo |
|
278
|
278
|
* @version 3.1.0 |
|
279
|
279
|
* @param string $secret_key |
|
280
|
280
|
*/ |
|
281
|
|
- private function register_apple_pay_domain( $secret_key = '' ) { |
|
282
|
|
- if ( empty( $secret_key ) ) { |
|
283
|
|
- throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) ); |
|
|
281
|
+ private function register_apple_pay_domain($secret_key = '') { |
|
|
282
|
+ if (empty($secret_key)) { |
|
|
283
|
+ throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe')); |
|
284
|
284
|
} |
|
285
|
285
|
|
|
286
|
286
|
$endpoint = 'https://api.stripe.com/v1/apple_pay/domains'; |
|
@@ -294,21 +294,21 @@ discard block |
|
|
block discarded – undo |
|
294
|
294
|
'Authorization' => 'Bearer ' . $secret_key, |
|
295
|
295
|
); |
|
296
|
296
|
|
|
297
|
|
- $response = wp_remote_post( $endpoint, array( |
|
|
297
|
+ $response = wp_remote_post($endpoint, array( |
|
298
|
298
|
'headers' => $headers, |
|
299
|
|
- 'body' => http_build_query( $data ), |
|
300
|
|
- ) ); |
|
|
299
|
+ 'body' => http_build_query($data), |
|
|
300
|
+ )); |
|
301
|
301
|
|
|
302
|
|
- if ( is_wp_error( $response ) ) { |
|
303
|
|
- throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) ); |
|
|
302
|
+ if (is_wp_error($response)) { |
|
|
303
|
+ throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message())); |
|
304
|
304
|
} |
|
305
|
305
|
|
|
306
|
|
- if ( 200 !== $response['response']['code'] ) { |
|
307
|
|
- $parsed_response = json_decode( $response['body'] ); |
|
|
306
|
+ if (200 !== $response['response']['code']) { |
|
|
307
|
+ $parsed_response = json_decode($response['body']); |
|
308
|
308
|
|
|
309
|
309
|
$this->apple_pay_verify_notice = $parsed_response->error->message; |
|
310
|
310
|
|
|
311
|
|
- throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) ); |
|
|
311
|
+ throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message)); |
|
312
|
312
|
} |
|
313
|
313
|
} |
|
314
|
314
|
|
|
@@ -319,48 +319,48 @@ discard block |
|
|
block discarded – undo |
|
319
|
319
|
* @version 3.1.0 |
|
320
|
320
|
*/ |
|
321
|
321
|
public function process_apple_pay_verification() { |
|
322
|
|
- $gateway_settings = get_option( 'woocommerce_stripe_settings', '' ); |
|
|
322
|
+ $gateway_settings = get_option('woocommerce_stripe_settings', ''); |
|
323
|
323
|
|
|
324
|
324
|
try { |
|
325
|
|
- $path = untrailingslashit( preg_replace( "!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME'] ) ); |
|
|
325
|
+ $path = untrailingslashit(preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME'])); |
|
326
|
326
|
$dir = '.well-known'; |
|
327
|
327
|
$file = 'apple-developer-merchantid-domain-association'; |
|
328
|
328
|
$fullpath = $path . '/' . $dir . '/' . $file; |
|
329
|
329
|
|
|
330
|
|
- if ( ! empty( $gateway_settings['apple_pay_domain_set'] ) && 'yes' === $gateway_settings['apple_pay_domain_set'] && file_exists( $fullpath ) ) { |
|
|
330
|
+ if ( ! empty($gateway_settings['apple_pay_domain_set']) && 'yes' === $gateway_settings['apple_pay_domain_set'] && file_exists($fullpath)) { |
|
331
|
331
|
return; |
|
332
|
332
|
} |
|
333
|
333
|
|
|
334
|
|
- if ( ! file_exists( $path . '/' . $dir ) ) { |
|
335
|
|
- if ( ! @mkdir( $path . '/' . $dir, 0755 ) ) { |
|
336
|
|
- throw new Exception( __( 'Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe' ) ); |
|
|
334
|
+ if ( ! file_exists($path . '/' . $dir)) { |
|
|
335
|
+ if ( ! @mkdir($path . '/' . $dir, 0755)) { |
|
|
336
|
+ throw new Exception(__('Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe')); |
|
337
|
337
|
} |
|
338
|
338
|
} |
|
339
|
339
|
|
|
340
|
|
- if ( ! file_exists( $fullpath ) ) { |
|
341
|
|
- if ( ! @copy( WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath ) ) { |
|
342
|
|
- throw new Exception( __( 'Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe' ) ); |
|
|
340
|
+ if ( ! file_exists($fullpath)) { |
|
|
341
|
+ if ( ! @copy(WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath)) { |
|
|
342
|
+ throw new Exception(__('Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe')); |
|
343
|
343
|
} |
|
344
|
344
|
} |
|
345
|
345
|
|
|
346
|
346
|
// At this point then the domain association folder and file should be available. |
|
347
|
347
|
// Proceed to verify/and or verify again. |
|
348
|
|
- $this->register_apple_pay_domain( $this->secret_key ); |
|
|
348
|
+ $this->register_apple_pay_domain($this->secret_key); |
|
349
|
349
|
|
|
350
|
350
|
// No errors to this point, verification success! |
|
351
|
351
|
$gateway_settings['apple_pay_domain_set'] = 'yes'; |
|
352
|
352
|
$this->apple_pay_domain_set = true; |
|
353
|
353
|
|
|
354
|
|
- update_option( 'woocommerce_stripe_settings', $gateway_settings ); |
|
|
354
|
+ update_option('woocommerce_stripe_settings', $gateway_settings); |
|
355
|
355
|
|
|
356
|
|
- $this->log( __( 'Your domain has been verified with Apple Pay!', 'woocommerce-gateway-stripe' ) ); |
|
|
356
|
+ $this->log(__('Your domain has been verified with Apple Pay!', 'woocommerce-gateway-stripe')); |
|
357
|
357
|
|
|
358
|
|
- } catch ( Exception $e ) { |
|
|
358
|
+ } catch (Exception $e) { |
|
359
|
359
|
$gateway_settings['apple_pay_domain_set'] = 'no'; |
|
360
|
360
|
|
|
361
|
|
- update_option( 'woocommerce_stripe_settings', $gateway_settings ); |
|
|
361
|
+ update_option('woocommerce_stripe_settings', $gateway_settings); |
|
362
|
362
|
|
|
363
|
|
- $this->log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) ); |
|
|
363
|
+ $this->log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage())); |
|
364
|
364
|
} |
|
365
|
365
|
} |
|
366
|
366
|
|
|
@@ -368,11 +368,11 @@ discard block |
|
|
block discarded – undo |
|
368
|
368
|
* Check if SSL is enabled and notify the user |
|
369
|
369
|
*/ |
|
370
|
370
|
public function admin_notices() { |
|
371
|
|
- if ( 'no' === $this->enabled ) { |
|
|
371
|
+ if ('no' === $this->enabled) { |
|
372
|
372
|
return; |
|
373
|
373
|
} |
|
374
|
374
|
|
|
375
|
|
- if ( $this->apple_pay && ! empty( $this->apple_pay_verify_notice ) ) { |
|
|
375
|
+ if ($this->apple_pay && ! empty($this->apple_pay_verify_notice)) { |
|
376
|
376
|
$allowed_html = array( |
|
377
|
377
|
'a' => array( |
|
378
|
378
|
'href' => array(), |
|
@@ -380,7 +380,7 @@ discard block |
|
|
block discarded – undo |
|
380
|
380
|
), |
|
381
|
381
|
); |
|
382
|
382
|
|
|
383
|
|
- echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses( make_clickable( $this->apple_pay_verify_notice ), $allowed_html ) . '</p></div>'; |
|
|
383
|
+ echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses(make_clickable($this->apple_pay_verify_notice), $allowed_html) . '</p></div>'; |
|
384
|
384
|
} |
|
385
|
385
|
|
|
386
|
386
|
/** |
|
@@ -388,13 +388,13 @@ discard block |
|
|
block discarded – undo |
|
388
|
388
|
* when setting screen is displayed. So if domain verification is not set, |
|
389
|
389
|
* something went wrong so lets notify user. |
|
390
|
390
|
*/ |
|
391
|
|
- if ( ! empty( $this->secret_key ) && $this->apple_pay && ! $this->apple_pay_domain_set ) { |
|
392
|
|
- echo '<div class="error stripe-apple-pay-message"><p>' . sprintf( __( 'Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe' ), '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', '</a>' ) . '</p></div>'; |
|
|
391
|
+ if ( ! empty($this->secret_key) && $this->apple_pay && ! $this->apple_pay_domain_set) { |
|
|
392
|
+ echo '<div class="error stripe-apple-pay-message"><p>' . sprintf(__('Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe'), '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', '</a>') . '</p></div>'; |
|
393
|
393
|
} |
|
394
|
394
|
|
|
395
|
395
|
// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected. |
|
396
|
|
- if ( ( function_exists( 'wc_site_is_https' ) && ! wc_site_is_https() ) && ( 'no' === get_option( 'woocommerce_force_ssl_checkout' ) && ! class_exists( 'WordPressHTTPS' ) ) ) { |
|
397
|
|
- echo '<div class="error stripe-ssl-message"><p>' . sprintf( __( 'Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ) . '</p></div>'; |
|
|
396
|
+ if ((function_exists('wc_site_is_https') && ! wc_site_is_https()) && ('no' === get_option('woocommerce_force_ssl_checkout') && ! class_exists('WordPressHTTPS'))) { |
|
|
397
|
+ echo '<div class="error stripe-ssl-message"><p>' . sprintf(__('Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security') . '</p></div>'; |
|
398
|
398
|
} |
|
399
|
399
|
} |
|
400
|
400
|
|
|
@@ -402,11 +402,11 @@ discard block |
|
|
block discarded – undo |
|
402
|
402
|
* Check if this gateway is enabled |
|
403
|
403
|
*/ |
|
404
|
404
|
public function is_available() { |
|
405
|
|
- if ( 'yes' === $this->enabled ) { |
|
406
|
|
- if ( ! $this->testmode && is_checkout() && ! is_ssl() ) { |
|
|
405
|
+ if ('yes' === $this->enabled) { |
|
|
406
|
+ if ( ! $this->testmode && is_checkout() && ! is_ssl()) { |
|
407
|
407
|
return false; |
|
408
|
408
|
} |
|
409
|
|
- if ( ! $this->secret_key || ! $this->publishable_key ) { |
|
|
409
|
+ if ( ! $this->secret_key || ! $this->publishable_key) { |
|
410
|
410
|
return false; |
|
411
|
411
|
} |
|
412
|
412
|
return true; |
|
@@ -418,7 +418,7 @@ discard block |
|
|
block discarded – undo |
|
418
|
418
|
* Initialise Gateway Settings Form Fields |
|
419
|
419
|
*/ |
|
420
|
420
|
public function init_form_fields() { |
|
421
|
|
- $this->form_fields = include( 'settings-stripe.php' ); |
|
|
421
|
+ $this->form_fields = include('settings-stripe.php'); |
|
422
|
422
|
} |
|
423
|
423
|
|
|
424
|
424
|
/** |
|
@@ -426,55 +426,55 @@ discard block |
|
|
block discarded – undo |
|
426
|
426
|
*/ |
|
427
|
427
|
public function payment_fields() { |
|
428
|
428
|
$user = wp_get_current_user(); |
|
429
|
|
- $display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards; |
|
|
429
|
+ $display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards; |
|
430
|
430
|
$total = WC()->cart->total; |
|
431
|
431
|
|
|
432
|
432
|
// If paying from order, we need to get total from order not cart. |
|
433
|
|
- if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) { |
|
434
|
|
- $order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) ); |
|
|
433
|
+ if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) { |
|
|
434
|
+ $order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key']))); |
|
435
|
435
|
$total = $order->get_total(); |
|
436
|
436
|
} |
|
437
|
437
|
|
|
438
|
|
- if ( $user->ID ) { |
|
439
|
|
- $user_email = get_user_meta( $user->ID, 'billing_email', true ); |
|
|
438
|
+ if ($user->ID) { |
|
|
439
|
+ $user_email = get_user_meta($user->ID, 'billing_email', true); |
|
440
|
440
|
$user_email = $user_email ? $user_email : $user->user_email; |
|
441
|
441
|
} else { |
|
442
|
442
|
$user_email = ''; |
|
443
|
443
|
} |
|
444
|
444
|
|
|
445
|
|
- if ( is_add_payment_method_page() ) { |
|
446
|
|
- $pay_button_text = __( 'Add Card', 'woocommerce-gateway-stripe' ); |
|
447
|
|
- $total = ''; |
|
|
445
|
+ if (is_add_payment_method_page()) { |
|
|
446
|
+ $pay_button_text = __('Add Card', 'woocommerce-gateway-stripe'); |
|
|
447
|
+ $total = ''; |
|
448
|
448
|
} else { |
|
449
|
449
|
$pay_button_text = ''; |
|
450
|
450
|
} |
|
451
|
451
|
|
|
452
|
452
|
echo '<div |
|
453
|
453
|
id="stripe-payment-data" |
|
454
|
|
- data-panel-label="' . esc_attr( $pay_button_text ) . '" |
|
|
454
|
+ data-panel-label="' . esc_attr($pay_button_text) . '" |
|
455
|
455
|
data-description="" |
|
456
|
|
- data-email="' . esc_attr( $user_email ) . '" |
|
457
|
|
- data-amount="' . esc_attr( $this->get_stripe_amount( $total ) ) . '" |
|
458
|
|
- data-name="' . esc_attr( $this->statement_descriptor ) . '" |
|
459
|
|
- data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '" |
|
460
|
|
- data-image="' . esc_attr( $this->stripe_checkout_image ) . '" |
|
461
|
|
- data-bitcoin="' . esc_attr( $this->bitcoin ? 'true' : 'false' ) . '" |
|
462
|
|
- data-locale="' . esc_attr( $this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en' ) . '" |
|
463
|
|
- data-allow-remember-me="' . esc_attr( $this->saved_cards ? 'true' : 'false' ) . '">'; |
|
|
456
|
+ data-email="' . esc_attr($user_email) . '" |
|
|
457
|
+ data-amount="' . esc_attr($this->get_stripe_amount($total)) . '" |
|
|
458
|
+ data-name="' . esc_attr($this->statement_descriptor) . '" |
|
|
459
|
+ data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '" |
|
|
460
|
+ data-image="' . esc_attr($this->stripe_checkout_image) . '" |
|
|
461
|
+ data-bitcoin="' . esc_attr($this->bitcoin ? 'true' : 'false') . '" |
|
|
462
|
+ data-locale="' . esc_attr($this->stripe_checkout_locale ? $this->stripe_checkout_locale : 'en') . '" |
|
|
463
|
+ data-allow-remember-me="' . esc_attr($this->saved_cards ? 'true' : 'false') . '">'; |
|
464
|
464
|
|
|
465
|
|
- if ( $this->description ) { |
|
466
|
|
- echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) ); |
|
|
465
|
+ if ($this->description) { |
|
|
466
|
+ echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description))); |
|
467
|
467
|
} |
|
468
|
468
|
|
|
469
|
|
- if ( $display_tokenization ) { |
|
|
469
|
+ if ($display_tokenization) { |
|
470
|
470
|
$this->tokenization_script(); |
|
471
|
471
|
$this->saved_payment_methods(); |
|
472
|
472
|
} |
|
473
|
473
|
|
|
474
|
|
- if ( ! $this->stripe_checkout ) { |
|
|
474
|
+ if ( ! $this->stripe_checkout) { |
|
475
|
475
|
$this->form(); |
|
476
|
476
|
|
|
477
|
|
- if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) ) { |
|
|
477
|
+ if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization)) { |
|
478
|
478
|
$this->save_payment_method_checkbox(); |
|
479
|
479
|
} |
|
480
|
480
|
} |
|
@@ -490,20 +490,20 @@ discard block |
|
|
block discarded – undo |
|
490
|
490
|
* @return array |
|
491
|
491
|
*/ |
|
492
|
492
|
public function get_localized_messages() { |
|
493
|
|
- return apply_filters( 'wc_stripe_localized_messages', array( |
|
494
|
|
- 'invalid_number' => __( 'The card number is not a valid credit card number.', 'woocommerce-gateway-stripe' ), |
|
495
|
|
- 'invalid_expiry_month' => __( 'The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe' ), |
|
496
|
|
- 'invalid_expiry_year' => __( 'The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe' ), |
|
497
|
|
- 'invalid_cvc' => __( 'The card\'s security code is invalid.', 'woocommerce-gateway-stripe' ), |
|
498
|
|
- 'incorrect_number' => __( 'The card number is incorrect.', 'woocommerce-gateway-stripe' ), |
|
499
|
|
- 'expired_card' => __( 'The card has expired.', 'woocommerce-gateway-stripe' ), |
|
500
|
|
- 'incorrect_cvc' => __( 'The card\'s security code is incorrect.', 'woocommerce-gateway-stripe' ), |
|
501
|
|
- 'incorrect_zip' => __( 'The card\'s zip code failed validation.', 'woocommerce-gateway-stripe' ), |
|
502
|
|
- 'card_declined' => __( 'The card was declined.', 'woocommerce-gateway-stripe' ), |
|
503
|
|
- 'missing' => __( 'There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe' ), |
|
504
|
|
- 'processing_error' => __( 'An error occurred while processing the card.', 'woocommerce-gateway-stripe' ), |
|
505
|
|
- 'invalid_request_error' => __( 'Could not find payment information.', 'woocommerce-gateway-stripe' ), |
|
506
|
|
- ) ); |
|
|
493
|
+ return apply_filters('wc_stripe_localized_messages', array( |
|
|
494
|
+ 'invalid_number' => __('The card number is not a valid credit card number.', 'woocommerce-gateway-stripe'), |
|
|
495
|
+ 'invalid_expiry_month' => __('The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe'), |
|
|
496
|
+ 'invalid_expiry_year' => __('The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe'), |
|
|
497
|
+ 'invalid_cvc' => __('The card\'s security code is invalid.', 'woocommerce-gateway-stripe'), |
|
|
498
|
+ 'incorrect_number' => __('The card number is incorrect.', 'woocommerce-gateway-stripe'), |
|
|
499
|
+ 'expired_card' => __('The card has expired.', 'woocommerce-gateway-stripe'), |
|
|
500
|
+ 'incorrect_cvc' => __('The card\'s security code is incorrect.', 'woocommerce-gateway-stripe'), |
|
|
501
|
+ 'incorrect_zip' => __('The card\'s zip code failed validation.', 'woocommerce-gateway-stripe'), |
|
|
502
|
+ 'card_declined' => __('The card was declined.', 'woocommerce-gateway-stripe'), |
|
|
503
|
+ 'missing' => __('There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe'), |
|
|
504
|
+ 'processing_error' => __('An error occurred while processing the card.', 'woocommerce-gateway-stripe'), |
|
|
505
|
+ 'invalid_request_error' => __('Could not find payment information.', 'woocommerce-gateway-stripe'), |
|
|
506
|
+ )); |
|
507
|
507
|
} |
|
508
|
508
|
|
|
509
|
509
|
/** |
|
@@ -513,28 +513,28 @@ discard block |
|
|
block discarded – undo |
|
513
|
513
|
* @version 3.1.0 |
|
514
|
514
|
*/ |
|
515
|
515
|
public function admin_scripts() { |
|
516
|
|
- if ( 'woocommerce_page_wc-settings' !== get_current_screen()->id ) { |
|
|
516
|
+ if ('woocommerce_page_wc-settings' !== get_current_screen()->id) { |
|
517
|
517
|
return; |
|
518
|
518
|
} |
|
519
|
519
|
|
|
520
|
|
- $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
|
520
|
+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
521
|
521
|
|
|
522
|
|
- wp_enqueue_script( 'woocommerce_stripe_admin', plugins_url( 'assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION, true ); |
|
|
522
|
+ wp_enqueue_script('woocommerce_stripe_admin', plugins_url('assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION, true); |
|
523
|
523
|
|
|
524
|
524
|
$stripe_admin_params = array( |
|
525
|
525
|
'localized_messages' => array( |
|
526
|
|
- 'not_valid_live_key_msg' => __( 'This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe' ), |
|
527
|
|
- 'not_valid_test_key_msg' => __( 'This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe' ), |
|
528
|
|
- 're_verify_button_text' => __( 'Re-verify Domain', 'woocommerce-gateway-stripe' ), |
|
529
|
|
- 'missing_secret_key' => __( 'Missing Secret Key. Please set the secret key field above and re-try.', 'woocommerce-gateway-stripe' ), |
|
|
526
|
+ 'not_valid_live_key_msg' => __('This is not a valid live key. Live keys start with "sk_live_" and "pk_live_".', 'woocommerce-gateway-stripe'), |
|
|
527
|
+ 'not_valid_test_key_msg' => __('This is not a valid test key. Test keys start with "sk_test_" and "pk_test_".', 'woocommerce-gateway-stripe'), |
|
|
528
|
+ 're_verify_button_text' => __('Re-verify Domain', 'woocommerce-gateway-stripe'), |
|
|
529
|
+ 'missing_secret_key' => __('Missing Secret Key. Please set the secret key field above and re-try.', 'woocommerce-gateway-stripe'), |
|
530
|
530
|
), |
|
531
|
|
- 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
|
531
|
+ 'ajaxurl' => admin_url('admin-ajax.php'), |
|
532
|
532
|
'nonce' => array( |
|
533
|
|
- 'apple_pay_domain_nonce' => wp_create_nonce( '_wc_stripe_apple_pay_domain_nonce' ), |
|
|
533
|
+ 'apple_pay_domain_nonce' => wp_create_nonce('_wc_stripe_apple_pay_domain_nonce'), |
|
534
|
534
|
), |
|
535
|
535
|
); |
|
536
|
536
|
|
|
537
|
|
- wp_localize_script( 'woocommerce_stripe_admin', 'wc_stripe_admin_params', apply_filters( 'wc_stripe_admin_params', $stripe_admin_params ) ); |
|
|
537
|
+ wp_localize_script('woocommerce_stripe_admin', 'wc_stripe_admin_params', apply_filters('wc_stripe_admin_params', $stripe_admin_params)); |
|
538
|
538
|
} |
|
539
|
539
|
|
|
540
|
540
|
/** |
|
@@ -545,49 +545,49 @@ discard block |
|
|
block discarded – undo |
|
545
|
545
|
* @access public |
|
546
|
546
|
*/ |
|
547
|
547
|
public function payment_scripts() { |
|
548
|
|
- if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) { |
|
|
548
|
+ if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) { |
|
549
|
549
|
return; |
|
550
|
550
|
} |
|
551
|
551
|
|
|
552
|
|
- $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
|
552
|
+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
553
|
553
|
|
|
554
|
|
- if ( $this->stripe_checkout ) { |
|
555
|
|
- wp_enqueue_script( 'stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true ); |
|
556
|
|
- wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe-checkout' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'stripe_checkout' ), WC_STRIPE_VERSION, true ); |
|
|
554
|
+ if ($this->stripe_checkout) { |
|
|
555
|
+ wp_enqueue_script('stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true); |
|
|
556
|
+ wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe-checkout' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('stripe_checkout'), WC_STRIPE_VERSION, true); |
|
557
|
557
|
} else { |
|
558
|
|
- wp_enqueue_script( 'stripe', 'https://js.stripe.com/v2/', '', '2.0', true ); |
|
559
|
|
- wp_enqueue_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripe' ), WC_STRIPE_VERSION, true ); |
|
|
558
|
+ wp_enqueue_script('stripe', 'https://js.stripe.com/v2/', '', '2.0', true); |
|
|
559
|
+ wp_enqueue_script('woocommerce_stripe', plugins_url('assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripe'), WC_STRIPE_VERSION, true); |
|
560
|
560
|
} |
|
561
|
561
|
|
|
562
|
562
|
$stripe_params = array( |
|
563
|
563
|
'key' => $this->publishable_key, |
|
564
|
|
- 'i18n_terms' => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ), |
|
565
|
|
- 'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ), |
|
|
564
|
+ 'i18n_terms' => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'), |
|
|
565
|
+ 'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'), |
|
566
|
566
|
); |
|
567
|
567
|
|
|
568
|
568
|
// If we're on the pay page we need to pass stripe.js the address of the order. |
|
569
|
|
- if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) { |
|
570
|
|
- $order_id = wc_get_order_id_by_order_key( urldecode( $_GET['key'] ) ); |
|
571
|
|
- $order = wc_get_order( $order_id ); |
|
|
569
|
+ if (isset($_GET['pay_for_order']) && 'true' === $_GET['pay_for_order']) { |
|
|
570
|
+ $order_id = wc_get_order_id_by_order_key(urldecode($_GET['key'])); |
|
|
571
|
+ $order = wc_get_order($order_id); |
|
572
|
572
|
|
|
573
|
|
- $stripe_params['billing_first_name'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name(); |
|
574
|
|
- $stripe_params['billing_last_name'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name(); |
|
575
|
|
- $stripe_params['billing_address_1'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_1 : $order->get_billing_address_1(); |
|
576
|
|
- $stripe_params['billing_address_2'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_address_2 : $order->get_billing_address_2(); |
|
577
|
|
- $stripe_params['billing_state'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_state : $order->get_billing_state(); |
|
578
|
|
- $stripe_params['billing_city'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_city : $order->get_billing_city(); |
|
579
|
|
- $stripe_params['billing_postcode'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_postcode : $order->get_billing_postcode(); |
|
580
|
|
- $stripe_params['billing_country'] = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_country : $order->get_billing_country(); |
|
|
573
|
+ $stripe_params['billing_first_name'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name(); |
|
|
574
|
+ $stripe_params['billing_last_name'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name(); |
|
|
575
|
+ $stripe_params['billing_address_1'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_1 : $order->get_billing_address_1(); |
|
|
576
|
+ $stripe_params['billing_address_2'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_address_2 : $order->get_billing_address_2(); |
|
|
577
|
+ $stripe_params['billing_state'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_state : $order->get_billing_state(); |
|
|
578
|
+ $stripe_params['billing_city'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_city : $order->get_billing_city(); |
|
|
579
|
+ $stripe_params['billing_postcode'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_postcode : $order->get_billing_postcode(); |
|
|
580
|
+ $stripe_params['billing_country'] = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_country : $order->get_billing_country(); |
|
581
|
581
|
} |
|
582
|
582
|
|
|
583
|
|
- $stripe_params['no_prepaid_card_msg'] = __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ); |
|
584
|
|
- $stripe_params['allow_prepaid_card'] = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no'; |
|
585
|
|
- $stripe_params['stripe_checkout_require_billing_address'] = apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'yes' : 'no'; |
|
|
583
|
+ $stripe_params['no_prepaid_card_msg'] = __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'); |
|
|
584
|
+ $stripe_params['allow_prepaid_card'] = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no'; |
|
|
585
|
+ $stripe_params['stripe_checkout_require_billing_address'] = apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'yes' : 'no'; |
|
586
|
586
|
|
|
587
|
587
|
// merge localized messages to be use in JS |
|
588
|
|
- $stripe_params = array_merge( $stripe_params, $this->get_localized_messages() ); |
|
|
588
|
+ $stripe_params = array_merge($stripe_params, $this->get_localized_messages()); |
|
589
|
589
|
|
|
590
|
|
- wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) ); |
|
|
590
|
+ wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params)); |
|
591
|
591
|
} |
|
592
|
592
|
|
|
593
|
593
|
/** |
|
@@ -596,36 +596,36 @@ discard block |
|
|
block discarded – undo |
|
596
|
596
|
* @param object $source |
|
597
|
597
|
* @return array() |
|
598
|
598
|
*/ |
|
599
|
|
- protected function generate_payment_request( $order, $source ) { |
|
|
599
|
+ protected function generate_payment_request($order, $source) { |
|
600
|
600
|
$post_data = array(); |
|
601
|
|
- $post_data['currency'] = strtolower( version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->get_order_currency() : $order->get_currency() ); |
|
602
|
|
- $post_data['amount'] = $this->get_stripe_amount( $order->get_total(), $post_data['currency'] ); |
|
603
|
|
- $post_data['description'] = sprintf( __( '%1$s - Order %2$s', 'woocommerce-gateway-stripe' ), $this->statement_descriptor, $order->get_order_number() ); |
|
|
601
|
+ $post_data['currency'] = strtolower(version_compare(WC_VERSION, '3.0.0', '<') ? $order->get_order_currency() : $order->get_currency()); |
|
|
602
|
+ $post_data['amount'] = $this->get_stripe_amount($order->get_total(), $post_data['currency']); |
|
|
603
|
+ $post_data['description'] = sprintf(__('%1$s - Order %2$s', 'woocommerce-gateway-stripe'), $this->statement_descriptor, $order->get_order_number()); |
|
604
|
604
|
$post_data['capture'] = $this->capture ? 'true' : 'false'; |
|
605
|
605
|
|
|
606
|
|
- $billing_email = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_email : $order->get_billing_email(); |
|
607
|
|
- $billing_first_name = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_first_name : $order->get_billing_first_name(); |
|
608
|
|
- $billing_last_name = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->billing_last_name : $order->get_billing_last_name(); |
|
|
606
|
+ $billing_email = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_email : $order->get_billing_email(); |
|
|
607
|
+ $billing_first_name = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_first_name : $order->get_billing_first_name(); |
|
|
608
|
+ $billing_last_name = version_compare(WC_VERSION, '3.0.0', '<') ? $order->billing_last_name : $order->get_billing_last_name(); |
|
609
|
609
|
|
|
610
|
|
- if ( ! empty( $billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) { |
|
|
610
|
+ if ( ! empty($billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) { |
|
611
|
611
|
$post_data['receipt_email'] = $billing_email; |
|
612
|
612
|
} |
|
613
|
613
|
|
|
614
|
|
- $post_data['expand[]'] = 'balance_transaction'; |
|
|
614
|
+ $post_data['expand[]'] = 'balance_transaction'; |
|
615
|
615
|
|
|
616
|
616
|
$metadata = array( |
|
617
|
|
- __( 'Customer Name', 'woocommerce-gateway-stripe' ) => sanitize_text_field( $billing_first_name ) . ' ' . sanitize_text_field( $billing_last_name ), |
|
618
|
|
- __( 'Customer Email', 'woocommerce-gateway-stripe' ) => sanitize_email( $billing_email ), |
|
619
|
|
- __( 'Woocommerce Order', 'woocommerce-gateway-stripe' ) => sanitize_text_field( $order->id ), |
|
|
617
|
+ __('Customer Name', 'woocommerce-gateway-stripe') => sanitize_text_field($billing_first_name) . ' ' . sanitize_text_field($billing_last_name), |
|
|
618
|
+ __('Customer Email', 'woocommerce-gateway-stripe') => sanitize_email($billing_email), |
|
|
619
|
+ __('Woocommerce Order', 'woocommerce-gateway-stripe') => sanitize_text_field($order->id), |
|
620
|
620
|
); |
|
621
|
621
|
|
|
622
|
|
- $post_data['metadata'] = apply_filters( 'wc_stripe_payment_metadata', $metadata, $order, $source ); |
|
|
622
|
+ $post_data['metadata'] = apply_filters('wc_stripe_payment_metadata', $metadata, $order, $source); |
|
623
|
623
|
|
|
624
|
|
- if ( $source->customer ) { |
|
|
624
|
+ if ($source->customer) { |
|
625
|
625
|
$post_data['customer'] = $source->customer; |
|
626
|
626
|
} |
|
627
|
627
|
|
|
628
|
|
- if ( $source->source ) { |
|
|
628
|
+ if ($source->source) { |
|
629
|
629
|
$post_data['source'] = $source->source; |
|
630
|
630
|
} |
|
631
|
631
|
|
|
@@ -637,7 +637,7 @@ discard block |
|
|
block discarded – undo |
|
637
|
637
|
* @param WC_Order $order |
|
638
|
638
|
* @param object $source |
|
639
|
639
|
*/ |
|
640
|
|
- return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source ); |
|
|
640
|
+ return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source); |
|
641
|
641
|
} |
|
642
|
642
|
|
|
643
|
643
|
/** |
|
@@ -649,38 +649,38 @@ discard block |
|
|
block discarded – undo |
|
649
|
649
|
* @throws Exception When card was not added or for and invalid card. |
|
650
|
650
|
* @return object |
|
651
|
651
|
*/ |
|
652
|
|
- protected function get_source( $user_id, $force_customer = false ) { |
|
653
|
|
- $stripe_customer = new WC_Stripe_Customer( $user_id ); |
|
654
|
|
- $force_customer = apply_filters( 'wc_stripe_force_customer_creation', $force_customer, $stripe_customer ); |
|
|
652
|
+ protected function get_source($user_id, $force_customer = false) { |
|
|
653
|
+ $stripe_customer = new WC_Stripe_Customer($user_id); |
|
|
654
|
+ $force_customer = apply_filters('wc_stripe_force_customer_creation', $force_customer, $stripe_customer); |
|
655
|
655
|
$stripe_source = false; |
|
656
|
656
|
$token_id = false; |
|
657
|
657
|
|
|
658
|
658
|
// New CC info was entered and we have a new token to process |
|
659
|
|
- if ( isset( $_POST['stripe_token'] ) ) { |
|
660
|
|
- $stripe_token = wc_clean( $_POST['stripe_token'] ); |
|
661
|
|
- $maybe_saved_card = isset( $_POST['wc-stripe-new-payment-method'] ) && ! empty( $_POST['wc-stripe-new-payment-method'] ); |
|
|
659
|
+ if (isset($_POST['stripe_token'])) { |
|
|
660
|
+ $stripe_token = wc_clean($_POST['stripe_token']); |
|
|
661
|
+ $maybe_saved_card = isset($_POST['wc-stripe-new-payment-method']) && ! empty($_POST['wc-stripe-new-payment-method']); |
|
662
|
662
|
|
|
663
|
663
|
// This is true if the user wants to store the card to their account. |
|
664
|
|
- if ( ( $user_id && $this->saved_cards && $maybe_saved_card ) || $force_customer ) { |
|
665
|
|
- $stripe_source = $stripe_customer->add_card( $stripe_token ); |
|
|
664
|
+ if (($user_id && $this->saved_cards && $maybe_saved_card) || $force_customer) { |
|
|
665
|
+ $stripe_source = $stripe_customer->add_card($stripe_token); |
|
666
|
666
|
|
|
667
|
|
- if ( is_wp_error( $stripe_source ) ) { |
|
668
|
|
- throw new Exception( $stripe_source->get_error_message() ); |
|
|
667
|
+ if (is_wp_error($stripe_source)) { |
|
|
668
|
+ throw new Exception($stripe_source->get_error_message()); |
|
669
|
669
|
} |
|
670
|
670
|
} else { |
|
671
|
671
|
// Not saving token, so don't define customer either. |
|
672
|
672
|
$stripe_source = $stripe_token; |
|
673
|
673
|
$stripe_customer = false; |
|
674
|
674
|
} |
|
675
|
|
- } elseif ( isset( $_POST['wc-stripe-payment-token'] ) && 'new' !== $_POST['wc-stripe-payment-token'] ) { |
|
|
675
|
+ } elseif (isset($_POST['wc-stripe-payment-token']) && 'new' !== $_POST['wc-stripe-payment-token']) { |
|
676
|
676
|
// Use an existing token, and then process the payment |
|
677
|
677
|
|
|
678
|
|
- $token_id = wc_clean( $_POST['wc-stripe-payment-token'] ); |
|
679
|
|
- $token = WC_Payment_Tokens::get( $token_id ); |
|
|
678
|
+ $token_id = wc_clean($_POST['wc-stripe-payment-token']); |
|
|
679
|
+ $token = WC_Payment_Tokens::get($token_id); |
|
680
|
680
|
|
|
681
|
|
- if ( ! $token || $token->get_user_id() !== get_current_user_id() ) { |
|
682
|
|
- WC()->session->set( 'refresh_totals', true ); |
|
683
|
|
- throw new Exception( __( 'Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe' ) ); |
|
|
681
|
+ if ( ! $token || $token->get_user_id() !== get_current_user_id()) { |
|
|
682
|
+ WC()->session->set('refresh_totals', true); |
|
|
683
|
+ throw new Exception(__('Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe')); |
|
684
|
684
|
} |
|
685
|
685
|
|
|
686
|
686
|
$stripe_source = $token->get_token(); |
|
@@ -704,19 +704,19 @@ discard block |
|
|
block discarded – undo |
|
704
|
704
|
* @param object $order |
|
705
|
705
|
* @return object |
|
706
|
706
|
*/ |
|
707
|
|
- protected function get_order_source( $order = null ) { |
|
|
707
|
+ protected function get_order_source($order = null) { |
|
708
|
708
|
$stripe_customer = new WC_Stripe_Customer(); |
|
709
|
709
|
$stripe_source = false; |
|
710
|
710
|
$token_id = false; |
|
711
|
711
|
|
|
712
|
|
- if ( $order ) { |
|
713
|
|
- $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); |
|
|
712
|
+ if ($order) { |
|
|
713
|
+ $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); |
|
714
|
714
|
|
|
715
|
|
- if ( $meta_value = get_post_meta( $order_id, '_stripe_customer_id', true ) ) { |
|
716
|
|
- $stripe_customer->set_id( $meta_value ); |
|
|
715
|
+ if ($meta_value = get_post_meta($order_id, '_stripe_customer_id', true)) { |
|
|
716
|
+ $stripe_customer->set_id($meta_value); |
|
717
|
717
|
} |
|
718
|
718
|
|
|
719
|
|
- if ( $meta_value = get_post_meta( $order_id, '_stripe_card_id', true ) ) { |
|
|
719
|
+ if ($meta_value = get_post_meta($order_id, '_stripe_card_id', true)) { |
|
720
|
720
|
$stripe_source = $meta_value; |
|
721
|
721
|
} |
|
722
|
722
|
} |
|
@@ -739,60 +739,60 @@ discard block |
|
|
block discarded – undo |
|
739
|
739
|
* |
|
740
|
740
|
* @return array|void |
|
741
|
741
|
*/ |
|
742
|
|
- public function process_payment( $order_id, $retry = true, $force_customer = false ) { |
|
|
742
|
+ public function process_payment($order_id, $retry = true, $force_customer = false) { |
|
743
|
743
|
try { |
|
744
|
|
- $order = wc_get_order( $order_id ); |
|
745
|
|
- $source = $this->get_source( get_current_user_id(), $force_customer ); |
|
|
744
|
+ $order = wc_get_order($order_id); |
|
|
745
|
+ $source = $this->get_source(get_current_user_id(), $force_customer); |
|
746
|
746
|
|
|
747
|
|
- if ( empty( $source->source ) && empty( $source->customer ) ) { |
|
748
|
|
- $error_msg = __( 'Please enter your card details to make a payment.', 'woocommerce-gateway-stripe' ); |
|
749
|
|
- $error_msg .= ' ' . __( 'Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe' ); |
|
750
|
|
- throw new Exception( $error_msg ); |
|
|
747
|
+ if (empty($source->source) && empty($source->customer)) { |
|
|
748
|
+ $error_msg = __('Please enter your card details to make a payment.', 'woocommerce-gateway-stripe'); |
|
|
749
|
+ $error_msg .= ' ' . __('Developers: Please make sure that you are including jQuery and there are no JavaScript errors on the page.', 'woocommerce-gateway-stripe'); |
|
|
750
|
+ throw new Exception($error_msg); |
|
751
|
751
|
} |
|
752
|
752
|
|
|
753
|
753
|
// Store source to order meta. |
|
754
|
|
- $this->save_source( $order, $source ); |
|
|
754
|
+ $this->save_source($order, $source); |
|
755
|
755
|
|
|
756
|
756
|
// Result from Stripe API request. |
|
757
|
757
|
$response = null; |
|
758
|
758
|
|
|
759
|
759
|
// Handle payment. |
|
760
|
|
- if ( $order->get_total() > 0 ) { |
|
|
760
|
+ if ($order->get_total() > 0) { |
|
761
|
761
|
|
|
762
|
|
- if ( $order->get_total() * 100 < WC_Stripe::get_minimum_amount() ) { |
|
763
|
|
- throw new Exception( sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe::get_minimum_amount() / 100 ) ) ); |
|
|
762
|
+ if ($order->get_total() * 100 < WC_Stripe::get_minimum_amount()) { |
|
|
763
|
+ throw new Exception(sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe::get_minimum_amount() / 100))); |
|
764
|
764
|
} |
|
765
|
765
|
|
|
766
|
|
- $this->log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" ); |
|
|
766
|
+ $this->log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}"); |
|
767
|
767
|
|
|
768
|
768
|
// Make the request. |
|
769
|
|
- $response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) ); |
|
|
769
|
+ $response = WC_Stripe_API::request($this->generate_payment_request($order, $source)); |
|
770
|
770
|
|
|
771
|
|
- if ( is_wp_error( $response ) ) { |
|
|
771
|
+ if (is_wp_error($response)) { |
|
772
|
772
|
// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without. |
|
773
|
|
- if ( 'customer' === $response->get_error_code() && $retry ) { |
|
774
|
|
- delete_user_meta( get_current_user_id(), '_stripe_customer_id' ); |
|
775
|
|
- return $this->process_payment( $order_id, false, $force_customer ); |
|
|
773
|
+ if ('customer' === $response->get_error_code() && $retry) { |
|
|
774
|
+ delete_user_meta(get_current_user_id(), '_stripe_customer_id'); |
|
|
775
|
+ return $this->process_payment($order_id, false, $force_customer); |
|
776
|
776
|
// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message. |
|
777
|
|
- } elseif ( 'source' === $response->get_error_code() && $source->token_id ) { |
|
778
|
|
- $token = WC_Payment_Tokens::get( $source->token_id ); |
|
|
777
|
+ } elseif ('source' === $response->get_error_code() && $source->token_id) { |
|
|
778
|
+ $token = WC_Payment_Tokens::get($source->token_id); |
|
779
|
779
|
$token->delete(); |
|
780
|
|
- $message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' ); |
|
781
|
|
- $order->add_order_note( $message ); |
|
782
|
|
- throw new Exception( $message ); |
|
|
780
|
+ $message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe'); |
|
|
781
|
+ $order->add_order_note($message); |
|
|
782
|
+ throw new Exception($message); |
|
783
|
783
|
} |
|
784
|
784
|
|
|
785
|
785
|
$localized_messages = $this->get_localized_messages(); |
|
786
|
786
|
|
|
787
|
|
- $message = isset( $localized_messages[ $response->get_error_code() ] ) ? $localized_messages[ $response->get_error_code() ] : $response->get_error_message(); |
|
|
787
|
+ $message = isset($localized_messages[$response->get_error_code()]) ? $localized_messages[$response->get_error_code()] : $response->get_error_message(); |
|
788
|
788
|
|
|
789
|
|
- $order->add_order_note( $message ); |
|
|
789
|
+ $order->add_order_note($message); |
|
790
|
790
|
|
|
791
|
|
- throw new Exception( $message ); |
|
|
791
|
+ throw new Exception($message); |
|
792
|
792
|
} |
|
793
|
793
|
|
|
794
|
794
|
// Process valid response. |
|
795
|
|
- $this->process_response( $response, $order ); |
|
|
795
|
+ $this->process_response($response, $order); |
|
796
|
796
|
} else { |
|
797
|
797
|
$order->payment_complete(); |
|
798
|
798
|
} |
|
@@ -800,23 +800,23 @@ discard block |
|
|
block discarded – undo |
|
800
|
800
|
// Remove cart. |
|
801
|
801
|
WC()->cart->empty_cart(); |
|
802
|
802
|
|
|
803
|
|
- do_action( 'wc_gateway_stripe_process_payment', $response, $order ); |
|
|
803
|
+ do_action('wc_gateway_stripe_process_payment', $response, $order); |
|
804
|
804
|
|
|
805
|
805
|
// Return thank you page redirect. |
|
806
|
806
|
return array( |
|
807
|
807
|
'result' => 'success', |
|
808
|
|
- 'redirect' => $this->get_return_url( $order ), |
|
|
808
|
+ 'redirect' => $this->get_return_url($order), |
|
809
|
809
|
); |
|
810
|
810
|
|
|
811
|
|
- } catch ( Exception $e ) { |
|
812
|
|
- wc_add_notice( $e->getMessage(), 'error' ); |
|
813
|
|
- $this->log( sprintf( __( 'Error: %s', 'woocommerce-gateway-stripe' ), $e->getMessage() ) ); |
|
|
811
|
+ } catch (Exception $e) { |
|
|
812
|
+ wc_add_notice($e->getMessage(), 'error'); |
|
|
813
|
+ $this->log(sprintf(__('Error: %s', 'woocommerce-gateway-stripe'), $e->getMessage())); |
|
814
|
814
|
|
|
815
|
|
- if ( $order->has_status( array( 'pending', 'failed' ) ) ) { |
|
816
|
|
- $this->send_failed_order_email( $order_id ); |
|
|
815
|
+ if ($order->has_status(array('pending', 'failed'))) { |
|
|
816
|
+ $this->send_failed_order_email($order_id); |
|
817
|
817
|
} |
|
818
|
818
|
|
|
819
|
|
- do_action( 'wc_gateway_stripe_process_payment_error', $e, $order ); |
|
|
819
|
+ do_action('wc_gateway_stripe_process_payment_error', $e, $order); |
|
820
|
820
|
|
|
821
|
821
|
return array( |
|
822
|
822
|
'result' => 'fail', |
|
@@ -831,18 +831,18 @@ discard block |
|
|
block discarded – undo |
|
831
|
831
|
* @param WC_Order $order For to which the source applies. |
|
832
|
832
|
* @param stdClass $source Source information. |
|
833
|
833
|
*/ |
|
834
|
|
- protected function save_source( $order, $source ) { |
|
835
|
|
- $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); |
|
|
834
|
+ protected function save_source($order, $source) { |
|
|
835
|
+ $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); |
|
836
|
836
|
|
|
837
|
837
|
// Store source in the order. |
|
838
|
|
- if ( $source->customer ) { |
|
839
|
|
- version_compare( WC_VERSION, '3.0.0', '<' ) ? update_post_meta( $order_id, '_stripe_customer_id', $source->customer ) : $order->update_meta_data( '_stripe_customer_id', $source->customer ); |
|
|
838
|
+ if ($source->customer) { |
|
|
839
|
+ version_compare(WC_VERSION, '3.0.0', '<') ? update_post_meta($order_id, '_stripe_customer_id', $source->customer) : $order->update_meta_data('_stripe_customer_id', $source->customer); |
|
840
|
840
|
} |
|
841
|
|
- if ( $source->source ) { |
|
842
|
|
- version_compare( WC_VERSION, '3.0.0', '<' ) ? update_post_meta( $order_id, '_stripe_card_id', $source->source ) : $order->update_meta_data( '_stripe_card_id', $source->source ); |
|
|
841
|
+ if ($source->source) { |
|
|
842
|
+ version_compare(WC_VERSION, '3.0.0', '<') ? update_post_meta($order_id, '_stripe_card_id', $source->source) : $order->update_meta_data('_stripe_card_id', $source->source); |
|
843
|
843
|
} |
|
844
|
844
|
|
|
845
|
|
- if ( is_callable( array( $order, 'save' ) ) ) { |
|
|
845
|
+ if (is_callable(array($order, 'save'))) { |
|
846
|
846
|
$order->save(); |
|
847
|
847
|
} |
|
848
|
848
|
} |
|
@@ -850,44 +850,44 @@ discard block |
|
|
block discarded – undo |
|
850
|
850
|
/** |
|
851
|
851
|
* Store extra meta data for an order from a Stripe Response. |
|
852
|
852
|
*/ |
|
853
|
|
- public function process_response( $response, $order ) { |
|
854
|
|
- $this->log( 'Processing response: ' . print_r( $response, true ) ); |
|
|
853
|
+ public function process_response($response, $order) { |
|
|
854
|
+ $this->log('Processing response: ' . print_r($response, true)); |
|
855
|
855
|
|
|
856
|
|
- $order_id = version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->id : $order->get_id(); |
|
|
856
|
+ $order_id = version_compare(WC_VERSION, '3.0.0', '<') ? $order->id : $order->get_id(); |
|
857
|
857
|
|
|
858
|
858
|
// Store charge data |
|
859
|
|
- update_post_meta( $order_id, '_stripe_charge_id', $response->id ); |
|
860
|
|
- update_post_meta( $order_id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no' ); |
|
|
859
|
+ update_post_meta($order_id, '_stripe_charge_id', $response->id); |
|
|
860
|
+ update_post_meta($order_id, '_stripe_charge_captured', $response->captured ? 'yes' : 'no'); |
|
861
|
861
|
|
|
862
|
862
|
// Store other data such as fees |
|
863
|
|
- if ( isset( $response->balance_transaction ) && isset( $response->balance_transaction->fee ) ) { |
|
|
863
|
+ if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) { |
|
864
|
864
|
// Fees and Net needs to both come from Stripe to be accurate as the returned |
|
865
|
865
|
// values are in the local currency of the Stripe account, not from WC. |
|
866
|
|
- $fee = ! empty( $response->balance_transaction->fee ) ? WC_Stripe::format_number( $response->balance_transaction, 'fee' ) : 0; |
|
867
|
|
- $net = ! empty( $response->balance_transaction->net ) ? WC_Stripe::format_number( $response->balance_transaction, 'net' ) : 0; |
|
868
|
|
- update_post_meta( $order_id, 'Stripe Fee', $fee ); |
|
869
|
|
- update_post_meta( $order_id, 'Net Revenue From Stripe', $net ); |
|
|
866
|
+ $fee = ! empty($response->balance_transaction->fee) ? WC_Stripe::format_number($response->balance_transaction, 'fee') : 0; |
|
|
867
|
+ $net = ! empty($response->balance_transaction->net) ? WC_Stripe::format_number($response->balance_transaction, 'net') : 0; |
|
|
868
|
+ update_post_meta($order_id, 'Stripe Fee', $fee); |
|
|
869
|
+ update_post_meta($order_id, 'Net Revenue From Stripe', $net); |
|
870
|
870
|
} |
|
871
|
871
|
|
|
872
|
|
- if ( $response->captured ) { |
|
873
|
|
- $order->payment_complete( $response->id ); |
|
|
872
|
+ if ($response->captured) { |
|
|
873
|
+ $order->payment_complete($response->id); |
|
874
|
874
|
|
|
875
|
|
- $message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id ); |
|
876
|
|
- $order->add_order_note( $message ); |
|
877
|
|
- $this->log( 'Success: ' . $message ); |
|
|
875
|
+ $message = sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $response->id); |
|
|
876
|
+ $order->add_order_note($message); |
|
|
877
|
+ $this->log('Success: ' . $message); |
|
878
|
878
|
|
|
879
|
879
|
} else { |
|
880
|
|
- update_post_meta( $order_id, '_transaction_id', $response->id, true ); |
|
|
880
|
+ update_post_meta($order_id, '_transaction_id', $response->id, true); |
|
881
|
881
|
|
|
882
|
|
- if ( $order->has_status( array( 'pending', 'failed' ) ) ) { |
|
883
|
|
- version_compare( WC_VERSION, '3.0.0', '<' ) ? $order->reduce_order_stock() : wc_reduce_stock_levels( $order_id ); |
|
|
882
|
+ if ($order->has_status(array('pending', 'failed'))) { |
|
|
883
|
+ version_compare(WC_VERSION, '3.0.0', '<') ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id); |
|
884
|
884
|
} |
|
885
|
885
|
|
|
886
|
|
- $order->update_status( 'on-hold', sprintf( __( 'Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe' ), $response->id ) ); |
|
887
|
|
- $this->log( "Successful auth: $response->id" ); |
|
|
886
|
+ $order->update_status('on-hold', sprintf(__('Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe'), $response->id)); |
|
|
887
|
+ $this->log("Successful auth: $response->id"); |
|
888
|
888
|
} |
|
889
|
889
|
|
|
890
|
|
- do_action( 'wc_gateway_stripe_process_response', $response, $order ); |
|
|
890
|
+ do_action('wc_gateway_stripe_process_response', $response, $order); |
|
891
|
891
|
|
|
892
|
892
|
return $response; |
|
893
|
893
|
} |
|
@@ -898,32 +898,32 @@ discard block |
|
|
block discarded – undo |
|
898
|
898
|
* @since 3.0.0 |
|
899
|
899
|
*/ |
|
900
|
900
|
public function add_payment_method() { |
|
901
|
|
- if ( empty( $_POST['stripe_token'] ) || ! is_user_logged_in() ) { |
|
902
|
|
- wc_add_notice( __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' ), 'error' ); |
|
|
901
|
+ if (empty($_POST['stripe_token']) || ! is_user_logged_in()) { |
|
|
902
|
+ wc_add_notice(__('There was a problem adding the card.', 'woocommerce-gateway-stripe'), 'error'); |
|
903
|
903
|
return; |
|
904
|
904
|
} |
|
905
|
905
|
|
|
906
|
|
- $stripe_customer = new WC_Stripe_Customer( get_current_user_id() ); |
|
907
|
|
- $card = $stripe_customer->add_card( wc_clean( $_POST['stripe_token'] ) ); |
|
|
906
|
+ $stripe_customer = new WC_Stripe_Customer(get_current_user_id()); |
|
|
907
|
+ $card = $stripe_customer->add_card(wc_clean($_POST['stripe_token'])); |
|
908
|
908
|
|
|
909
|
|
- if ( is_wp_error( $card ) ) { |
|
|
909
|
+ if (is_wp_error($card)) { |
|
910
|
910
|
$localized_messages = $this->get_localized_messages(); |
|
911
|
|
- $error_msg = __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' ); |
|
|
911
|
+ $error_msg = __('There was a problem adding the card.', 'woocommerce-gateway-stripe'); |
|
912
|
912
|
|
|
913
|
913
|
// loop through the errors to find matching localized message |
|
914
|
|
- foreach ( $card->errors as $error => $msg ) { |
|
915
|
|
- if ( isset( $localized_messages[ $error ] ) ) { |
|
916
|
|
- $error_msg = $localized_messages[ $error ]; |
|
|
914
|
+ foreach ($card->errors as $error => $msg) { |
|
|
915
|
+ if (isset($localized_messages[$error])) { |
|
|
916
|
+ $error_msg = $localized_messages[$error]; |
|
917
|
917
|
} |
|
918
|
918
|
} |
|
919
|
919
|
|
|
920
|
|
- wc_add_notice( $error_msg, 'error' ); |
|
|
920
|
+ wc_add_notice($error_msg, 'error'); |
|
921
|
921
|
return; |
|
922
|
922
|
} |
|
923
|
923
|
|
|
924
|
924
|
return array( |
|
925
|
925
|
'result' => 'success', |
|
926
|
|
- 'redirect' => wc_get_endpoint_url( 'payment-methods' ), |
|
|
926
|
+ 'redirect' => wc_get_endpoint_url('payment-methods'), |
|
927
|
927
|
); |
|
928
|
928
|
} |
|
929
|
929
|
|
|
@@ -933,36 +933,36 @@ discard block |
|
|
block discarded – undo |
|
933
|
933
|
* @param float $amount |
|
934
|
934
|
* @return bool |
|
935
|
935
|
*/ |
|
936
|
|
- public function process_refund( $order_id, $amount = null, $reason = '' ) { |
|
937
|
|
- $order = wc_get_order( $order_id ); |
|
|
936
|
+ public function process_refund($order_id, $amount = null, $reason = '') { |
|
|
937
|
+ $order = wc_get_order($order_id); |
|
938
|
938
|
|
|
939
|
|
- if ( ! $order || ! $order->get_transaction_id() ) { |
|
|
939
|
+ if ( ! $order || ! $order->get_transaction_id()) { |
|
940
|
940
|
return false; |
|
941
|
941
|
} |
|
942
|
942
|
|
|
943
|
943
|
$body = array(); |
|
944
|
944
|
|
|
945
|
|
- if ( ! is_null( $amount ) ) { |
|
946
|
|
- $body['amount'] = $this->get_stripe_amount( $amount ); |
|
|
945
|
+ if ( ! is_null($amount)) { |
|
|
946
|
+ $body['amount'] = $this->get_stripe_amount($amount); |
|
947
|
947
|
} |
|
948
|
948
|
|
|
949
|
|
- if ( $reason ) { |
|
|
949
|
+ if ($reason) { |
|
950
|
950
|
$body['metadata'] = array( |
|
951
|
951
|
'reason' => $reason, |
|
952
|
952
|
); |
|
953
|
953
|
} |
|
954
|
954
|
|
|
955
|
|
- $this->log( "Info: Beginning refund for order $order_id for the amount of {$amount}" ); |
|
|
955
|
+ $this->log("Info: Beginning refund for order $order_id for the amount of {$amount}"); |
|
956
|
956
|
|
|
957
|
|
- $response = WC_Stripe_API::request( $body, 'charges/' . $order->get_transaction_id() . '/refunds' ); |
|
|
957
|
+ $response = WC_Stripe_API::request($body, 'charges/' . $order->get_transaction_id() . '/refunds'); |
|
958
|
958
|
|
|
959
|
|
- if ( is_wp_error( $response ) ) { |
|
960
|
|
- $this->log( 'Error: ' . $response->get_error_message() ); |
|
|
959
|
+ if (is_wp_error($response)) { |
|
|
960
|
+ $this->log('Error: ' . $response->get_error_message()); |
|
961
|
961
|
return $response; |
|
962
|
|
- } elseif ( ! empty( $response->id ) ) { |
|
963
|
|
- $refund_message = sprintf( __( 'Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe' ), wc_price( $response->amount / 100 ), $response->id, $reason ); |
|
964
|
|
- $order->add_order_note( $refund_message ); |
|
965
|
|
- $this->log( 'Success: ' . html_entity_decode( strip_tags( $refund_message ) ) ); |
|
|
962
|
+ } elseif ( ! empty($response->id)) { |
|
|
963
|
+ $refund_message = sprintf(__('Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe'), wc_price($response->amount / 100), $response->id, $reason); |
|
|
964
|
+ $order->add_order_note($refund_message); |
|
|
965
|
+ $this->log('Success: ' . html_entity_decode(strip_tags($refund_message))); |
|
966
|
966
|
return true; |
|
967
|
967
|
} |
|
968
|
968
|
} |
|
@@ -975,10 +975,10 @@ discard block |
|
|
block discarded – undo |
|
975
|
975
|
* @param int $order_id |
|
976
|
976
|
* @return null |
|
977
|
977
|
*/ |
|
978
|
|
- public function send_failed_order_email( $order_id ) { |
|
|
978
|
+ public function send_failed_order_email($order_id) { |
|
979
|
979
|
$emails = WC()->mailer()->get_emails(); |
|
980
|
|
- if ( ! empty( $emails ) && ! empty( $order_id ) ) { |
|
981
|
|
- $emails['WC_Email_Failed_Order']->trigger( $order_id ); |
|
|
980
|
+ if ( ! empty($emails) && ! empty($order_id)) { |
|
|
981
|
+ $emails['WC_Email_Failed_Order']->trigger($order_id); |
|
982
|
982
|
} |
|
983
|
983
|
} |
|
984
|
984
|
|
|
@@ -990,9 +990,9 @@ discard block |
|
|
block discarded – undo |
|
990
|
990
|
* |
|
991
|
991
|
* @param string $message |
|
992
|
992
|
*/ |
|
993
|
|
- public function log( $message ) { |
|
994
|
|
- if ( $this->logging ) { |
|
995
|
|
- WC_Stripe::log( $message ); |
|
|
993
|
+ public function log($message) { |
|
|
994
|
+ if ($this->logging) { |
|
|
995
|
+ WC_Stripe::log($message); |
|
996
|
996
|
} |
|
997
|
997
|
} |
|
998
|
998
|
} |