|
@@ -6,7 +6,7 @@ discard block |
|
|
block discarded – undo |
|
6
|
6
|
* @since 4.0.0 |
|
7
|
7
|
*/ |
|
8
|
8
|
|
|
9
|
|
-if ( ! defined( 'ABSPATH' ) ) { |
|
|
9
|
+if ( ! defined('ABSPATH')) { |
|
10
|
10
|
exit; |
|
11
|
11
|
} |
|
12
|
12
|
|
|
@@ -64,41 +64,41 @@ discard block |
|
|
block discarded – undo |
|
64
|
64
|
*/ |
|
65
|
65
|
public function __construct() { |
|
66
|
66
|
self::$_this = $this; |
|
67
|
|
- $this->stripe_settings = get_option( 'woocommerce_stripe_settings', array() ); |
|
68
|
|
- $this->testmode = ( ! empty( $this->stripe_settings['testmode'] ) && 'yes' === $this->stripe_settings['testmode'] ) ? true : false; |
|
69
|
|
- $this->publishable_key = ! empty( $this->stripe_settings['publishable_key'] ) ? $this->stripe_settings['publishable_key'] : ''; |
|
70
|
|
- $this->secret_key = ! empty( $this->stripe_settings['secret_key'] ) ? $this->stripe_settings['secret_key'] : ''; |
|
71
|
|
- $this->total_label = ! empty( $this->stripe_settings['statement_descriptor'] ) ? WC_Stripe_Helper::clean_statement_descriptor( $this->stripe_settings['statement_descriptor'] ) : ''; |
|
|
67
|
+ $this->stripe_settings = get_option('woocommerce_stripe_settings', array()); |
|
|
68
|
+ $this->testmode = ( ! empty($this->stripe_settings['testmode']) && 'yes' === $this->stripe_settings['testmode']) ? true : false; |
|
|
69
|
+ $this->publishable_key = ! empty($this->stripe_settings['publishable_key']) ? $this->stripe_settings['publishable_key'] : ''; |
|
|
70
|
+ $this->secret_key = ! empty($this->stripe_settings['secret_key']) ? $this->stripe_settings['secret_key'] : ''; |
|
|
71
|
+ $this->total_label = ! empty($this->stripe_settings['statement_descriptor']) ? WC_Stripe_Helper::clean_statement_descriptor($this->stripe_settings['statement_descriptor']) : ''; |
|
72
|
72
|
|
|
73
|
|
- if ( $this->testmode ) { |
|
74
|
|
- $this->publishable_key = ! empty( $this->stripe_settings['test_publishable_key'] ) ? $this->stripe_settings['test_publishable_key'] : ''; |
|
75
|
|
- $this->secret_key = ! empty( $this->stripe_settings['test_secret_key'] ) ? $this->stripe_settings['test_secret_key'] : ''; |
|
|
73
|
+ if ($this->testmode) { |
|
|
74
|
+ $this->publishable_key = ! empty($this->stripe_settings['test_publishable_key']) ? $this->stripe_settings['test_publishable_key'] : ''; |
|
|
75
|
+ $this->secret_key = ! empty($this->stripe_settings['test_secret_key']) ? $this->stripe_settings['test_secret_key'] : ''; |
|
76
|
76
|
} |
|
77
|
77
|
|
|
78
|
|
- $this->total_label = str_replace( "'", '', $this->total_label ) . apply_filters( 'wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)' ); |
|
|
78
|
+ $this->total_label = str_replace("'", '', $this->total_label) . apply_filters('wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)'); |
|
79
|
79
|
|
|
80
|
80
|
// Checks if Stripe Gateway is enabled. |
|
81
|
|
- if ( empty( $this->stripe_settings ) || ( isset( $this->stripe_settings['enabled'] ) && 'yes' !== $this->stripe_settings['enabled'] ) ) { |
|
|
81
|
+ if (empty($this->stripe_settings) || (isset($this->stripe_settings['enabled']) && 'yes' !== $this->stripe_settings['enabled'])) { |
|
82
|
82
|
return; |
|
83
|
83
|
} |
|
84
|
84
|
|
|
85
|
85
|
// Checks if Payment Request is enabled. |
|
86
|
|
- if ( ! isset( $this->stripe_settings['payment_request'] ) || 'yes' !== $this->stripe_settings['payment_request'] ) { |
|
|
86
|
+ if ( ! isset($this->stripe_settings['payment_request']) || 'yes' !== $this->stripe_settings['payment_request']) { |
|
87
|
87
|
return; |
|
88
|
88
|
} |
|
89
|
89
|
|
|
90
|
90
|
// Don't load for change payment method page. |
|
91
|
|
- if ( isset( $_GET['change_payment_method'] ) ) { |
|
|
91
|
+ if (isset($_GET['change_payment_method'])) { |
|
92
|
92
|
return; |
|
93
|
93
|
} |
|
94
|
94
|
|
|
95
|
|
- $wc_default_country = substr( get_option( 'woocommerce_default_country' ), 0, 2 ); |
|
|
95
|
+ $wc_default_country = substr(get_option('woocommerce_default_country'), 0, 2); |
|
96
|
96
|
|
|
97
|
|
- if ( ! in_array( $wc_default_country, $this->get_stripe_supported_countries() ) ) { |
|
|
97
|
+ if ( ! in_array($wc_default_country, $this->get_stripe_supported_countries())) { |
|
98
|
98
|
return; |
|
99
|
99
|
} |
|
100
|
100
|
|
|
101
|
|
- add_action( 'template_redirect', array( $this, 'set_session' ) ); |
|
|
101
|
+ add_action('template_redirect', array($this, 'set_session')); |
|
102
|
102
|
$this->init(); |
|
103
|
103
|
} |
|
104
|
104
|
|
|
@@ -109,7 +109,7 @@ discard block |
|
|
block discarded – undo |
|
109
|
109
|
* @return array The list of countries. |
|
110
|
110
|
*/ |
|
111
|
111
|
public function get_stripe_supported_countries() { |
|
112
|
|
- return apply_filters( 'wc_stripe_supported_countries', array( 'AT', 'AU', 'BE', 'BR', 'CA', 'CH', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'HK', 'IE', 'IN', 'IT', 'JP', 'LT', 'LU', 'LV', 'MX', 'NL', 'NZ', 'NO', 'PH', 'PL', 'PR', 'PT', 'RO', 'SE', 'SG', 'SK', 'US' ) ); |
|
|
112
|
+ return apply_filters('wc_stripe_supported_countries', array('AT', 'AU', 'BE', 'BR', 'CA', 'CH', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'HK', 'IE', 'IN', 'IT', 'JP', 'LT', 'LU', 'LV', 'MX', 'NL', 'NZ', 'NO', 'PH', 'PL', 'PR', 'PT', 'RO', 'SE', 'SG', 'SK', 'US')); |
|
113
|
113
|
} |
|
114
|
114
|
|
|
115
|
115
|
/** |
|
@@ -119,7 +119,7 @@ discard block |
|
|
block discarded – undo |
|
119
|
119
|
* @return bool |
|
120
|
120
|
*/ |
|
121
|
121
|
public function are_keys_set() { |
|
122
|
|
- if ( empty( $this->secret_key ) || empty( $this->publishable_key ) ) { |
|
|
122
|
+ if (empty($this->secret_key) || empty($this->publishable_key)) { |
|
123
|
123
|
return false; |
|
124
|
124
|
} |
|
125
|
125
|
|
|
@@ -143,18 +143,18 @@ discard block |
|
|
block discarded – undo |
|
143
|
143
|
* @since 4.0.0 |
|
144
|
144
|
*/ |
|
145
|
145
|
public function set_session() { |
|
146
|
|
- if ( ! is_product() || ( isset( WC()->session ) && WC()->session->has_session() ) ) { |
|
|
146
|
+ if ( ! is_product() || (isset(WC()->session) && WC()->session->has_session())) { |
|
147
|
147
|
return; |
|
148
|
148
|
} |
|
149
|
149
|
|
|
150
|
|
- $session_class = apply_filters( 'woocommerce_session_handler', 'WC_Session_Handler' ); |
|
|
150
|
+ $session_class = apply_filters('woocommerce_session_handler', 'WC_Session_Handler'); |
|
151
|
151
|
$wc_session = new $session_class(); |
|
152
|
152
|
|
|
153
|
|
- if ( version_compare( WC_VERSION, '3.3', '>=' ) ) { |
|
|
153
|
+ if (version_compare(WC_VERSION, '3.3', '>=')) { |
|
154
|
154
|
$wc_session->init(); |
|
155
|
155
|
} |
|
156
|
156
|
|
|
157
|
|
- $wc_session->set_customer_session_cookie( true ); |
|
|
157
|
+ $wc_session->set_customer_session_cookie(true); |
|
158
|
158
|
} |
|
159
|
159
|
|
|
160
|
160
|
/** |
|
@@ -164,40 +164,40 @@ discard block |
|
|
block discarded – undo |
|
164
|
164
|
* @version 4.0.0 |
|
165
|
165
|
*/ |
|
166
|
166
|
public function init() { |
|
167
|
|
- add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) ); |
|
|
167
|
+ add_action('wp_enqueue_scripts', array($this, 'scripts')); |
|
168
|
168
|
|
|
169
|
169
|
/* |
|
170
|
170
|
* In order to display the Payment Request button in the correct position, |
|
171
|
171
|
* a new hook was added to WooCommerce 3.0. In older versions of WooCommerce, |
|
172
|
172
|
* CSS is used to position the button. |
|
173
|
173
|
*/ |
|
174
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
175
|
|
- add_action( 'woocommerce_after_add_to_cart_button', array( $this, 'display_payment_request_button_html' ), 1 ); |
|
176
|
|
- add_action( 'woocommerce_after_add_to_cart_button', array( $this, 'display_payment_request_button_separator_html' ), 2 ); |
|
|
174
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
175
|
+ add_action('woocommerce_after_add_to_cart_button', array($this, 'display_payment_request_button_html'), 1); |
|
|
176
|
+ add_action('woocommerce_after_add_to_cart_button', array($this, 'display_payment_request_button_separator_html'), 2); |
|
177
|
177
|
} else { |
|
178
|
|
- add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_html' ), 1 ); |
|
179
|
|
- add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_separator_html' ), 2 ); |
|
|
178
|
+ add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_html'), 1); |
|
|
179
|
+ add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_separator_html'), 2); |
|
180
|
180
|
} |
|
181
|
181
|
|
|
182
|
|
- add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_html' ), 1 ); |
|
183
|
|
- add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_separator_html' ), 2 ); |
|
|
182
|
+ add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_html'), 1); |
|
|
183
|
+ add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_separator_html'), 2); |
|
184
|
184
|
|
|
185
|
|
- add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_html' ), 1 ); |
|
186
|
|
- add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_separator_html' ), 2 ); |
|
|
185
|
+ add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_html'), 1); |
|
|
186
|
+ add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_separator_html'), 2); |
|
187
|
187
|
|
|
188
|
|
- add_action( 'wc_ajax_wc_stripe_get_cart_details', array( $this, 'ajax_get_cart_details' ) ); |
|
189
|
|
- add_action( 'wc_ajax_wc_stripe_get_shipping_options', array( $this, 'ajax_get_shipping_options' ) ); |
|
190
|
|
- add_action( 'wc_ajax_wc_stripe_update_shipping_method', array( $this, 'ajax_update_shipping_method' ) ); |
|
191
|
|
- add_action( 'wc_ajax_wc_stripe_create_order', array( $this, 'ajax_create_order' ) ); |
|
192
|
|
- add_action( 'wc_ajax_wc_stripe_add_to_cart', array( $this, 'ajax_add_to_cart' ) ); |
|
193
|
|
- add_action( 'wc_ajax_wc_stripe_get_selected_product_data', array( $this, 'ajax_get_selected_product_data' ) ); |
|
194
|
|
- add_action( 'wc_ajax_wc_stripe_clear_cart', array( $this, 'ajax_clear_cart' ) ); |
|
195
|
|
- add_action( 'wc_ajax_wc_stripe_log_errors', array( $this, 'ajax_log_errors' ) ); |
|
|
188
|
+ add_action('wc_ajax_wc_stripe_get_cart_details', array($this, 'ajax_get_cart_details')); |
|
|
189
|
+ add_action('wc_ajax_wc_stripe_get_shipping_options', array($this, 'ajax_get_shipping_options')); |
|
|
190
|
+ add_action('wc_ajax_wc_stripe_update_shipping_method', array($this, 'ajax_update_shipping_method')); |
|
|
191
|
+ add_action('wc_ajax_wc_stripe_create_order', array($this, 'ajax_create_order')); |
|
|
192
|
+ add_action('wc_ajax_wc_stripe_add_to_cart', array($this, 'ajax_add_to_cart')); |
|
|
193
|
+ add_action('wc_ajax_wc_stripe_get_selected_product_data', array($this, 'ajax_get_selected_product_data')); |
|
|
194
|
+ add_action('wc_ajax_wc_stripe_clear_cart', array($this, 'ajax_clear_cart')); |
|
|
195
|
+ add_action('wc_ajax_wc_stripe_log_errors', array($this, 'ajax_log_errors')); |
|
196
|
196
|
|
|
197
|
|
- add_filter( 'woocommerce_gateway_title', array( $this, 'filter_gateway_title' ), 10, 2 ); |
|
198
|
|
- add_filter( 'woocommerce_validate_postcode', array( $this, 'postal_code_validation' ), 10, 3 ); |
|
|
197
|
+ add_filter('woocommerce_gateway_title', array($this, 'filter_gateway_title'), 10, 2); |
|
|
198
|
+ add_filter('woocommerce_validate_postcode', array($this, 'postal_code_validation'), 10, 3); |
|
199
|
199
|
|
|
200
|
|
- add_action( 'woocommerce_checkout_order_processed', array( $this, 'add_order_meta' ), 10, 2 ); |
|
|
200
|
+ add_action('woocommerce_checkout_order_processed', array($this, 'add_order_meta'), 10, 2); |
|
201
|
201
|
} |
|
202
|
202
|
|
|
203
|
203
|
/** |
|
@@ -208,7 +208,7 @@ discard block |
|
|
block discarded – undo |
|
208
|
208
|
* @return string |
|
209
|
209
|
*/ |
|
210
|
210
|
public function get_button_type() { |
|
211
|
|
- return isset( $this->stripe_settings['payment_request_button_type'] ) ? $this->stripe_settings['payment_request_button_type'] : 'default'; |
|
|
211
|
+ return isset($this->stripe_settings['payment_request_button_type']) ? $this->stripe_settings['payment_request_button_type'] : 'default'; |
|
212
|
212
|
} |
|
213
|
213
|
|
|
214
|
214
|
/** |
|
@@ -219,7 +219,7 @@ discard block |
|
|
block discarded – undo |
|
219
|
219
|
* @return string |
|
220
|
220
|
*/ |
|
221
|
221
|
public function get_button_theme() { |
|
222
|
|
- return isset( $this->stripe_settings['payment_request_button_theme'] ) ? $this->stripe_settings['payment_request_button_theme'] : 'dark'; |
|
|
222
|
+ return isset($this->stripe_settings['payment_request_button_theme']) ? $this->stripe_settings['payment_request_button_theme'] : 'dark'; |
|
223
|
223
|
} |
|
224
|
224
|
|
|
225
|
225
|
/** |
|
@@ -230,7 +230,7 @@ discard block |
|
|
block discarded – undo |
|
230
|
230
|
* @return string |
|
231
|
231
|
*/ |
|
232
|
232
|
public function get_button_height() { |
|
233
|
|
- return isset( $this->stripe_settings['payment_request_button_height'] ) ? str_replace( 'px', '', $this->stripe_settings['payment_request_button_height'] ) : '64'; |
|
|
233
|
+ return isset($this->stripe_settings['payment_request_button_height']) ? str_replace('px', '', $this->stripe_settings['payment_request_button_height']) : '64'; |
|
234
|
234
|
} |
|
235
|
235
|
|
|
236
|
236
|
/** |
|
@@ -240,40 +240,40 @@ discard block |
|
|
block discarded – undo |
|
240
|
240
|
* @version 4.0.0 |
|
241
|
241
|
*/ |
|
242
|
242
|
public function get_product_data() { |
|
243
|
|
- if ( ! is_product() ) { |
|
|
243
|
+ if ( ! is_product()) { |
|
244
|
244
|
return false; |
|
245
|
245
|
} |
|
246
|
246
|
|
|
247
|
247
|
global $post; |
|
248
|
248
|
|
|
249
|
|
- $product = wc_get_product( $post->ID ); |
|
|
249
|
+ $product = wc_get_product($post->ID); |
|
250
|
250
|
|
|
251
|
251
|
$data = array(); |
|
252
|
252
|
$items = array(); |
|
253
|
253
|
|
|
254
|
254
|
$items[] = array( |
|
255
|
|
- 'label' => WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->name : $product->get_name(), |
|
256
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->price : $product->get_price() ), |
|
|
255
|
+ 'label' => WC_Stripe_Helper::is_wc_lt('3.0') ? $product->name : $product->get_name(), |
|
|
256
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount(WC_Stripe_Helper::is_wc_lt('3.0') ? $product->price : $product->get_price()), |
|
257
|
257
|
); |
|
258
|
258
|
|
|
259
|
|
- if ( wc_tax_enabled() ) { |
|
|
259
|
+ if (wc_tax_enabled()) { |
|
260
|
260
|
$items[] = array( |
|
261
|
|
- 'label' => __( 'Tax', 'woocommerce-gateway-stripe' ), |
|
|
261
|
+ 'label' => __('Tax', 'woocommerce-gateway-stripe'), |
|
262
|
262
|
'amount' => 0, |
|
263
|
263
|
'pending' => true, |
|
264
|
264
|
); |
|
265
|
265
|
} |
|
266
|
266
|
|
|
267
|
|
- if ( wc_shipping_enabled() && $product->needs_shipping() ) { |
|
|
267
|
+ if (wc_shipping_enabled() && $product->needs_shipping()) { |
|
268
|
268
|
$items[] = array( |
|
269
|
|
- 'label' => __( 'Shipping', 'woocommerce-gateway-stripe' ), |
|
|
269
|
+ 'label' => __('Shipping', 'woocommerce-gateway-stripe'), |
|
270
|
270
|
'amount' => 0, |
|
271
|
271
|
'pending' => true, |
|
272
|
272
|
); |
|
273
|
273
|
|
|
274
|
274
|
$data['shippingOptions'] = array( |
|
275
|
275
|
'id' => 'pending', |
|
276
|
|
- 'label' => __( 'Pending', 'woocommerce-gateway-stripe' ), |
|
|
276
|
+ 'label' => __('Pending', 'woocommerce-gateway-stripe'), |
|
277
|
277
|
'detail' => '', |
|
278
|
278
|
'amount' => 0, |
|
279
|
279
|
); |
|
@@ -281,41 +281,41 @@ discard block |
|
|
block discarded – undo |
|
281
|
281
|
|
|
282
|
282
|
$data['displayItems'] = $items; |
|
283
|
283
|
$data['total'] = array( |
|
284
|
|
- 'label' => apply_filters( 'wc_stripe_payment_request_total_label', $this->total_label ), |
|
285
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->price : $product->get_price() ), |
|
|
284
|
+ 'label' => apply_filters('wc_stripe_payment_request_total_label', $this->total_label), |
|
|
285
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount(WC_Stripe_Helper::is_wc_lt('3.0') ? $product->price : $product->get_price()), |
|
286
|
286
|
'pending' => true, |
|
287
|
287
|
); |
|
288
|
288
|
|
|
289
|
|
- $data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() ); |
|
290
|
|
- $data['currency'] = strtolower( get_woocommerce_currency() ); |
|
291
|
|
- $data['country_code'] = substr( get_option( 'woocommerce_default_country' ), 0, 2 ); |
|
|
289
|
+ $data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping()); |
|
|
290
|
+ $data['currency'] = strtolower(get_woocommerce_currency()); |
|
|
291
|
+ $data['country_code'] = substr(get_option('woocommerce_default_country'), 0, 2); |
|
292
|
292
|
|
|
293
|
|
- return apply_filters( 'wc_stripe_payment_request_product_data', $data, $product ); |
|
|
293
|
+ return apply_filters('wc_stripe_payment_request_product_data', $data, $product); |
|
294
|
294
|
} |
|
295
|
295
|
|
|
296
|
296
|
/** |
|
297
|
297
|
* Filters the gateway title to reflect Payment Request type |
|
298
|
298
|
* |
|
299
|
299
|
*/ |
|
300
|
|
- public function filter_gateway_title( $title, $id ) { |
|
|
300
|
+ public function filter_gateway_title($title, $id) { |
|
301
|
301
|
global $post; |
|
302
|
302
|
|
|
303
|
|
- if ( ! is_object( $post ) ) { |
|
|
303
|
+ if ( ! is_object($post)) { |
|
304
|
304
|
return $title; |
|
305
|
305
|
} |
|
306
|
306
|
|
|
307
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
308
|
|
- $method_title = get_post_meta( $post->ID, '_payment_method_title', true ); |
|
|
307
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
308
|
+ $method_title = get_post_meta($post->ID, '_payment_method_title', true); |
|
309
|
309
|
} else { |
|
310
|
|
- $order = wc_get_order( $post->ID ); |
|
311
|
|
- $method_title = is_object( $order ) ? $order->get_payment_method_title() : ''; |
|
|
310
|
+ $order = wc_get_order($post->ID); |
|
|
311
|
+ $method_title = is_object($order) ? $order->get_payment_method_title() : ''; |
|
312
|
312
|
} |
|
313
|
313
|
|
|
314
|
|
- if ( 'stripe' === $id && ! empty( $method_title ) && 'Apple Pay (Stripe)' === $method_title ) { |
|
|
314
|
+ if ('stripe' === $id && ! empty($method_title) && 'Apple Pay (Stripe)' === $method_title) { |
|
315
|
315
|
return $method_title; |
|
316
|
316
|
} |
|
317
|
317
|
|
|
318
|
|
- if ( 'stripe' === $id && ! empty( $method_title ) && 'Chrome Payment Request (Stripe)' === $method_title ) { |
|
|
318
|
+ if ('stripe' === $id && ! empty($method_title) && 'Chrome Payment Request (Stripe)' === $method_title) { |
|
319
|
319
|
return $method_title; |
|
320
|
320
|
} |
|
321
|
321
|
|
|
@@ -328,16 +328,16 @@ discard block |
|
|
block discarded – undo |
|
328
|
328
|
* @since 3.1.4 |
|
329
|
329
|
* @version 4.0.0 |
|
330
|
330
|
*/ |
|
331
|
|
- public function postal_code_validation( $valid, $postcode, $country ) { |
|
|
331
|
+ public function postal_code_validation($valid, $postcode, $country) { |
|
332
|
332
|
$gateways = WC()->payment_gateways->get_available_payment_gateways(); |
|
333
|
333
|
|
|
334
|
|
- if ( ! isset( $gateways['stripe'] ) ) { |
|
|
334
|
+ if ( ! isset($gateways['stripe'])) { |
|
335
|
335
|
return $valid; |
|
336
|
336
|
} |
|
337
|
337
|
|
|
338
|
|
- $payment_request_type = isset( $_POST['payment_request_type'] ) ? wc_clean( $_POST['payment_request_type'] ) : ''; |
|
|
338
|
+ $payment_request_type = isset($_POST['payment_request_type']) ? wc_clean($_POST['payment_request_type']) : ''; |
|
339
|
339
|
|
|
340
|
|
- if ( 'apple_pay' !== $payment_request_type ) { |
|
|
340
|
+ if ('apple_pay' !== $payment_request_type) { |
|
341
|
341
|
return $valid; |
|
342
|
342
|
} |
|
343
|
343
|
|
|
@@ -347,7 +347,7 @@ discard block |
|
|
block discarded – undo |
|
347
|
347
|
* the order and not let it go through. The remedy for now is just to remove this validation. |
|
348
|
348
|
* Note that this only works with shipping providers that don't validate full postal codes. |
|
349
|
349
|
*/ |
|
350
|
|
- if ( 'GB' === $country || 'CA' === $country ) { |
|
|
350
|
+ if ('GB' === $country || 'CA' === $country) { |
|
351
|
351
|
return true; |
|
352
|
352
|
} |
|
353
|
353
|
|
|
@@ -362,29 +362,29 @@ discard block |
|
|
block discarded – undo |
|
362
|
362
|
* @param int $order_id |
|
363
|
363
|
* @param array $posted_data The posted data from checkout form. |
|
364
|
364
|
*/ |
|
365
|
|
- public function add_order_meta( $order_id, $posted_data ) { |
|
366
|
|
- if ( empty( $_POST['payment_request_type'] ) ) { |
|
|
365
|
+ public function add_order_meta($order_id, $posted_data) { |
|
|
366
|
+ if (empty($_POST['payment_request_type'])) { |
|
367
|
367
|
return; |
|
368
|
368
|
} |
|
369
|
369
|
|
|
370
|
|
- $order = wc_get_order( $order_id ); |
|
|
370
|
+ $order = wc_get_order($order_id); |
|
371
|
371
|
|
|
372
|
|
- $payment_request_type = wc_clean( $_POST['payment_request_type'] ); |
|
|
372
|
+ $payment_request_type = wc_clean($_POST['payment_request_type']); |
|
373
|
373
|
|
|
374
|
|
- if ( 'apple_pay' === $payment_request_type ) { |
|
375
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
376
|
|
- update_post_meta( $order_id, '_payment_method_title', 'Apple Pay (Stripe)' ); |
|
|
374
|
+ if ('apple_pay' === $payment_request_type) { |
|
|
375
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
376
|
+ update_post_meta($order_id, '_payment_method_title', 'Apple Pay (Stripe)'); |
|
377
|
377
|
} else { |
|
378
|
|
- $order->set_payment_method_title( 'Apple Pay (Stripe)' ); |
|
|
378
|
+ $order->set_payment_method_title('Apple Pay (Stripe)'); |
|
379
|
379
|
$order->save(); |
|
380
|
380
|
} |
|
381
|
381
|
} |
|
382
|
382
|
|
|
383
|
|
- if ( 'payment_request_api' === $payment_request_type ) { |
|
384
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
385
|
|
- update_post_meta( $order_id, '_payment_method_title', 'Chrome Payment Request (Stripe)' ); |
|
|
383
|
+ if ('payment_request_api' === $payment_request_type) { |
|
|
384
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
385
|
+ update_post_meta($order_id, '_payment_method_title', 'Chrome Payment Request (Stripe)'); |
|
386
|
386
|
} else { |
|
387
|
|
- $order->set_payment_method_title( 'Chrome Payment Request (Stripe)' ); |
|
|
387
|
+ $order->set_payment_method_title('Chrome Payment Request (Stripe)'); |
|
388
|
388
|
$order->save(); |
|
389
|
389
|
} |
|
390
|
390
|
} |
|
@@ -423,20 +423,20 @@ discard block |
|
|
block discarded – undo |
|
423
|
423
|
* @return bool |
|
424
|
424
|
*/ |
|
425
|
425
|
public function allowed_items_in_cart() { |
|
426
|
|
- foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) { |
|
427
|
|
- $_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key ); |
|
|
426
|
+ foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) { |
|
|
427
|
+ $_product = apply_filters('woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key); |
|
428
|
428
|
|
|
429
|
|
- if ( ! in_array( ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $_product->product_type : $_product->get_type() ), $this->supported_product_types() ) ) { |
|
|
429
|
+ if ( ! in_array((WC_Stripe_Helper::is_wc_lt('3.0') ? $_product->product_type : $_product->get_type()), $this->supported_product_types())) { |
|
430
|
430
|
return false; |
|
431
|
431
|
} |
|
432
|
432
|
|
|
433
|
433
|
// Trial subscriptions with shipping are not supported |
|
434
|
|
- if ( class_exists( 'WC_Subscriptions_Order' ) && WC_Subscriptions_Cart::cart_contains_subscription() && $_product->needs_shipping() && WC_Subscriptions_Product::get_trial_length( $_product ) > 0 ) { |
|
|
434
|
+ if (class_exists('WC_Subscriptions_Order') && WC_Subscriptions_Cart::cart_contains_subscription() && $_product->needs_shipping() && WC_Subscriptions_Product::get_trial_length($_product) > 0) { |
|
435
|
435
|
return false; |
|
436
|
436
|
} |
|
437
|
437
|
|
|
438
|
438
|
// Pre Orders compatbility where we don't support charge upon release. |
|
439
|
|
- if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release( WC_Pre_Orders_Cart::get_pre_order_product() ) ) { |
|
|
439
|
+ if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release(WC_Pre_Orders_Cart::get_pre_order_product())) { |
|
440
|
440
|
return false; |
|
441
|
441
|
} |
|
442
|
442
|
} |
|
@@ -452,83 +452,83 @@ discard block |
|
|
block discarded – undo |
|
452
|
452
|
*/ |
|
453
|
453
|
public function scripts() { |
|
454
|
454
|
// If keys are not set bail. |
|
455
|
|
- if ( ! $this->are_keys_set() ) { |
|
456
|
|
- WC_Stripe_Logger::log( 'Keys are not set correctly.' ); |
|
|
455
|
+ if ( ! $this->are_keys_set()) { |
|
|
456
|
+ WC_Stripe_Logger::log('Keys are not set correctly.'); |
|
457
|
457
|
return; |
|
458
|
458
|
} |
|
459
|
459
|
|
|
460
|
460
|
// If no SSL bail. |
|
461
|
|
- if ( ! $this->testmode && ! is_ssl() ) { |
|
462
|
|
- WC_Stripe_Logger::log( 'Stripe Payment Request live mode requires SSL.' ); |
|
|
461
|
+ if ( ! $this->testmode && ! is_ssl()) { |
|
|
462
|
+ WC_Stripe_Logger::log('Stripe Payment Request live mode requires SSL.'); |
|
463
|
463
|
return; |
|
464
|
464
|
} |
|
465
|
465
|
|
|
466
|
|
- if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) ) { |
|
|
466
|
+ if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order'])) { |
|
467
|
467
|
return; |
|
468
|
468
|
} |
|
469
|
469
|
|
|
470
|
|
- if ( is_product() ) { |
|
|
470
|
+ if (is_product()) { |
|
471
|
471
|
global $post; |
|
472
|
472
|
|
|
473
|
|
- $product = wc_get_product( $post->ID ); |
|
|
473
|
+ $product = wc_get_product($post->ID); |
|
474
|
474
|
|
|
475
|
|
- if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) { |
|
|
475
|
+ if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type()), $this->supported_product_types())) { |
|
476
|
476
|
return; |
|
477
|
477
|
} |
|
478
|
478
|
|
|
479
|
|
- if ( apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false, $post ) ) { |
|
|
479
|
+ if (apply_filters('wc_stripe_hide_payment_request_on_product_page', false, $post)) { |
|
480
|
480
|
return; |
|
481
|
481
|
} |
|
482
|
482
|
} |
|
483
|
483
|
|
|
484
|
|
- $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
|
484
|
+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
485
|
485
|
|
|
486
|
486
|
$stripe_params = array( |
|
487
|
|
- 'ajax_url' => WC_AJAX::get_endpoint( '%%endpoint%%' ), |
|
|
487
|
+ 'ajax_url' => WC_AJAX::get_endpoint('%%endpoint%%'), |
|
488
|
488
|
'stripe' => array( |
|
489
|
489
|
'key' => $this->publishable_key, |
|
490
|
|
- 'allow_prepaid_card' => apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no', |
|
|
490
|
+ 'allow_prepaid_card' => apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no', |
|
491
|
491
|
), |
|
492
|
492
|
'nonce' => array( |
|
493
|
|
- 'payment' => wp_create_nonce( 'wc-stripe-payment-request' ), |
|
494
|
|
- 'shipping' => wp_create_nonce( 'wc-stripe-payment-request-shipping' ), |
|
495
|
|
- 'update_shipping' => wp_create_nonce( 'wc-stripe-update-shipping-method' ), |
|
496
|
|
- 'checkout' => wp_create_nonce( 'woocommerce-process_checkout' ), |
|
497
|
|
- 'add_to_cart' => wp_create_nonce( 'wc-stripe-add-to-cart' ), |
|
498
|
|
- 'get_selected_product_data' => wp_create_nonce( 'wc-stripe-get-selected-product-data' ), |
|
499
|
|
- 'log_errors' => wp_create_nonce( 'wc-stripe-log-errors' ), |
|
500
|
|
- 'clear_cart' => wp_create_nonce( 'wc-stripe-clear-cart' ), |
|
|
493
|
+ 'payment' => wp_create_nonce('wc-stripe-payment-request'), |
|
|
494
|
+ 'shipping' => wp_create_nonce('wc-stripe-payment-request-shipping'), |
|
|
495
|
+ 'update_shipping' => wp_create_nonce('wc-stripe-update-shipping-method'), |
|
|
496
|
+ 'checkout' => wp_create_nonce('woocommerce-process_checkout'), |
|
|
497
|
+ 'add_to_cart' => wp_create_nonce('wc-stripe-add-to-cart'), |
|
|
498
|
+ 'get_selected_product_data' => wp_create_nonce('wc-stripe-get-selected-product-data'), |
|
|
499
|
+ 'log_errors' => wp_create_nonce('wc-stripe-log-errors'), |
|
|
500
|
+ 'clear_cart' => wp_create_nonce('wc-stripe-clear-cart'), |
|
501
|
501
|
), |
|
502
|
502
|
'i18n' => array( |
|
503
|
|
- 'no_prepaid_card' => __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ), |
|
|
503
|
+ 'no_prepaid_card' => __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'), |
|
504
|
504
|
/* translators: Do not translate the [option] placeholder */ |
|
505
|
|
- 'unknown_shipping' => __( 'Unknown shipping option "[option]".', 'woocommerce-gateway-stripe' ), |
|
|
505
|
+ 'unknown_shipping' => __('Unknown shipping option "[option]".', 'woocommerce-gateway-stripe'), |
|
506
|
506
|
), |
|
507
|
507
|
'checkout' => array( |
|
508
|
508
|
'url' => wc_get_checkout_url(), |
|
509
|
|
- 'currency_code' => strtolower( get_woocommerce_currency() ), |
|
510
|
|
- 'country_code' => substr( get_option( 'woocommerce_default_country' ), 0, 2 ), |
|
|
509
|
+ 'currency_code' => strtolower(get_woocommerce_currency()), |
|
|
510
|
+ 'country_code' => substr(get_option('woocommerce_default_country'), 0, 2), |
|
511
|
511
|
'needs_shipping' => WC()->cart->needs_shipping() ? 'yes' : 'no', |
|
512
|
512
|
), |
|
513
|
513
|
'button' => array( |
|
514
|
514
|
'type' => $this->get_button_type(), |
|
515
|
515
|
'theme' => $this->get_button_theme(), |
|
516
|
516
|
'height' => $this->get_button_height(), |
|
517
|
|
- 'locale' => apply_filters( 'wc_stripe_payment_request_button_locale', substr( get_locale(), 0, 2 ) ), // Default format is en_US. |
|
|
517
|
+ 'locale' => apply_filters('wc_stripe_payment_request_button_locale', substr(get_locale(), 0, 2)), // Default format is en_US. |
|
518
|
518
|
), |
|
519
|
519
|
'is_product_page' => is_product(), |
|
520
|
520
|
'product' => $this->get_product_data(), |
|
521
|
521
|
); |
|
522
|
522
|
|
|
523
|
|
- wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true ); |
|
524
|
|
- wp_register_script( 'wc_stripe_payment_request', plugins_url( 'assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery', 'stripe' ), WC_STRIPE_VERSION, true ); |
|
|
523
|
+ wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true); |
|
|
524
|
+ wp_register_script('wc_stripe_payment_request', plugins_url('assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery', 'stripe'), WC_STRIPE_VERSION, true); |
|
525
|
525
|
|
|
526
|
|
- wp_localize_script( 'wc_stripe_payment_request', 'wc_stripe_payment_request_params', apply_filters( 'wc_stripe_payment_request_params', $stripe_params ) ); |
|
|
526
|
+ wp_localize_script('wc_stripe_payment_request', 'wc_stripe_payment_request_params', apply_filters('wc_stripe_payment_request_params', $stripe_params)); |
|
527
|
527
|
|
|
528
|
|
- wp_enqueue_script( 'wc_stripe_payment_request' ); |
|
|
528
|
+ wp_enqueue_script('wc_stripe_payment_request'); |
|
529
|
529
|
|
|
530
|
530
|
$gateways = WC()->payment_gateways->get_available_payment_gateways(); |
|
531
|
|
- if ( isset( $gateways['stripe'] ) ) { |
|
|
531
|
+ if (isset($gateways['stripe'])) { |
|
532
|
532
|
$gateways['stripe']->payment_scripts(); |
|
533
|
533
|
} |
|
534
|
534
|
} |
|
@@ -544,42 +544,42 @@ discard block |
|
|
block discarded – undo |
|
544
|
544
|
|
|
545
|
545
|
$gateways = WC()->payment_gateways->get_available_payment_gateways(); |
|
546
|
546
|
|
|
547
|
|
- if ( ! isset( $gateways['stripe'] ) ) { |
|
|
547
|
+ if ( ! isset($gateways['stripe'])) { |
|
548
|
548
|
return; |
|
549
|
549
|
} |
|
550
|
550
|
|
|
551
|
|
- if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) { |
|
|
551
|
+ if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) { |
|
552
|
552
|
return; |
|
553
|
553
|
} |
|
554
|
554
|
|
|
555
|
|
- if ( is_product() && apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false, $post ) ) { |
|
|
555
|
+ if (is_product() && apply_filters('wc_stripe_hide_payment_request_on_product_page', false, $post)) { |
|
556
|
556
|
return; |
|
557
|
557
|
} |
|
558
|
558
|
|
|
559
|
|
- if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false, $post ) ) { |
|
|
559
|
+ if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false, $post)) { |
|
560
|
560
|
return; |
|
561
|
561
|
} |
|
562
|
562
|
|
|
563
|
|
- if ( is_product() ) { |
|
564
|
|
- $product = wc_get_product( $post->ID ); |
|
|
563
|
+ if (is_product()) { |
|
|
564
|
+ $product = wc_get_product($post->ID); |
|
565
|
565
|
|
|
566
|
|
- if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) { |
|
|
566
|
+ if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type()), $this->supported_product_types())) { |
|
567
|
567
|
return; |
|
568
|
568
|
} |
|
569
|
569
|
|
|
570
|
570
|
// Trial subscriptions with shipping are not supported |
|
571
|
|
- if ( class_exists( 'WC_Subscriptions_Order' ) && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length( $product ) > 0 ) { |
|
|
571
|
+ if (class_exists('WC_Subscriptions_Order') && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length($product) > 0) { |
|
572
|
572
|
return; |
|
573
|
573
|
} |
|
574
|
574
|
|
|
575
|
575
|
// Pre Orders charge upon release not supported. |
|
576
|
|
- if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) { |
|
577
|
|
- WC_Stripe_Logger::log( 'Pre Order charge upon release is not supported. ( Payment Request button disabled )' ); |
|
|
576
|
+ if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Product::product_is_charged_upon_release($product)) { |
|
|
577
|
+ WC_Stripe_Logger::log('Pre Order charge upon release is not supported. ( Payment Request button disabled )'); |
|
578
|
578
|
return; |
|
579
|
579
|
} |
|
580
|
580
|
} else { |
|
581
|
|
- if ( ! $this->allowed_items_in_cart() ) { |
|
582
|
|
- WC_Stripe_Logger::log( 'Items in the cart has unsupported product type ( Payment Request button disabled )' ); |
|
|
581
|
+ if ( ! $this->allowed_items_in_cart()) { |
|
|
582
|
+ WC_Stripe_Logger::log('Items in the cart has unsupported product type ( Payment Request button disabled )'); |
|
583
|
583
|
return; |
|
584
|
584
|
} |
|
585
|
585
|
} |
|
@@ -603,47 +603,47 @@ discard block |
|
|
block discarded – undo |
|
603
|
603
|
|
|
604
|
604
|
$gateways = WC()->payment_gateways->get_available_payment_gateways(); |
|
605
|
605
|
|
|
606
|
|
- if ( ! isset( $gateways['stripe'] ) ) { |
|
|
606
|
+ if ( ! isset($gateways['stripe'])) { |
|
607
|
607
|
return; |
|
608
|
608
|
} |
|
609
|
609
|
|
|
610
|
|
- if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) { |
|
|
610
|
+ if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) { |
|
611
|
611
|
return; |
|
612
|
612
|
} |
|
613
|
613
|
|
|
614
|
|
- if ( is_product() && apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false, $post ) ) { |
|
|
614
|
+ if (is_product() && apply_filters('wc_stripe_hide_payment_request_on_product_page', false, $post)) { |
|
615
|
615
|
return; |
|
616
|
616
|
} |
|
617
|
617
|
|
|
618
|
|
- if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false, $post ) ) { |
|
|
618
|
+ if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false, $post)) { |
|
619
|
619
|
return; |
|
620
|
620
|
} |
|
621
|
621
|
|
|
622
|
|
- if ( is_product() ) { |
|
623
|
|
- $product = wc_get_product( $post->ID ); |
|
|
622
|
+ if (is_product()) { |
|
|
623
|
+ $product = wc_get_product($post->ID); |
|
624
|
624
|
|
|
625
|
|
- if ( ! is_object( $product ) || ! in_array( ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) { |
|
|
625
|
+ if ( ! is_object($product) || ! in_array((WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type()), $this->supported_product_types())) { |
|
626
|
626
|
return; |
|
627
|
627
|
} |
|
628
|
628
|
|
|
629
|
629
|
// Trial subscriptions with shipping are not supported |
|
630
|
|
- if ( class_exists( 'WC_Subscriptions_Order' ) && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length( $product ) > 0 ) { |
|
|
630
|
+ if (class_exists('WC_Subscriptions_Order') && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length($product) > 0) { |
|
631
|
631
|
return; |
|
632
|
632
|
} |
|
633
|
633
|
|
|
634
|
634
|
// Pre Orders charge upon release not supported. |
|
635
|
|
- if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) { |
|
636
|
|
- WC_Stripe_Logger::log( 'Pre Order charge upon release is not supported. ( Payment Request button disabled )' ); |
|
|
635
|
+ if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Product::product_is_charged_upon_release($product)) { |
|
|
636
|
+ WC_Stripe_Logger::log('Pre Order charge upon release is not supported. ( Payment Request button disabled )'); |
|
637
|
637
|
return; |
|
638
|
638
|
} |
|
639
|
639
|
} else { |
|
640
|
|
- if ( ! $this->allowed_items_in_cart() ) { |
|
641
|
|
- WC_Stripe_Logger::log( 'Items in the cart has unsupported product type ( Payment Request button disabled )' ); |
|
|
640
|
+ if ( ! $this->allowed_items_in_cart()) { |
|
|
641
|
+ WC_Stripe_Logger::log('Items in the cart has unsupported product type ( Payment Request button disabled )'); |
|
642
|
642
|
return; |
|
643
|
643
|
} |
|
644
|
644
|
} |
|
645
|
645
|
?> |
|
646
|
|
- <p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">— <?php esc_html_e( 'OR', 'woocommerce-gateway-stripe' ); ?> —</p> |
|
|
646
|
+ <p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">— <?php esc_html_e('OR', 'woocommerce-gateway-stripe'); ?> —</p> |
|
647
|
647
|
<?php |
|
648
|
648
|
} |
|
649
|
649
|
|
|
@@ -654,11 +654,11 @@ discard block |
|
|
block discarded – undo |
|
654
|
654
|
* @version 4.0.0 |
|
655
|
655
|
*/ |
|
656
|
656
|
public function ajax_log_errors() { |
|
657
|
|
- check_ajax_referer( 'wc-stripe-log-errors', 'security' ); |
|
|
657
|
+ check_ajax_referer('wc-stripe-log-errors', 'security'); |
|
658
|
658
|
|
|
659
|
|
- $errors = wc_clean( stripslashes( $_POST['errors'] ) ); |
|
|
659
|
+ $errors = wc_clean(stripslashes($_POST['errors'])); |
|
660
|
660
|
|
|
661
|
|
- WC_Stripe_Logger::log( $errors ); |
|
|
661
|
+ WC_Stripe_Logger::log($errors); |
|
662
|
662
|
|
|
663
|
663
|
exit; |
|
664
|
664
|
} |
|
@@ -670,7 +670,7 @@ discard block |
|
|
block discarded – undo |
|
670
|
670
|
* @version 4.0.0 |
|
671
|
671
|
*/ |
|
672
|
672
|
public function ajax_clear_cart() { |
|
673
|
|
- check_ajax_referer( 'wc-stripe-clear-cart', 'security' ); |
|
|
673
|
+ check_ajax_referer('wc-stripe-clear-cart', 'security'); |
|
674
|
674
|
|
|
675
|
675
|
WC()->cart->empty_cart(); |
|
676
|
676
|
exit; |
|
@@ -680,10 +680,10 @@ discard block |
|
|
block discarded – undo |
|
680
|
680
|
* Get cart details. |
|
681
|
681
|
*/ |
|
682
|
682
|
public function ajax_get_cart_details() { |
|
683
|
|
- check_ajax_referer( 'wc-stripe-payment-request', 'security' ); |
|
|
683
|
+ check_ajax_referer('wc-stripe-payment-request', 'security'); |
|
684
|
684
|
|
|
685
|
|
- if ( ! defined( 'WOOCOMMERCE_CART' ) ) { |
|
686
|
|
- define( 'WOOCOMMERCE_CART', true ); |
|
|
685
|
+ if ( ! defined('WOOCOMMERCE_CART')) { |
|
|
686
|
+ define('WOOCOMMERCE_CART', true); |
|
687
|
687
|
} |
|
688
|
688
|
|
|
689
|
689
|
WC()->cart->calculate_totals(); |
|
@@ -694,14 +694,14 @@ discard block |
|
|
block discarded – undo |
|
694
|
694
|
$data = array( |
|
695
|
695
|
'shipping_required' => WC()->cart->needs_shipping(), |
|
696
|
696
|
'order_data' => array( |
|
697
|
|
- 'currency' => strtolower( $currency ), |
|
698
|
|
- 'country_code' => substr( get_option( 'woocommerce_default_country' ), 0, 2 ), |
|
|
697
|
+ 'currency' => strtolower($currency), |
|
|
698
|
+ 'country_code' => substr(get_option('woocommerce_default_country'), 0, 2), |
|
699
|
699
|
), |
|
700
|
700
|
); |
|
701
|
701
|
|
|
702
|
702
|
$data['order_data'] += $this->build_display_items(); |
|
703
|
703
|
|
|
704
|
|
- wp_send_json( $data ); |
|
|
704
|
+ wp_send_json($data); |
|
705
|
705
|
} |
|
706
|
706
|
|
|
707
|
707
|
/** |
|
@@ -712,7 +712,7 @@ discard block |
|
|
block discarded – undo |
|
712
|
712
|
* @see WC_Shipping::get_packages(). |
|
713
|
713
|
*/ |
|
714
|
714
|
public function ajax_get_shipping_options() { |
|
715
|
|
- check_ajax_referer( 'wc-stripe-payment-request-shipping', 'security' ); |
|
|
715
|
+ check_ajax_referer('wc-stripe-payment-request-shipping', 'security'); |
|
716
|
716
|
|
|
717
|
717
|
try { |
|
718
|
718
|
// Set the shipping package. |
|
@@ -728,34 +728,34 @@ discard block |
|
|
block discarded – undo |
|
728
|
728
|
) |
|
729
|
729
|
); |
|
730
|
730
|
|
|
731
|
|
- $this->calculate_shipping( apply_filters( 'wc_stripe_payment_request_shipping_posted_values', $posted ) ); |
|
|
731
|
+ $this->calculate_shipping(apply_filters('wc_stripe_payment_request_shipping_posted_values', $posted)); |
|
732
|
732
|
|
|
733
|
733
|
// Set the shipping options. |
|
734
|
734
|
$data = array(); |
|
735
|
735
|
$packages = WC()->shipping->get_packages(); |
|
736
|
736
|
|
|
737
|
|
- if ( ! empty( $packages ) && WC()->customer->has_calculated_shipping() ) { |
|
738
|
|
- foreach ( $packages as $package_key => $package ) { |
|
739
|
|
- if ( empty( $package['rates'] ) ) { |
|
740
|
|
- throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) ); |
|
|
737
|
+ if ( ! empty($packages) && WC()->customer->has_calculated_shipping()) { |
|
|
738
|
+ foreach ($packages as $package_key => $package) { |
|
|
739
|
+ if (empty($package['rates'])) { |
|
|
740
|
+ throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe')); |
|
741
|
741
|
} |
|
742
|
742
|
|
|
743
|
|
- foreach ( $package['rates'] as $key => $rate ) { |
|
|
743
|
+ foreach ($package['rates'] as $key => $rate) { |
|
744
|
744
|
$data['shipping_options'][] = array( |
|
745
|
745
|
'id' => $rate->id, |
|
746
|
746
|
'label' => $rate->label, |
|
747
|
747
|
'detail' => '', |
|
748
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $rate->cost ), |
|
|
748
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($rate->cost), |
|
749
|
749
|
); |
|
750
|
750
|
} |
|
751
|
751
|
} |
|
752
|
752
|
} else { |
|
753
|
|
- throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) ); |
|
|
753
|
+ throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe')); |
|
754
|
754
|
} |
|
755
|
755
|
|
|
756
|
|
- if ( isset( $data[0] ) ) { |
|
|
756
|
+ if (isset($data[0])) { |
|
757
|
757
|
// Auto select the first shipping method. |
|
758
|
|
- WC()->session->set( 'chosen_shipping_methods', array( $data[0]['id'] ) ); |
|
|
758
|
+ WC()->session->set('chosen_shipping_methods', array($data[0]['id'])); |
|
759
|
759
|
} |
|
760
|
760
|
|
|
761
|
761
|
WC()->cart->calculate_totals(); |
|
@@ -763,12 +763,12 @@ discard block |
|
|
block discarded – undo |
|
763
|
763
|
$data += $this->build_display_items(); |
|
764
|
764
|
$data['result'] = 'success'; |
|
765
|
765
|
|
|
766
|
|
- wp_send_json( $data ); |
|
767
|
|
- } catch ( Exception $e ) { |
|
|
766
|
+ wp_send_json($data); |
|
|
767
|
+ } catch (Exception $e) { |
|
768
|
768
|
$data += $this->build_display_items(); |
|
769
|
769
|
$data['result'] = 'invalid_shipping_address'; |
|
770
|
770
|
|
|
771
|
|
- wp_send_json( $data ); |
|
|
771
|
+ wp_send_json($data); |
|
772
|
772
|
} |
|
773
|
773
|
} |
|
774
|
774
|
|
|
@@ -776,22 +776,22 @@ discard block |
|
|
block discarded – undo |
|
776
|
776
|
* Update shipping method. |
|
777
|
777
|
*/ |
|
778
|
778
|
public function ajax_update_shipping_method() { |
|
779
|
|
- check_ajax_referer( 'wc-stripe-update-shipping-method', 'security' ); |
|
|
779
|
+ check_ajax_referer('wc-stripe-update-shipping-method', 'security'); |
|
780
|
780
|
|
|
781
|
|
- if ( ! defined( 'WOOCOMMERCE_CART' ) ) { |
|
782
|
|
- define( 'WOOCOMMERCE_CART', true ); |
|
|
781
|
+ if ( ! defined('WOOCOMMERCE_CART')) { |
|
|
782
|
+ define('WOOCOMMERCE_CART', true); |
|
783
|
783
|
} |
|
784
|
784
|
|
|
785
|
|
- $chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' ); |
|
786
|
|
- $shipping_method = filter_input( INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ); |
|
|
785
|
+ $chosen_shipping_methods = WC()->session->get('chosen_shipping_methods'); |
|
|
786
|
+ $shipping_method = filter_input(INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY); |
|
787
|
787
|
|
|
788
|
|
- if ( is_array( $shipping_method ) ) { |
|
789
|
|
- foreach ( $shipping_method as $i => $value ) { |
|
790
|
|
- $chosen_shipping_methods[ $i ] = wc_clean( $value ); |
|
|
788
|
+ if (is_array($shipping_method)) { |
|
|
789
|
+ foreach ($shipping_method as $i => $value) { |
|
|
790
|
+ $chosen_shipping_methods[$i] = wc_clean($value); |
|
791
|
791
|
} |
|
792
|
792
|
} |
|
793
|
793
|
|
|
794
|
|
- WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods ); |
|
|
794
|
+ WC()->session->set('chosen_shipping_methods', $chosen_shipping_methods); |
|
795
|
795
|
|
|
796
|
796
|
WC()->cart->calculate_totals(); |
|
797
|
797
|
|
|
@@ -799,7 +799,7 @@ discard block |
|
|
block discarded – undo |
|
799
|
799
|
$data += $this->build_display_items(); |
|
800
|
800
|
$data['result'] = 'success'; |
|
801
|
801
|
|
|
802
|
|
- wp_send_json( $data ); |
|
|
802
|
+ wp_send_json($data); |
|
803
|
803
|
} |
|
804
|
804
|
|
|
805
|
805
|
/** |
|
@@ -810,46 +810,46 @@ discard block |
|
|
block discarded – undo |
|
810
|
810
|
* @return array $data |
|
811
|
811
|
*/ |
|
812
|
812
|
public function ajax_get_selected_product_data() { |
|
813
|
|
- check_ajax_referer( 'wc-stripe-get-selected-product-data', 'security' ); |
|
|
813
|
+ check_ajax_referer('wc-stripe-get-selected-product-data', 'security'); |
|
814
|
814
|
|
|
815
|
815
|
try { |
|
816
|
|
- $product_id = absint( $_POST['product_id'] ); |
|
817
|
|
- $qty = ! isset( $_POST['qty'] ) ? 1 : apply_filters( 'woocommerce_add_to_cart_quantity', absint( $_POST['qty'] ), $product_id ); |
|
818
|
|
- $product = wc_get_product( $product_id ); |
|
|
816
|
+ $product_id = absint($_POST['product_id']); |
|
|
817
|
+ $qty = ! isset($_POST['qty']) ? 1 : apply_filters('woocommerce_add_to_cart_quantity', absint($_POST['qty']), $product_id); |
|
|
818
|
+ $product = wc_get_product($product_id); |
|
819
|
819
|
$variation_id = null; |
|
820
|
820
|
|
|
821
|
|
- if ( ! is_a( $product, 'WC_Product' ) ) { |
|
822
|
|
- throw new Exception( sprintf( __( 'Product with the ID (%d) cannot be found.', 'woocommerce-gateway-stripe' ), $product_id ) ); |
|
|
821
|
+ if ( ! is_a($product, 'WC_Product')) { |
|
|
822
|
+ throw new Exception(sprintf(__('Product with the ID (%d) cannot be found.', 'woocommerce-gateway-stripe'), $product_id)); |
|
823
|
823
|
} |
|
824
|
824
|
|
|
825
|
|
- if ( 'variable' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type() ) && isset( $_POST['attributes'] ) ) { |
|
826
|
|
- $attributes = array_map( 'wc_clean', $_POST['attributes'] ); |
|
|
825
|
+ if ('variable' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type()) && isset($_POST['attributes'])) { |
|
|
826
|
+ $attributes = array_map('wc_clean', $_POST['attributes']); |
|
827
|
827
|
|
|
828
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
829
|
|
- $variation_id = $product->get_matching_variation( $attributes ); |
|
|
828
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
829
|
+ $variation_id = $product->get_matching_variation($attributes); |
|
830
|
830
|
} else { |
|
831
|
|
- $data_store = WC_Data_Store::load( 'product' ); |
|
832
|
|
- $variation_id = $data_store->find_matching_product_variation( $product, $attributes ); |
|
|
831
|
+ $data_store = WC_Data_Store::load('product'); |
|
|
832
|
+ $variation_id = $data_store->find_matching_product_variation($product, $attributes); |
|
833
|
833
|
} |
|
834
|
834
|
|
|
835
|
|
- if ( ! empty( $variation_id ) ) { |
|
836
|
|
- $product = wc_get_product( $variation_id ); |
|
|
835
|
+ if ( ! empty($variation_id)) { |
|
|
836
|
+ $product = wc_get_product($variation_id); |
|
837
|
837
|
} |
|
838
|
|
- } elseif ( 'simple' === ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type() ) ) { |
|
839
|
|
- $product = wc_get_product( $product_id ); |
|
|
838
|
+ } elseif ('simple' === (WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type())) { |
|
|
839
|
+ $product = wc_get_product($product_id); |
|
840
|
840
|
} |
|
841
|
841
|
|
|
842
|
842
|
// Force quantity to 1 if sold individually and check for existing item in cart. |
|
843
|
|
- if ( $product->is_sold_individually() ) { |
|
844
|
|
- $qty = apply_filters( 'wc_stripe_payment_request_add_to_cart_sold_individually_quantity', 1, $qty, $product_id, $variation_id ); |
|
|
843
|
+ if ($product->is_sold_individually()) { |
|
|
844
|
+ $qty = apply_filters('wc_stripe_payment_request_add_to_cart_sold_individually_quantity', 1, $qty, $product_id, $variation_id); |
|
845
|
845
|
} |
|
846
|
846
|
|
|
847
|
|
- if ( ! $product->has_enough_stock( $qty ) ) { |
|
|
847
|
+ if ( ! $product->has_enough_stock($qty)) { |
|
848
|
848
|
/* translators: 1: product name 2: quantity in stock */ |
|
849
|
|
- throw new Exception( sprintf( __( 'You cannot add that amount of "%1$s"; to the cart because there is not enough stock (%2$s remaining).', 'woocommerce-gateway-stripe' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity(), $product ) ) ); |
|
|
849
|
+ throw new Exception(sprintf(__('You cannot add that amount of "%1$s"; to the cart because there is not enough stock (%2$s remaining).', 'woocommerce-gateway-stripe'), $product->get_name(), wc_format_stock_quantity_for_display($product->get_stock_quantity(), $product))); |
|
850
|
850
|
} |
|
851
|
851
|
|
|
852
|
|
- $total = $qty * ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->price : $product->get_price() ); |
|
|
852
|
+ $total = $qty * (WC_Stripe_Helper::is_wc_lt('3.0') ? $product->price : $product->get_price()); |
|
853
|
853
|
|
|
854
|
854
|
$quantity_label = 1 < $qty ? ' (x' . $qty . ')' : ''; |
|
855
|
855
|
|
|
@@ -857,28 +857,28 @@ discard block |
|
|
block discarded – undo |
|
857
|
857
|
$items = array(); |
|
858
|
858
|
|
|
859
|
859
|
$items[] = array( |
|
860
|
|
- 'label' => ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->name : $product->get_name() ) . $quantity_label, |
|
861
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $total ), |
|
|
860
|
+ 'label' => (WC_Stripe_Helper::is_wc_lt('3.0') ? $product->name : $product->get_name()) . $quantity_label, |
|
|
861
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($total), |
|
862
|
862
|
); |
|
863
|
863
|
|
|
864
|
|
- if ( wc_tax_enabled() ) { |
|
|
864
|
+ if (wc_tax_enabled()) { |
|
865
|
865
|
$items[] = array( |
|
866
|
|
- 'label' => __( 'Tax', 'woocommerce-gateway-stripe' ), |
|
|
866
|
+ 'label' => __('Tax', 'woocommerce-gateway-stripe'), |
|
867
|
867
|
'amount' => 0, |
|
868
|
868
|
'pending' => true, |
|
869
|
869
|
); |
|
870
|
870
|
} |
|
871
|
871
|
|
|
872
|
|
- if ( wc_shipping_enabled() && $product->needs_shipping() ) { |
|
|
872
|
+ if (wc_shipping_enabled() && $product->needs_shipping()) { |
|
873
|
873
|
$items[] = array( |
|
874
|
|
- 'label' => __( 'Shipping', 'woocommerce-gateway-stripe' ), |
|
|
874
|
+ 'label' => __('Shipping', 'woocommerce-gateway-stripe'), |
|
875
|
875
|
'amount' => 0, |
|
876
|
876
|
'pending' => true, |
|
877
|
877
|
); |
|
878
|
878
|
|
|
879
|
879
|
$data['shippingOptions'] = array( |
|
880
|
880
|
'id' => 'pending', |
|
881
|
|
- 'label' => __( 'Pending', 'woocommerce-gateway-stripe' ), |
|
|
881
|
+ 'label' => __('Pending', 'woocommerce-gateway-stripe'), |
|
882
|
882
|
'detail' => '', |
|
883
|
883
|
'amount' => 0, |
|
884
|
884
|
); |
|
@@ -887,17 +887,17 @@ discard block |
|
|
block discarded – undo |
|
887
|
887
|
$data['displayItems'] = $items; |
|
888
|
888
|
$data['total'] = array( |
|
889
|
889
|
'label' => $this->total_label, |
|
890
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $total ), |
|
|
890
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($total), |
|
891
|
891
|
'pending' => true, |
|
892
|
892
|
); |
|
893
|
893
|
|
|
894
|
|
- $data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() ); |
|
895
|
|
- $data['currency'] = strtolower( get_woocommerce_currency() ); |
|
896
|
|
- $data['country_code'] = substr( get_option( 'woocommerce_default_country' ), 0, 2 ); |
|
|
894
|
+ $data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping()); |
|
|
895
|
+ $data['currency'] = strtolower(get_woocommerce_currency()); |
|
|
896
|
+ $data['country_code'] = substr(get_option('woocommerce_default_country'), 0, 2); |
|
897
|
897
|
|
|
898
|
|
- wp_send_json( $data ); |
|
899
|
|
- } catch ( Exception $e ) { |
|
900
|
|
- wp_send_json( array( 'error' => wp_strip_all_tags( $e->getMessage() ) ) ); |
|
|
898
|
+ wp_send_json($data); |
|
|
899
|
+ } catch (Exception $e) { |
|
|
900
|
+ wp_send_json(array('error' => wp_strip_all_tags($e->getMessage()))); |
|
901
|
901
|
} |
|
902
|
902
|
} |
|
903
|
903
|
|
|
@@ -909,37 +909,37 @@ discard block |
|
|
block discarded – undo |
|
909
|
909
|
* @return array $data |
|
910
|
910
|
*/ |
|
911
|
911
|
public function ajax_add_to_cart() { |
|
912
|
|
- check_ajax_referer( 'wc-stripe-add-to-cart', 'security' ); |
|
|
912
|
+ check_ajax_referer('wc-stripe-add-to-cart', 'security'); |
|
913
|
913
|
|
|
914
|
|
- if ( ! defined( 'WOOCOMMERCE_CART' ) ) { |
|
915
|
|
- define( 'WOOCOMMERCE_CART', true ); |
|
|
914
|
+ if ( ! defined('WOOCOMMERCE_CART')) { |
|
|
915
|
+ define('WOOCOMMERCE_CART', true); |
|
916
|
916
|
} |
|
917
|
917
|
|
|
918
|
918
|
WC()->shipping->reset_shipping(); |
|
919
|
919
|
|
|
920
|
|
- $product_id = absint( $_POST['product_id'] ); |
|
921
|
|
- $qty = ! isset( $_POST['qty'] ) ? 1 : absint( $_POST['qty'] ); |
|
922
|
|
- $product = wc_get_product( $product_id ); |
|
923
|
|
- $product_type = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $product->product_type : $product->get_type(); |
|
|
920
|
+ $product_id = absint($_POST['product_id']); |
|
|
921
|
+ $qty = ! isset($_POST['qty']) ? 1 : absint($_POST['qty']); |
|
|
922
|
+ $product = wc_get_product($product_id); |
|
|
923
|
+ $product_type = WC_Stripe_Helper::is_wc_lt('3.0') ? $product->product_type : $product->get_type(); |
|
924
|
924
|
|
|
925
|
925
|
// First empty the cart to prevent wrong calculation. |
|
926
|
926
|
WC()->cart->empty_cart(); |
|
927
|
927
|
|
|
928
|
|
- if ( ( 'variable' === $product_type || 'variable-subscription' === $product_type ) && isset( $_POST['attributes'] ) ) { |
|
929
|
|
- $attributes = array_map( 'wc_clean', $_POST['attributes'] ); |
|
|
928
|
+ if (('variable' === $product_type || 'variable-subscription' === $product_type) && isset($_POST['attributes'])) { |
|
|
929
|
+ $attributes = array_map('wc_clean', $_POST['attributes']); |
|
930
|
930
|
|
|
931
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
932
|
|
- $variation_id = $product->get_matching_variation( $attributes ); |
|
|
931
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
932
|
+ $variation_id = $product->get_matching_variation($attributes); |
|
933
|
933
|
} else { |
|
934
|
|
- $data_store = WC_Data_Store::load( 'product' ); |
|
935
|
|
- $variation_id = $data_store->find_matching_product_variation( $product, $attributes ); |
|
|
934
|
+ $data_store = WC_Data_Store::load('product'); |
|
|
935
|
+ $variation_id = $data_store->find_matching_product_variation($product, $attributes); |
|
936
|
936
|
} |
|
937
|
937
|
|
|
938
|
|
- WC()->cart->add_to_cart( $product->get_id(), $qty, $variation_id, $attributes ); |
|
|
938
|
+ WC()->cart->add_to_cart($product->get_id(), $qty, $variation_id, $attributes); |
|
939
|
939
|
} |
|
940
|
940
|
|
|
941
|
|
- if ( 'simple' === $product_type || 'subscription' === $product_type ) { |
|
942
|
|
- WC()->cart->add_to_cart( $product->get_id(), $qty ); |
|
|
941
|
+ if ('simple' === $product_type || 'subscription' === $product_type) { |
|
|
942
|
+ WC()->cart->add_to_cart($product->get_id(), $qty); |
|
943
|
943
|
} |
|
944
|
944
|
|
|
945
|
945
|
WC()->cart->calculate_totals(); |
|
@@ -948,7 +948,7 @@ discard block |
|
|
block discarded – undo |
|
948
|
948
|
$data += $this->build_display_items(); |
|
949
|
949
|
$data['result'] = 'success'; |
|
950
|
950
|
|
|
951
|
|
- wp_send_json( $data ); |
|
|
951
|
+ wp_send_json($data); |
|
952
|
952
|
} |
|
953
|
953
|
|
|
954
|
954
|
/** |
|
@@ -961,31 +961,31 @@ discard block |
|
|
block discarded – undo |
|
961
|
961
|
* @version 4.0.0 |
|
962
|
962
|
*/ |
|
963
|
963
|
public function normalize_state() { |
|
964
|
|
- $billing_country = ! empty( $_POST['billing_country'] ) ? wc_clean( $_POST['billing_country'] ) : ''; |
|
965
|
|
- $shipping_country = ! empty( $_POST['shipping_country'] ) ? wc_clean( $_POST['shipping_country'] ) : ''; |
|
966
|
|
- $billing_state = ! empty( $_POST['billing_state'] ) ? wc_clean( $_POST['billing_state'] ) : ''; |
|
967
|
|
- $shipping_state = ! empty( $_POST['shipping_state'] ) ? wc_clean( $_POST['shipping_state'] ) : ''; |
|
|
964
|
+ $billing_country = ! empty($_POST['billing_country']) ? wc_clean($_POST['billing_country']) : ''; |
|
|
965
|
+ $shipping_country = ! empty($_POST['shipping_country']) ? wc_clean($_POST['shipping_country']) : ''; |
|
|
966
|
+ $billing_state = ! empty($_POST['billing_state']) ? wc_clean($_POST['billing_state']) : ''; |
|
|
967
|
+ $shipping_state = ! empty($_POST['shipping_state']) ? wc_clean($_POST['shipping_state']) : ''; |
|
968
|
968
|
|
|
969
|
|
- if ( $billing_state && $billing_country ) { |
|
970
|
|
- $valid_states = WC()->countries->get_states( $billing_country ); |
|
|
969
|
+ if ($billing_state && $billing_country) { |
|
|
970
|
+ $valid_states = WC()->countries->get_states($billing_country); |
|
971
|
971
|
|
|
972
|
972
|
// Valid states found for country. |
|
973
|
|
- if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) { |
|
974
|
|
- foreach ( $valid_states as $state_abbr => $state ) { |
|
975
|
|
- if ( preg_match( '/' . preg_quote( $state ) . '/i', $billing_state ) ) { |
|
|
973
|
+ if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) { |
|
|
974
|
+ foreach ($valid_states as $state_abbr => $state) { |
|
|
975
|
+ if (preg_match('/' . preg_quote($state) . '/i', $billing_state)) { |
|
976
|
976
|
$_POST['billing_state'] = $state_abbr; |
|
977
|
977
|
} |
|
978
|
978
|
} |
|
979
|
979
|
} |
|
980
|
980
|
} |
|
981
|
981
|
|
|
982
|
|
- if ( $shipping_state && $shipping_country ) { |
|
983
|
|
- $valid_states = WC()->countries->get_states( $shipping_country ); |
|
|
982
|
+ if ($shipping_state && $shipping_country) { |
|
|
983
|
+ $valid_states = WC()->countries->get_states($shipping_country); |
|
984
|
984
|
|
|
985
|
985
|
// Valid states found for country. |
|
986
|
|
- if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) { |
|
987
|
|
- foreach ( $valid_states as $state_abbr => $state ) { |
|
988
|
|
- if ( preg_match( '/' . preg_quote( $state ) . '/i', $shipping_state ) ) { |
|
|
986
|
+ if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) { |
|
|
987
|
+ foreach ($valid_states as $state_abbr => $state) { |
|
|
988
|
+ if (preg_match('/' . preg_quote($state) . '/i', $shipping_state)) { |
|
989
|
989
|
$_POST['shipping_state'] = $state_abbr; |
|
990
|
990
|
} |
|
991
|
991
|
} |
|
@@ -1000,19 +1000,19 @@ discard block |
|
|
block discarded – undo |
|
1000
|
1000
|
* @version 4.0.0 |
|
1001
|
1001
|
*/ |
|
1002
|
1002
|
public function ajax_create_order() { |
|
1003
|
|
- if ( WC()->cart->is_empty() ) { |
|
1004
|
|
- wp_send_json_error( __( 'Empty cart', 'woocommerce-gateway-stripe' ) ); |
|
|
1003
|
+ if (WC()->cart->is_empty()) { |
|
|
1004
|
+ wp_send_json_error(__('Empty cart', 'woocommerce-gateway-stripe')); |
|
1005
|
1005
|
} |
|
1006
|
1006
|
|
|
1007
|
|
- if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { |
|
1008
|
|
- define( 'WOOCOMMERCE_CHECKOUT', true ); |
|
|
1007
|
+ if ( ! defined('WOOCOMMERCE_CHECKOUT')) { |
|
|
1008
|
+ define('WOOCOMMERCE_CHECKOUT', true); |
|
1009
|
1009
|
} |
|
1010
|
1010
|
|
|
1011
|
1011
|
$this->normalize_state(); |
|
1012
|
1012
|
|
|
1013
|
1013
|
WC()->checkout()->process_checkout(); |
|
1014
|
1014
|
|
|
1015
|
|
- die( 0 ); |
|
|
1015
|
+ die(0); |
|
1016
|
1016
|
} |
|
1017
|
1017
|
|
|
1018
|
1018
|
/** |
|
@@ -1022,41 +1022,41 @@ discard block |
|
|
block discarded – undo |
|
1022
|
1022
|
* @version 4.0.0 |
|
1023
|
1023
|
* @param array $address |
|
1024
|
1024
|
*/ |
|
1025
|
|
- protected function calculate_shipping( $address = array() ) { |
|
|
1025
|
+ protected function calculate_shipping($address = array()) { |
|
1026
|
1026
|
$country = $address['country']; |
|
1027
|
1027
|
$state = $address['state']; |
|
1028
|
1028
|
$postcode = $address['postcode']; |
|
1029
|
1029
|
$city = $address['city']; |
|
1030
|
1030
|
$address_1 = $address['address']; |
|
1031
|
1031
|
$address_2 = $address['address_2']; |
|
1032
|
|
- $wc_states = WC()->countries->get_states( $country ); |
|
|
1032
|
+ $wc_states = WC()->countries->get_states($country); |
|
1033
|
1033
|
|
|
1034
|
1034
|
/** |
|
1035
|
1035
|
* In some versions of Chrome, state can be a full name. So we need |
|
1036
|
1036
|
* to convert that to abbreviation as WC is expecting that. |
|
1037
|
1037
|
*/ |
|
1038
|
|
- if ( 2 < strlen( $state ) && ! empty( $wc_states ) ) { |
|
1039
|
|
- $state = array_search( ucwords( strtolower( $state ) ), $wc_states, true ); |
|
|
1038
|
+ if (2 < strlen($state) && ! empty($wc_states)) { |
|
|
1039
|
+ $state = array_search(ucwords(strtolower($state)), $wc_states, true); |
|
1040
|
1040
|
} |
|
1041
|
1041
|
|
|
1042
|
1042
|
WC()->shipping->reset_shipping(); |
|
1043
|
1043
|
|
|
1044
|
|
- if ( $postcode && WC_Validation::is_postcode( $postcode, $country ) ) { |
|
1045
|
|
- $postcode = wc_format_postcode( $postcode, $country ); |
|
|
1044
|
+ if ($postcode && WC_Validation::is_postcode($postcode, $country)) { |
|
|
1045
|
+ $postcode = wc_format_postcode($postcode, $country); |
|
1046
|
1046
|
} |
|
1047
|
1047
|
|
|
1048
|
|
- if ( $country ) { |
|
1049
|
|
- WC()->customer->set_location( $country, $state, $postcode, $city ); |
|
1050
|
|
- WC()->customer->set_shipping_location( $country, $state, $postcode, $city ); |
|
|
1048
|
+ if ($country) { |
|
|
1049
|
+ WC()->customer->set_location($country, $state, $postcode, $city); |
|
|
1050
|
+ WC()->customer->set_shipping_location($country, $state, $postcode, $city); |
|
1051
|
1051
|
} else { |
|
1052
|
|
- WC_Stripe_Helper::is_wc_lt( '3.0' ) ? WC()->customer->set_to_base() : WC()->customer->set_billing_address_to_base(); |
|
1053
|
|
- WC_Stripe_Helper::is_wc_lt( '3.0' ) ? WC()->customer->set_shipping_to_base() : WC()->customer->set_shipping_address_to_base(); |
|
|
1052
|
+ WC_Stripe_Helper::is_wc_lt('3.0') ? WC()->customer->set_to_base() : WC()->customer->set_billing_address_to_base(); |
|
|
1053
|
+ WC_Stripe_Helper::is_wc_lt('3.0') ? WC()->customer->set_shipping_to_base() : WC()->customer->set_shipping_address_to_base(); |
|
1054
|
1054
|
} |
|
1055
|
1055
|
|
|
1056
|
|
- if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) { |
|
1057
|
|
- WC()->customer->calculated_shipping( true ); |
|
|
1056
|
+ if (WC_Stripe_Helper::is_wc_lt('3.0')) { |
|
|
1057
|
+ WC()->customer->calculated_shipping(true); |
|
1058
|
1058
|
} else { |
|
1059
|
|
- WC()->customer->set_calculated_shipping( true ); |
|
|
1059
|
+ WC()->customer->set_calculated_shipping(true); |
|
1060
|
1060
|
WC()->customer->save(); |
|
1061
|
1061
|
} |
|
1062
|
1062
|
|
|
@@ -1073,17 +1073,17 @@ discard block |
|
|
block discarded – undo |
|
1073
|
1073
|
$packages[0]['destination']['address'] = $address_1; |
|
1074
|
1074
|
$packages[0]['destination']['address_2'] = $address_2; |
|
1075
|
1075
|
|
|
1076
|
|
- foreach ( WC()->cart->get_cart() as $item ) { |
|
1077
|
|
- if ( $item['data']->needs_shipping() ) { |
|
1078
|
|
- if ( isset( $item['line_total'] ) ) { |
|
|
1076
|
+ foreach (WC()->cart->get_cart() as $item) { |
|
|
1077
|
+ if ($item['data']->needs_shipping()) { |
|
|
1078
|
+ if (isset($item['line_total'])) { |
|
1079
|
1079
|
$packages[0]['contents_cost'] += $item['line_total']; |
|
1080
|
1080
|
} |
|
1081
|
1081
|
} |
|
1082
|
1082
|
} |
|
1083
|
1083
|
|
|
1084
|
|
- $packages = apply_filters( 'woocommerce_cart_shipping_packages', $packages ); |
|
|
1084
|
+ $packages = apply_filters('woocommerce_cart_shipping_packages', $packages); |
|
1085
|
1085
|
|
|
1086
|
|
- WC()->shipping->calculate_shipping( $packages ); |
|
|
1086
|
+ WC()->shipping->calculate_shipping($packages); |
|
1087
|
1087
|
} |
|
1088
|
1088
|
|
|
1089
|
1089
|
/** |
|
@@ -1092,19 +1092,19 @@ discard block |
|
|
block discarded – undo |
|
1092
|
1092
|
* @since 3.1.0 |
|
1093
|
1093
|
* @version 4.0.0 |
|
1094
|
1094
|
*/ |
|
1095
|
|
- protected function build_shipping_methods( $shipping_methods ) { |
|
1096
|
|
- if ( empty( $shipping_methods ) ) { |
|
|
1095
|
+ protected function build_shipping_methods($shipping_methods) { |
|
|
1096
|
+ if (empty($shipping_methods)) { |
|
1097
|
1097
|
return array(); |
|
1098
|
1098
|
} |
|
1099
|
1099
|
|
|
1100
|
1100
|
$shipping = array(); |
|
1101
|
1101
|
|
|
1102
|
|
- foreach ( $shipping_methods as $method ) { |
|
|
1102
|
+ foreach ($shipping_methods as $method) { |
|
1103
|
1103
|
$shipping[] = array( |
|
1104
|
1104
|
'id' => $method['id'], |
|
1105
|
1105
|
'label' => $method['label'], |
|
1106
|
1106
|
'detail' => '', |
|
1107
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $method['amount']['value'] ), |
|
|
1107
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($method['amount']['value']), |
|
1108
|
1108
|
); |
|
1109
|
1109
|
} |
|
1110
|
1110
|
|
|
@@ -1118,8 +1118,8 @@ discard block |
|
|
block discarded – undo |
|
1118
|
1118
|
* @version 4.0.0 |
|
1119
|
1119
|
*/ |
|
1120
|
1120
|
protected function build_display_items() { |
|
1121
|
|
- if ( ! defined( 'WOOCOMMERCE_CART' ) ) { |
|
1122
|
|
- define( 'WOOCOMMERCE_CART', true ); |
|
|
1121
|
+ if ( ! defined('WOOCOMMERCE_CART')) { |
|
|
1122
|
+ define('WOOCOMMERCE_CART', true); |
|
1123
|
1123
|
} |
|
1124
|
1124
|
|
|
1125
|
1125
|
$items = array(); |
|
@@ -1127,71 +1127,71 @@ discard block |
|
|
block discarded – undo |
|
1127
|
1127
|
$discounts = 0; |
|
1128
|
1128
|
|
|
1129
|
1129
|
// Default show only subtotal instead of itemization. |
|
1130
|
|
- if ( ! apply_filters( 'wc_stripe_payment_request_hide_itemization', true ) ) { |
|
1131
|
|
- foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) { |
|
|
1130
|
+ if ( ! apply_filters('wc_stripe_payment_request_hide_itemization', true)) { |
|
|
1131
|
+ foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) { |
|
1132
|
1132
|
$amount = $cart_item['line_subtotal']; |
|
1133
|
1133
|
$subtotal += $cart_item['line_subtotal']; |
|
1134
|
1134
|
$quantity_label = 1 < $cart_item['quantity'] ? ' (x' . $cart_item['quantity'] . ')' : ''; |
|
1135
|
1135
|
|
|
1136
|
|
- $product_name = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $cart_item['data']->post->post_title : $cart_item['data']->get_name(); |
|
|
1136
|
+ $product_name = WC_Stripe_Helper::is_wc_lt('3.0') ? $cart_item['data']->post->post_title : $cart_item['data']->get_name(); |
|
1137
|
1137
|
|
|
1138
|
1138
|
$item = array( |
|
1139
|
1139
|
'label' => $product_name . $quantity_label, |
|
1140
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $amount ), |
|
|
1140
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($amount), |
|
1141
|
1141
|
); |
|
1142
|
1142
|
|
|
1143
|
1143
|
$items[] = $item; |
|
1144
|
1144
|
} |
|
1145
|
1145
|
} |
|
1146
|
1146
|
|
|
1147
|
|
- if ( version_compare( WC_VERSION, '3.2', '<' ) ) { |
|
1148
|
|
- $discounts = wc_format_decimal( WC()->cart->get_cart_discount_total(), WC()->cart->dp ); |
|
|
1147
|
+ if (version_compare(WC_VERSION, '3.2', '<')) { |
|
|
1148
|
+ $discounts = wc_format_decimal(WC()->cart->get_cart_discount_total(), WC()->cart->dp); |
|
1149
|
1149
|
} else { |
|
1150
|
|
- $applied_coupons = array_values( WC()->cart->get_coupon_discount_totals() ); |
|
|
1150
|
+ $applied_coupons = array_values(WC()->cart->get_coupon_discount_totals()); |
|
1151
|
1151
|
|
|
1152
|
|
- foreach ( $applied_coupons as $amount ) { |
|
|
1152
|
+ foreach ($applied_coupons as $amount) { |
|
1153
|
1153
|
$discounts += (float) $amount; |
|
1154
|
1154
|
} |
|
1155
|
1155
|
} |
|
1156
|
1156
|
|
|
1157
|
|
- $discounts = wc_format_decimal( $discounts, WC()->cart->dp ); |
|
1158
|
|
- $tax = wc_format_decimal( WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp ); |
|
1159
|
|
- $shipping = wc_format_decimal( WC()->cart->shipping_total, WC()->cart->dp ); |
|
1160
|
|
- $items_total = wc_format_decimal( WC()->cart->cart_contents_total, WC()->cart->dp ) + $discounts; |
|
1161
|
|
- $order_total = version_compare( WC_VERSION, '3.2', '<' ) ? wc_format_decimal( $items_total + $tax + $shipping - $discounts, WC()->cart->dp ) : WC()->cart->get_total( false ); |
|
|
1157
|
+ $discounts = wc_format_decimal($discounts, WC()->cart->dp); |
|
|
1158
|
+ $tax = wc_format_decimal(WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp); |
|
|
1159
|
+ $shipping = wc_format_decimal(WC()->cart->shipping_total, WC()->cart->dp); |
|
|
1160
|
+ $items_total = wc_format_decimal(WC()->cart->cart_contents_total, WC()->cart->dp) + $discounts; |
|
|
1161
|
+ $order_total = version_compare(WC_VERSION, '3.2', '<') ? wc_format_decimal($items_total + $tax + $shipping - $discounts, WC()->cart->dp) : WC()->cart->get_total(false); |
|
1162
|
1162
|
|
|
1163
|
|
- if ( wc_tax_enabled() ) { |
|
|
1163
|
+ if (wc_tax_enabled()) { |
|
1164
|
1164
|
$items[] = array( |
|
1165
|
|
- 'label' => esc_html( __( 'Tax', 'woocommerce-gateway-stripe' ) ), |
|
1166
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $tax ), |
|
|
1165
|
+ 'label' => esc_html(__('Tax', 'woocommerce-gateway-stripe')), |
|
|
1166
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($tax), |
|
1167
|
1167
|
); |
|
1168
|
1168
|
} |
|
1169
|
1169
|
|
|
1170
|
|
- if ( WC()->cart->needs_shipping() ) { |
|
|
1170
|
+ if (WC()->cart->needs_shipping()) { |
|
1171
|
1171
|
$items[] = array( |
|
1172
|
|
- 'label' => esc_html( __( 'Shipping', 'woocommerce-gateway-stripe' ) ), |
|
1173
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $shipping ), |
|
|
1172
|
+ 'label' => esc_html(__('Shipping', 'woocommerce-gateway-stripe')), |
|
|
1173
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($shipping), |
|
1174
|
1174
|
); |
|
1175
|
1175
|
} |
|
1176
|
1176
|
|
|
1177
|
|
- if ( WC()->cart->has_discount() ) { |
|
|
1177
|
+ if (WC()->cart->has_discount()) { |
|
1178
|
1178
|
$items[] = array( |
|
1179
|
|
- 'label' => esc_html( __( 'Discount', 'woocommerce-gateway-stripe' ) ), |
|
1180
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $discounts ), |
|
|
1179
|
+ 'label' => esc_html(__('Discount', 'woocommerce-gateway-stripe')), |
|
|
1180
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($discounts), |
|
1181
|
1181
|
); |
|
1182
|
1182
|
} |
|
1183
|
1183
|
|
|
1184
|
|
- if ( version_compare( WC_VERSION, '3.2', '<' ) ) { |
|
|
1184
|
+ if (version_compare(WC_VERSION, '3.2', '<')) { |
|
1185
|
1185
|
$cart_fees = WC()->cart->fees; |
|
1186
|
1186
|
} else { |
|
1187
|
1187
|
$cart_fees = WC()->cart->get_fees(); |
|
1188
|
1188
|
} |
|
1189
|
1189
|
|
|
1190
|
1190
|
// Include fees and taxes as display items. |
|
1191
|
|
- foreach ( $cart_fees as $key => $fee ) { |
|
|
1191
|
+ foreach ($cart_fees as $key => $fee) { |
|
1192
|
1192
|
$items[] = array( |
|
1193
|
1193
|
'label' => $fee->name, |
|
1194
|
|
- 'amount' => WC_Stripe_Helper::get_stripe_amount( $fee->amount ), |
|
|
1194
|
+ 'amount' => WC_Stripe_Helper::get_stripe_amount($fee->amount), |
|
1195
|
1195
|
); |
|
1196
|
1196
|
} |
|
1197
|
1197
|
|
|
@@ -1199,7 +1199,7 @@ discard block |
|
|
block discarded – undo |
|
1199
|
1199
|
'displayItems' => $items, |
|
1200
|
1200
|
'total' => array( |
|
1201
|
1201
|
'label' => $this->total_label, |
|
1202
|
|
- 'amount' => max( 0, apply_filters( 'woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount( $order_total ), $order_total, WC()->cart ) ), |
|
|
1202
|
+ 'amount' => max(0, apply_filters('woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount($order_total), $order_total, WC()->cart)), |
|
1203
|
1203
|
'pending' => false, |
|
1204
|
1204
|
), |
|
1205
|
1205
|
); |