|
@@ -17,9 +17,9 @@ discard block |
|
|
block discarded – undo |
|
17
|
17
|
* License: GNU General Public License v3.0 |
|
18
|
18
|
* License URI: http://www.gnu.org/licenses/gpl-3.0.html |
|
19
|
19
|
*/ |
|
20
|
|
-if ( ! defined('ABSPATH') ) exit; // Exit if accessed directly. |
|
|
20
|
+if (!defined('ABSPATH')) exit; // Exit if accessed directly. |
|
21
|
21
|
|
|
22
|
|
-if ( ! class_exists( 'WCSATT_STT' ) ) { |
|
|
22
|
+if (!class_exists('WCSATT_STT')) { |
|
23
|
23
|
class WCSATT_STT { |
|
24
|
24
|
|
|
25
|
25
|
/* Plugin version. */ |
|
@@ -52,7 +52,7 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
* @since 1.0.0 |
|
53
|
53
|
*/ |
|
54
|
54
|
public static function instance() { |
|
55
|
|
- if ( is_null( self::$_instance ) ) { |
|
|
55
|
+ if (is_null(self::$_instance)) { |
|
56
|
56
|
self::$_instance = new self(); |
|
57
|
57
|
} |
|
58
|
58
|
return self::$_instance; |
|
@@ -64,7 +64,7 @@ discard block |
|
|
block discarded – undo |
|
64
|
64
|
* @since 1.0.0 |
|
65
|
65
|
*/ |
|
66
|
66
|
public function __clone() { |
|
67
|
|
- _doing_it_wrong( __FUNCTION__, __( 'Foul!' ), '1.0.0' ); |
|
|
67
|
+ _doing_it_wrong(__FUNCTION__, __('Foul!'), '1.0.0'); |
|
68
|
68
|
} |
|
69
|
69
|
|
|
70
|
70
|
/** |
|
@@ -73,21 +73,21 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
* @since 1.0.0 |
|
74
|
74
|
*/ |
|
75
|
75
|
public function __wakeup() { |
|
76
|
|
- _doing_it_wrong( __FUNCTION__, __( 'Foul!' ), '1.0.0' ); |
|
|
76
|
+ _doing_it_wrong(__FUNCTION__, __('Foul!'), '1.0.0'); |
|
77
|
77
|
} |
|
78
|
78
|
|
|
79
|
79
|
/** |
|
80
|
80
|
* Load the plugin. |
|
81
|
81
|
*/ |
|
82
|
82
|
public function __construct() { |
|
83
|
|
- add_action( 'plugins_loaded', array( $this, 'load_plugin' ) ); |
|
84
|
|
- add_action( 'init', array( $this, 'init_plugin' ) ); |
|
85
|
|
- add_action( 'admin_init', array( $this, 'admin_wcsatt_stt_product_meta' ) ); |
|
86
|
|
- add_filter( 'plugin_row_meta', array( $this, 'plugin_meta_links' ), 10, 4 ); |
|
|
83
|
+ add_action('plugins_loaded', array($this, 'load_plugin')); |
|
|
84
|
+ add_action('init', array($this, 'init_plugin')); |
|
|
85
|
+ add_action('admin_init', array($this, 'admin_wcsatt_stt_product_meta')); |
|
|
86
|
+ add_filter('plugin_row_meta', array($this, 'plugin_meta_links'), 10, 4); |
|
87
|
87
|
} |
|
88
|
88
|
|
|
89
|
89
|
public function plugin_path() { |
|
90
|
|
- return untrailingslashit( plugin_dir_path( __FILE__ ) ); |
|
|
90
|
+ return untrailingslashit(plugin_dir_path(__FILE__)); |
|
91
|
91
|
} // END plugin_path() |
|
92
|
92
|
|
|
93
|
93
|
/* |
|
@@ -97,14 +97,14 @@ discard block |
|
|
block discarded – undo |
|
97
|
97
|
global $woocommerce; |
|
98
|
98
|
|
|
99
|
99
|
// Check that the required WooCommerce is running. |
|
100
|
|
- if ( version_compare( $woocommerce->version, self::REQ_WC_VERSION, '<' ) ) { |
|
101
|
|
- add_action( 'admin_notices', array( $this, 'wcsatt_stt_wc_admin_notice' ) ); |
|
|
100
|
+ if (version_compare($woocommerce->version, self::REQ_WC_VERSION, '<')) { |
|
|
101
|
+ add_action('admin_notices', array($this, 'wcsatt_stt_wc_admin_notice')); |
|
102
|
102
|
return false; |
|
103
|
103
|
} |
|
104
|
104
|
|
|
105
|
105
|
// Checks that WooCommerce Subscribe All the Things is running or is less than the required version. |
|
106
|
|
- if ( ! class_exists( 'WCS_ATT' ) || version_compare( WCS_ATT::VERSION, self::REQ_WCSATT_VERSION, '<' ) ) { |
|
107
|
|
- add_action( 'admin_notices', array( $this, 'wcsatt_stt_admin_notice' ) ); |
|
|
106
|
+ if (!class_exists('WCS_ATT') || version_compare(WCS_ATT::VERSION, self::REQ_WCSATT_VERSION, '<')) { |
|
|
107
|
+ add_action('admin_notices', array($this, 'wcsatt_stt_admin_notice')); |
|
108
|
108
|
return false; |
|
109
|
109
|
} |
|
110
|
110
|
} // END load_plugin() |
|
@@ -115,7 +115,7 @@ discard block |
|
|
block discarded – undo |
|
115
|
115
|
* @return void |
|
116
|
116
|
*/ |
|
117
|
117
|
public function wcsatt_stt_wc_admin_notice() { |
|
118
|
|
- echo '<div class="error"><p>' . sprintf( __( '%1$s requires at least %2$s v%3$s in order to function. Please upgrade %2$s.', 'wc-satt-stt' ), 'Sign up and Trial Options Add-on for WCSATT', 'WooCommerce', self::REQ_WC_VERSION ) . '</p></div>'; |
|
|
118
|
+ echo '<div class="error"><p>'.sprintf(__('%1$s requires at least %2$s v%3$s in order to function. Please upgrade %2$s.', 'wc-satt-stt'), 'Sign up and Trial Options Add-on for WCSATT', 'WooCommerce', self::REQ_WC_VERSION).'</p></div>'; |
|
119
|
119
|
} // END wcsatt_stt_wc_admin_notice() |
|
120
|
120
|
|
|
121
|
121
|
/** |
|
@@ -124,7 +124,7 @@ discard block |
|
|
block discarded – undo |
|
124
|
124
|
* @return void |
|
125
|
125
|
*/ |
|
126
|
126
|
public function wcsatt_stt_admin_notice() { |
|
127
|
|
- echo '<div class="error"><p>' . sprintf( __( '%1$s requires at least %2$s v%3$s in order to function. Please upgrade %2$s.', 'wc-satt-stt' ), 'Sign up and Trial Options Add-on', 'WooCommerce Subscribe to All the Things', self::REQ_WCSATT_VERSION ) . '</p></div>'; |
|
|
127
|
+ echo '<div class="error"><p>'.sprintf(__('%1$s requires at least %2$s v%3$s in order to function. Please upgrade %2$s.', 'wc-satt-stt'), 'Sign up and Trial Options Add-on', 'WooCommerce Subscribe to All the Things', self::REQ_WCSATT_VERSION).'</p></div>'; |
|
128
|
128
|
} // END wcsatt_stt_admin_notice() |
|
129
|
129
|
|
|
130
|
130
|
/** |
|
@@ -134,28 +134,28 @@ discard block |
|
|
block discarded – undo |
|
134
|
134
|
*/ |
|
135
|
135
|
public function init_plugin() { |
|
136
|
136
|
// Load text domain. |
|
137
|
|
- load_plugin_textdomain( 'wc-satt-stt', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' ); |
|
|
137
|
+ load_plugin_textdomain('wc-satt-stt', false, dirname(plugin_basename(__FILE__)).'/languages/'); |
|
138
|
138
|
|
|
139
|
139
|
// Adds the sign up fee and trial data to the price html on the 'wcsatt_overridden_subscription_prices_product' filter. |
|
140
|
|
- add_filter( 'wcsatt_overridden_subscription_prices_product', array( $this, 'add_sub_scheme_data_price_html' ), 10, 3 ); |
|
|
140
|
+ add_filter('wcsatt_overridden_subscription_prices_product', array($this, 'add_sub_scheme_data_price_html'), 10, 3); |
|
141
|
141
|
|
|
142
|
142
|
// Adds the extra subscription scheme data to the product object on the 'wcsatt_converted_product_for_scheme_option' filter. |
|
143
|
|
- add_filter( 'wcsatt_converted_product_for_scheme_option', array( $this, 'sub_product_scheme_option' ), 10, 2 ); |
|
|
143
|
+ add_filter('wcsatt_converted_product_for_scheme_option', array($this, 'sub_product_scheme_option'), 10, 2); |
|
144
|
144
|
|
|
145
|
145
|
// Filters the price string to include the sign up fee and/or trial to pass per scheme option on the 'wcsatt_single_product_subscription_scheme_price_html' filter. |
|
146
|
|
- add_filter( 'wcsatt_single_product_subscription_scheme_price_html', array( $this, 'get_price_string' ), 10, 2 ); |
|
|
146
|
+ add_filter('wcsatt_single_product_subscription_scheme_price_html', array($this, 'get_price_string'), 10, 2); |
|
147
|
147
|
|
|
148
|
148
|
// Filters the lowest price string to include the sign up fee on the 'wcsatt_get_single_product_lowest_price_string' filter. |
|
149
|
|
- add_filter( 'wcsatt_get_single_product_lowest_price_string', array( $this, 'get_lowest_price_string' ), 10, 2 ); |
|
|
149
|
+ add_filter('wcsatt_get_single_product_lowest_price_string', array($this, 'get_lowest_price_string'), 10, 2); |
|
150
|
150
|
|
|
151
|
151
|
// Filters the lowest price subscription scheme data on the 'wcsatt_get_lowest_price_sub_scheme_data' filter. |
|
152
|
|
- add_filter( 'wcsatt_get_lowest_price_sub_scheme_data', array( $this, 'get_lowest_price_sub_scheme_data' ), 10, 2 ); |
|
|
152
|
+ add_filter('wcsatt_get_lowest_price_sub_scheme_data', array($this, 'get_lowest_price_sub_scheme_data'), 10, 2); |
|
153
|
153
|
|
|
154
|
154
|
// Adds the sign-up and/or trial data to the subscription scheme prices on the 'wcsatt_subscription_scheme_prices' filter. |
|
155
|
|
- add_filter( 'wcsatt_subscription_scheme_prices', array( $this, 'add_subscription_scheme_prices' ), 10, 2 ); |
|
|
155
|
+ add_filter('wcsatt_subscription_scheme_prices', array($this, 'add_subscription_scheme_prices'), 10, 2); |
|
156
|
156
|
|
|
157
|
157
|
// Overrides the price of the subscription for sign up fee and/or trial on the 'wcsatt_cart_item' filter. |
|
158
|
|
- add_filter( 'wcsatt_cart_item', array( $this, 'update_cart_item_sub_data' ), 10, 1 ); |
|
|
158
|
+ add_filter('wcsatt_cart_item', array($this, 'update_cart_item_sub_data'), 10, 1); |
|
159
|
159
|
} // END init_plugin() |
|
160
|
160
|
|
|
161
|
161
|
/** |
|
@@ -165,10 +165,10 @@ discard block |
|
|
block discarded – undo |
|
165
|
165
|
*/ |
|
166
|
166
|
public function admin_wcsatt_stt_product_meta() { |
|
167
|
167
|
// Subscription scheme options displayed on the 'wcsatt_subscription_scheme_product_content' action. |
|
168
|
|
- add_action( 'wcsatt_subscription_scheme_product_content', array( $this, 'wcsatt_stt_fields' ), 15, 3 ); |
|
|
168
|
+ add_action('wcsatt_subscription_scheme_product_content', array($this, 'wcsatt_stt_fields'), 15, 3); |
|
169
|
169
|
|
|
170
|
170
|
// Filter the subscription scheme data to process the sign up and trial options on the ''wcsatt_subscription_scheme_process_scheme_data' filter. |
|
171
|
|
- add_filter( 'wcsatt_subscription_scheme_process_scheme_data', array( $this, 'wcsatt_stt_process_scheme_data' ), 10, 2 ); |
|
|
171
|
+ add_filter('wcsatt_subscription_scheme_process_scheme_data', array($this, 'wcsatt_stt_process_scheme_data'), 10, 2); |
|
172
|
172
|
} // END admin_wcsatt_stt_product_meta() |
|
173
|
173
|
|
|
174
|
174
|
/** |
|
@@ -178,11 +178,11 @@ discard block |
|
|
block discarded – undo |
|
178
|
178
|
* @param mixed $file Plugin Base file |
|
179
|
179
|
* @return array |
|
180
|
180
|
*/ |
|
181
|
|
- public function plugin_meta_links( $links, $file, $data, $status ) { |
|
182
|
|
- if ( $file == plugin_basename( __FILE__ ) ) { |
|
183
|
|
- $author1 = '<a href="' . $data[ 'AuthorURI' ] . '">' . $data[ 'Author' ] . '</a>'; |
|
|
181
|
+ public function plugin_meta_links($links, $file, $data, $status) { |
|
|
182
|
+ if ($file == plugin_basename(__FILE__)) { |
|
|
183
|
+ $author1 = '<a href="'.$data['AuthorURI'].'">'.$data['Author'].'</a>'; |
|
184
|
184
|
$author2 = '<a href="http://www.subscriptiongroup.co.uk/">Subscription Group Limited</a>'; |
|
185
|
|
- $links[ 1 ] = sprintf( __( 'By %s', self::TEXT_DOMAIN ), sprintf( __( '%s and %s', self::TEXT_DOMAIN ), $author1, $author2 ) ); |
|
|
185
|
+ $links[1] = sprintf(__('By %s', self::TEXT_DOMAIN), sprintf(__('%s and %s', self::TEXT_DOMAIN), $author1, $author2)); |
|
186
|
186
|
} |
|
187
|
187
|
|
|
188
|
188
|
return $links; |
|
@@ -194,14 +194,14 @@ discard block |
|
|
block discarded – undo |
|
194
|
194
|
* @param array $defaults |
|
195
|
195
|
* @return void |
|
196
|
196
|
*/ |
|
197
|
|
- public static function add_default_subscription_schemes_content( $defaults ) { |
|
|
197
|
+ public static function add_default_subscription_schemes_content($defaults) { |
|
198
|
198
|
$new_defaults = array( |
|
199
|
199
|
'subscription_sign_up_fee' => '', |
|
200
|
200
|
'subscription_trial_length' => '', |
|
201
|
201
|
'subscription_trial_period' => '' |
|
202
|
202
|
); |
|
203
|
203
|
|
|
204
|
|
- return array_merge( $new_defaults, $defaults ); |
|
|
204
|
+ return array_merge($new_defaults, $defaults); |
|
205
|
205
|
} // END add_default_subscription_schemes_content() |
|
206
|
206
|
|
|
207
|
207
|
/** |
|
@@ -212,11 +212,11 @@ discard block |
|
|
block discarded – undo |
|
212
|
212
|
* @param int $post_id |
|
213
|
213
|
* @return void |
|
214
|
214
|
*/ |
|
215
|
|
- public function wcsatt_stt_fields( $index, $scheme_data, $post_id ) { |
|
216
|
|
- if ( ! empty( $scheme_data ) ) { |
|
217
|
|
- $subscription_sign_up_fee = ! empty( $scheme_data[ 'subscription_sign_up_fee' ] ) ? $scheme_data[ 'subscription_sign_up_fee' ] : ''; |
|
218
|
|
- $subscription_trial_length = isset( $scheme_data[ 'subscription_trial_length' ] ) ? $scheme_data[ 'subscription_trial_length' ] : 0; |
|
219
|
|
- $subscription_trial_period = isset( $scheme_data[ 'subscription_trial_period' ] ) ? $scheme_data[ 'subscription_trial_period' ] : ''; |
|
|
215
|
+ public function wcsatt_stt_fields($index, $scheme_data, $post_id) { |
|
|
216
|
+ if (!empty($scheme_data)) { |
|
|
217
|
+ $subscription_sign_up_fee = !empty($scheme_data['subscription_sign_up_fee']) ? $scheme_data['subscription_sign_up_fee'] : ''; |
|
|
218
|
+ $subscription_trial_length = isset($scheme_data['subscription_trial_length']) ? $scheme_data['subscription_trial_length'] : 0; |
|
|
219
|
+ $subscription_trial_period = isset($scheme_data['subscription_trial_period']) ? $scheme_data['subscription_trial_period'] : ''; |
|
220
|
220
|
} else { |
|
221
|
221
|
$subscription_sign_up_fee = ''; |
|
222
|
222
|
$subscription_trial_length = 0; |
|
@@ -224,45 +224,45 @@ discard block |
|
|
block discarded – undo |
|
224
|
224
|
} |
|
225
|
225
|
|
|
226
|
226
|
// Sign-up Fee |
|
227
|
|
- woocommerce_wp_text_input( array( |
|
|
227
|
+ woocommerce_wp_text_input(array( |
|
228
|
228
|
'id' => '_subscription_sign_up_fee', |
|
229
|
229
|
'class' => 'wc_input_subscription_intial_price', |
|
230
|
230
|
// translators: %s is a currency symbol / code |
|
231
|
|
- 'label' => sprintf( __( 'Sign-up Fee (%s)', WCSATT_STT::TEXT_DOMAIN ), get_woocommerce_currency_symbol() ), |
|
232
|
|
- 'placeholder' => _x( 'e.g. 9.90', 'example price', WCSATT_STT::TEXT_DOMAIN ), |
|
233
|
|
- 'description' => __( 'Optionally include an amount to be charged at the outset of the subscription. The sign-up fee will be charged immediately, even if the product has a free trial or the payment dates are synced.', WCSATT_STT::TEXT_DOMAIN ), |
|
|
231
|
+ 'label' => sprintf(__('Sign-up Fee (%s)', WCSATT_STT::TEXT_DOMAIN), get_woocommerce_currency_symbol()), |
|
|
232
|
+ 'placeholder' => _x('e.g. 9.90', 'example price', WCSATT_STT::TEXT_DOMAIN), |
|
|
233
|
+ 'description' => __('Optionally include an amount to be charged at the outset of the subscription. The sign-up fee will be charged immediately, even if the product has a free trial or the payment dates are synced.', WCSATT_STT::TEXT_DOMAIN), |
|
234
|
234
|
'desc_tip' => true, |
|
235
|
235
|
'type' => 'text', |
|
236
|
236
|
'custom_attributes' => array( |
|
237
|
237
|
'step' => 'any', |
|
238
|
238
|
'min' => '0', |
|
239
|
239
|
), |
|
240
|
|
- 'name' => 'wcsatt_schemes[' . $index . '][subscription_sign_up_fee]', |
|
|
240
|
+ 'name' => 'wcsatt_schemes['.$index.'][subscription_sign_up_fee]', |
|
241
|
241
|
'value' => $subscription_sign_up_fee |
|
242
|
|
- ) ); |
|
|
242
|
+ )); |
|
243
|
243
|
|
|
244
|
244
|
// Trial Length |
|
245
|
|
- woocommerce_wp_text_input( array( |
|
|
245
|
+ woocommerce_wp_text_input(array( |
|
246
|
246
|
'id' => '_subscription_trial_length', |
|
247
|
247
|
'class' => 'wc_input_subscription_trial_length', |
|
248
|
|
- 'label' => __( 'Free Trial', WCSATT_STT::TEXT_DOMAIN ), |
|
249
|
|
- 'name' => 'wcsatt_schemes[' . $index . '][subscription_trial_length]', |
|
|
248
|
+ 'label' => __('Free Trial', WCSATT_STT::TEXT_DOMAIN), |
|
|
249
|
+ 'name' => 'wcsatt_schemes['.$index.'][subscription_trial_length]', |
|
250
|
250
|
'value' => $subscription_trial_length |
|
251
|
|
- ) ); |
|
|
251
|
+ )); |
|
252
|
252
|
|
|
253
|
253
|
// Trial Period |
|
254
|
|
- woocommerce_wp_select( array( |
|
|
254
|
+ woocommerce_wp_select(array( |
|
255
|
255
|
'id' => '_subscription_trial_period', |
|
256
|
256
|
'class' => 'wc_input_subscription_trial_period', |
|
257
|
|
- 'label' => __( 'Subscription Trial Period', WCSATT_STT::TEXT_DOMAIN ), |
|
|
257
|
+ 'label' => __('Subscription Trial Period', WCSATT_STT::TEXT_DOMAIN), |
|
258
|
258
|
'options' => wcs_get_available_time_periods(), |
|
259
|
259
|
// translators: placeholder is trial period validation message if passed an invalid value (e.g. "Trial period can not exceed 4 weeks") |
|
260
|
|
- 'description' => sprintf( _x( 'An optional period of time to wait before charging the first recurring payment. Any sign up fee will still be charged at the outset of the subscription. %s', 'Trial period dropdown\'s description in pricing fields', WCSATT_STT::TEXT_DOMAIN ), WC_Subscriptions_Admin::get_trial_period_validation_message() ), |
|
|
260
|
+ 'description' => sprintf(_x('An optional period of time to wait before charging the first recurring payment. Any sign up fee will still be charged at the outset of the subscription. %s', 'Trial period dropdown\'s description in pricing fields', WCSATT_STT::TEXT_DOMAIN), WC_Subscriptions_Admin::get_trial_period_validation_message()), |
|
261
|
261
|
'desc_tip' => true, |
|
262
|
|
- 'value' => WC_Subscriptions_Product::get_trial_period( $post_id ), // Explicitly set value in to ensure backward compatibility |
|
263
|
|
- 'name' => 'wcsatt_schemes[' . $index . '][subscription_trial_period]', |
|
|
262
|
+ 'value' => WC_Subscriptions_Product::get_trial_period($post_id), // Explicitly set value in to ensure backward compatibility |
|
|
263
|
+ 'name' => 'wcsatt_schemes['.$index.'][subscription_trial_period]', |
|
264
|
264
|
'value' => $subscription_trial_period |
|
265
|
|
- ) ); |
|
|
265
|
+ )); |
|
266
|
266
|
} // END wcsatt_stt_fields() |
|
267
|
267
|
|
|
268
|
268
|
/** |
|
@@ -273,38 +273,38 @@ discard block |
|
|
block discarded – undo |
|
273
|
273
|
* @param string $product_type |
|
274
|
274
|
* @return void |
|
275
|
275
|
*/ |
|
276
|
|
- public function wcsatt_stt_process_scheme_data( $posted_scheme, $product_type ) { |
|
|
276
|
+ public function wcsatt_stt_process_scheme_data($posted_scheme, $product_type) { |
|
277
|
277
|
// Copy variable type fields. |
|
278
|
|
- if ( 'variable' == $product_type ) { |
|
279
|
|
- if ( isset( $posted_scheme[ 'subscription_sign_up_fee_variable' ] ) ) { |
|
280
|
|
- $posted_scheme[ 'subscription_sign_up_fee' ] = $posted_scheme[ 'subscription_sign_up_fee_variable' ]; |
|
|
278
|
+ if ('variable' == $product_type) { |
|
|
279
|
+ if (isset($posted_scheme['subscription_sign_up_fee_variable'])) { |
|
|
280
|
+ $posted_scheme['subscription_sign_up_fee'] = $posted_scheme['subscription_sign_up_fee_variable']; |
|
281
|
281
|
} |
|
282
|
|
- if ( isset( $posted_scheme[ 'subscription_trial_length_variable' ] ) ) { |
|
283
|
|
- $posted_scheme[ 'subscription_trial_length' ] = $posted_scheme[ 'subscription_trial_length_variable' ]; |
|
|
282
|
+ if (isset($posted_scheme['subscription_trial_length_variable'])) { |
|
|
283
|
+ $posted_scheme['subscription_trial_length'] = $posted_scheme['subscription_trial_length_variable']; |
|
284
|
284
|
} |
|
285
|
|
- if ( isset( $posted_scheme[ 'subscription_trial_period_variable' ] ) ) { |
|
286
|
|
- $posted_scheme[ 'subscription_trial_period' ] = $posted_scheme[ 'subscription_trial_period_variable']; |
|
|
285
|
+ if (isset($posted_scheme['subscription_trial_period_variable'])) { |
|
|
286
|
+ $posted_scheme['subscription_trial_period'] = $posted_scheme['subscription_trial_period_variable']; |
|
287
|
287
|
} |
|
288
|
288
|
} |
|
289
|
289
|
|
|
290
|
290
|
// Format subscription sign up fee. |
|
291
|
|
- if ( isset( $posted_scheme[ 'subscription_sign_up_fee' ] ) ) { |
|
292
|
|
- $posted_scheme[ 'subscription_sign_up_fee' ] = ( $posted_scheme[ 'subscription_sign_up_fee' ] === '' ) ? '' : wc_format_decimal( $posted_scheme[ 'subscription_sign_up_fee' ] ); |
|
|
291
|
+ if (isset($posted_scheme['subscription_sign_up_fee'])) { |
|
|
292
|
+ $posted_scheme['subscription_sign_up_fee'] = ($posted_scheme['subscription_sign_up_fee'] === '') ? '' : wc_format_decimal($posted_scheme['subscription_sign_up_fee']); |
|
293
|
293
|
} |
|
294
|
294
|
|
|
295
|
295
|
// Make sure trial period is within allowable range. |
|
296
|
296
|
$subscription_ranges = wcs_get_subscription_ranges(); |
|
297
|
|
- $max_trial_length = count( $subscription_ranges[ $posted_scheme[ 'subscription_trial_period' ] ] ) - 1; |
|
|
297
|
+ $max_trial_length = count($subscription_ranges[$posted_scheme['subscription_trial_period']]) - 1; |
|
298
|
298
|
|
|
299
|
299
|
// Format subscription trial length. |
|
300
|
|
- if ( isset( $posted_scheme[ 'subscription_trial_length' ] ) && $posted_scheme[ 'subscription_trial_length' ] > $max_trial_length ) { |
|
301
|
|
- $posted_scheme[ 'subscription_trial_length' ] = ( $posted_scheme[ 'subscription_trial_length' ] === '' ) ? '' : absint( $posted_scheme[ 'subscription_trial_length' ] ); |
|
|
300
|
+ if (isset($posted_scheme['subscription_trial_length']) && $posted_scheme['subscription_trial_length'] > $max_trial_length) { |
|
|
301
|
+ $posted_scheme['subscription_trial_length'] = ($posted_scheme['subscription_trial_length'] === '') ? '' : absint($posted_scheme['subscription_trial_length']); |
|
302
|
302
|
} |
|
303
|
303
|
|
|
304
|
304
|
// Format subscription trial period. |
|
305
|
|
- $trial_periods = apply_filters( 'wcsatt_stt_trial_periods', array( 'day', 'week', 'month', 'year' ) ); |
|
306
|
|
- if ( isset( $posted_scheme[ 'subscription_trial_period' ] ) && in_array( $posted_scheme[ 'subscription_trial_period' ], $trial_periods ) ) { |
|
307
|
|
- $posted_scheme[ 'subscription_trial_period' ] = trim( $posted_scheme[ 'subscription_trial_period' ] ); |
|
|
305
|
+ $trial_periods = apply_filters('wcsatt_stt_trial_periods', array('day', 'week', 'month', 'year')); |
|
|
306
|
+ if (isset($posted_scheme['subscription_trial_period']) && in_array($posted_scheme['subscription_trial_period'], $trial_periods)) { |
|
|
307
|
+ $posted_scheme['subscription_trial_period'] = trim($posted_scheme['subscription_trial_period']); |
|
308
|
308
|
} |
|
309
|
309
|
|
|
310
|
310
|
return $posted_scheme; |
|
@@ -318,17 +318,17 @@ discard block |
|
|
block discarded – undo |
|
318
|
318
|
* @param WC_Product $product |
|
319
|
319
|
* @return string |
|
320
|
320
|
*/ |
|
321
|
|
- public function add_sub_scheme_data_price_html( $_product, $subscription_scheme, $product ) { |
|
322
|
|
- if ( isset( $subscription_scheme[ 'subscription_sign_up_fee' ] ) ) { |
|
323
|
|
- $_product->subscription_sign_up_fee = $subscription_scheme[ 'subscription_sign_up_fee' ]; |
|
|
321
|
+ public function add_sub_scheme_data_price_html($_product, $subscription_scheme, $product) { |
|
|
322
|
+ if (isset($subscription_scheme['subscription_sign_up_fee'])) { |
|
|
323
|
+ $_product->subscription_sign_up_fee = $subscription_scheme['subscription_sign_up_fee']; |
|
324
|
324
|
} |
|
325
|
325
|
|
|
326
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_length' ] ) ) { |
|
327
|
|
- $_product->subscription_trial_length = $subscription_scheme[ 'subscription_trial_length' ]; |
|
|
326
|
+ if (isset($subscription_scheme['subscription_trial_length'])) { |
|
|
327
|
+ $_product->subscription_trial_length = $subscription_scheme['subscription_trial_length']; |
|
328
|
328
|
} |
|
329
|
329
|
|
|
330
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_period' ] ) ) { |
|
331
|
|
- $_product->subscription_trial_period = $subscription_scheme[ 'subscription_trial_period' ]; |
|
|
330
|
+ if (isset($subscription_scheme['subscription_trial_period'])) { |
|
|
331
|
+ $_product->subscription_trial_period = $subscription_scheme['subscription_trial_period']; |
|
332
|
332
|
} |
|
333
|
333
|
|
|
334
|
334
|
return $_product; |
|
@@ -343,14 +343,14 @@ discard block |
|
|
block discarded – undo |
|
343
|
343
|
* @param array $subscription_scheme |
|
344
|
344
|
* @return object |
|
345
|
345
|
*/ |
|
346
|
|
- public function sub_product_scheme_option( $_cloned, $subscription_scheme ) { |
|
347
|
|
- if ( isset( $subscription_scheme[ 'subscription_sign_up_fee' ] ) && $subscription_scheme[ 'subscription_sign_up_fee' ] > 0 ) { |
|
348
|
|
- $_cloned->subscription_sign_up_fee = $subscription_scheme[ 'subscription_sign_up_fee' ]; |
|
|
346
|
+ public function sub_product_scheme_option($_cloned, $subscription_scheme) { |
|
|
347
|
+ if (isset($subscription_scheme['subscription_sign_up_fee']) && $subscription_scheme['subscription_sign_up_fee'] > 0) { |
|
|
348
|
+ $_cloned->subscription_sign_up_fee = $subscription_scheme['subscription_sign_up_fee']; |
|
349
|
349
|
} |
|
350
|
350
|
|
|
351
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_length' ] ) && 0 != $subscription_scheme[ 'subscription_trial_length' ] ) { |
|
352
|
|
- $_cloned->subscription_trial_length = $subscription_scheme[ 'subscription_trial_length' ]; |
|
353
|
|
- $_cloned->subscription_trial_period = $subscription_scheme[ 'subscription_trial_period' ]; |
|
|
351
|
+ if (isset($subscription_scheme['subscription_trial_length']) && 0 != $subscription_scheme['subscription_trial_length']) { |
|
|
352
|
+ $_cloned->subscription_trial_length = $subscription_scheme['subscription_trial_length']; |
|
|
353
|
+ $_cloned->subscription_trial_period = $subscription_scheme['subscription_trial_period']; |
|
354
|
354
|
} |
|
355
|
355
|
|
|
356
|
356
|
return $_cloned; |
|
@@ -364,13 +364,13 @@ discard block |
|
|
block discarded – undo |
|
364
|
364
|
* @param array $subscription_scheme |
|
365
|
365
|
* @return array |
|
366
|
366
|
*/ |
|
367
|
|
- public function get_price_string( $prices, $subscription_scheme ) { |
|
368
|
|
- if ( isset( $subscription_scheme[ 'subscription_sign_up_fee' ] ) && $subscription_scheme[ 'subscription_sign_up_fee' ] > 0 ) { |
|
369
|
|
- $prices[ 'sign_up_fee' ] = $subscription_scheme[ 'subscription_sign_up_fee' ]; |
|
|
367
|
+ public function get_price_string($prices, $subscription_scheme) { |
|
|
368
|
+ if (isset($subscription_scheme['subscription_sign_up_fee']) && $subscription_scheme['subscription_sign_up_fee'] > 0) { |
|
|
369
|
+ $prices['sign_up_fee'] = $subscription_scheme['subscription_sign_up_fee']; |
|
370
|
370
|
} |
|
371
|
371
|
|
|
372
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_length' ] ) && 0 != $subscription_scheme[ 'subscription_trial_length' ] ) { |
|
373
|
|
- $prices[ 'trial_length' ] = true; |
|
|
372
|
+ if (isset($subscription_scheme['subscription_trial_length']) && 0 != $subscription_scheme['subscription_trial_length']) { |
|
|
373
|
+ $prices['trial_length'] = true; |
|
374
|
374
|
} |
|
375
|
375
|
|
|
376
|
376
|
return $prices; |
|
@@ -384,9 +384,9 @@ discard block |
|
|
block discarded – undo |
|
384
|
384
|
* @param array $lowest_subscription_scheme |
|
385
|
385
|
* @return array |
|
386
|
386
|
*/ |
|
387
|
|
- public function get_lowest_price_string( $prices, $lowest_subscription_scheme ) { |
|
388
|
|
- if ( isset( $lowest_subscription_scheme[ 'sign_up_fee' ] ) && $lowest_subscription_scheme[ 'sign_up_fee' ] > 0 ) { |
|
389
|
|
- $prices[ 'sign_up_fee' ] = $lowest_subscription_scheme[ 'sign_up_fee' ]; |
|
|
387
|
+ public function get_lowest_price_string($prices, $lowest_subscription_scheme) { |
|
|
388
|
+ if (isset($lowest_subscription_scheme['sign_up_fee']) && $lowest_subscription_scheme['sign_up_fee'] > 0) { |
|
|
389
|
+ $prices['sign_up_fee'] = $lowest_subscription_scheme['sign_up_fee']; |
|
390
|
390
|
} |
|
391
|
391
|
|
|
392
|
392
|
return $prices; |
|
@@ -399,8 +399,8 @@ discard block |
|
|
block discarded – undo |
|
399
|
399
|
* @param array $lowest_scheme |
|
400
|
400
|
* @return array |
|
401
|
401
|
*/ |
|
402
|
|
- public function get_lowest_price_sub_scheme_data( $data, $lowest_scheme ) { |
|
403
|
|
- if ( isset( $lowest_scheme['subscription_sign_up_fee'] ) && $lowest_scheme['subscription_sign_up_fee'] > 0 ) { |
|
|
402
|
+ public function get_lowest_price_sub_scheme_data($data, $lowest_scheme) { |
|
|
403
|
+ if (isset($lowest_scheme['subscription_sign_up_fee']) && $lowest_scheme['subscription_sign_up_fee'] > 0) { |
|
404
|
404
|
$data['sign_up_fee'] = $lowest_scheme['subscription_sign_up_fee']; |
|
405
|
405
|
} |
|
406
|
406
|
|
|
@@ -414,17 +414,17 @@ discard block |
|
|
block discarded – undo |
|
414
|
414
|
* @param array $subscription_scheme |
|
415
|
415
|
* @return array |
|
416
|
416
|
*/ |
|
417
|
|
- public function add_subscription_scheme_prices( $prices, $subscription_scheme ) { |
|
418
|
|
- if ( isset( $subscription_scheme[ 'subscription_sign_up_fee' ] ) ) { |
|
419
|
|
- $prices[ 'sign_up_fee' ] = $subscription_scheme[ 'subscription_sign_up_fee' ]; |
|
|
417
|
+ public function add_subscription_scheme_prices($prices, $subscription_scheme) { |
|
|
418
|
+ if (isset($subscription_scheme['subscription_sign_up_fee'])) { |
|
|
419
|
+ $prices['sign_up_fee'] = $subscription_scheme['subscription_sign_up_fee']; |
|
420
|
420
|
} |
|
421
|
421
|
|
|
422
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_length' ] ) ) { |
|
423
|
|
- $prices[ 'trial_length' ] = $subscription_scheme[ 'subscription_trial_length' ]; |
|
|
422
|
+ if (isset($subscription_scheme['subscription_trial_length'])) { |
|
|
423
|
+ $prices['trial_length'] = $subscription_scheme['subscription_trial_length']; |
|
424
|
424
|
} |
|
425
|
425
|
|
|
426
|
|
- if ( isset( $subscription_scheme[ 'subscription_trial_period' ] ) ) { |
|
427
|
|
- $prices[ 'trial_period' ] = $subscription_scheme[ 'subscription_trial_period' ]; |
|
|
426
|
+ if (isset($subscription_scheme['subscription_trial_period'])) { |
|
|
427
|
+ $prices['trial_period'] = $subscription_scheme['subscription_trial_period']; |
|
428
|
428
|
} |
|
429
|
429
|
|
|
430
|
430
|
return $prices; |
|
@@ -437,32 +437,32 @@ discard block |
|
|
block discarded – undo |
|
437
|
437
|
* @param array $cart_item |
|
438
|
438
|
* @return array |
|
439
|
439
|
*/ |
|
440
|
|
- public function update_cart_item_sub_data( $cart_item ) { |
|
441
|
|
- $active_scheme = WCS_ATT_Schemes::get_active_subscription_scheme( $cart_item ); |
|
|
440
|
+ public function update_cart_item_sub_data($cart_item) { |
|
|
441
|
+ $active_scheme = WCS_ATT_Schemes::get_active_subscription_scheme($cart_item); |
|
442
|
442
|
|
|
443
|
|
- $subscription_prices = WCS_ATT_Scheme_Prices::get_active_subscription_scheme_prices( $cart_item, $active_scheme ); |
|
|
443
|
+ $subscription_prices = WCS_ATT_Scheme_Prices::get_active_subscription_scheme_prices($cart_item, $active_scheme); |
|
444
|
444
|
|
|
445
|
|
- if ( $active_scheme && $cart_item['data']->is_converted_to_sub == 'yes' ) { |
|
|
445
|
+ if ($active_scheme && $cart_item['data']->is_converted_to_sub == 'yes') { |
|
446
|
446
|
|
|
447
|
447
|
// Subscription Price |
|
448
|
448
|
$price = $cart_item['data']->subscription_price; |
|
449
|
449
|
|
|
450
|
450
|
// Is there a sign up fee? |
|
451
|
|
- $sign_up_fee = isset( $subscription_prices['sign_up_fee'] ) ? $subscription_prices['sign_up_fee'] : ''; |
|
|
451
|
+ $sign_up_fee = isset($subscription_prices['sign_up_fee']) ? $subscription_prices['sign_up_fee'] : ''; |
|
452
|
452
|
|
|
453
|
453
|
// Put them both together. |
|
454
|
454
|
$new_price = $price + $sign_up_fee; |
|
455
|
455
|
|
|
456
|
|
- if ( $sign_up_fee > 0 ) { |
|
|
456
|
+ if ($sign_up_fee > 0) { |
|
457
|
457
|
$cart_item['data']->initial_amount = $new_price; |
|
458
|
458
|
$cart_item['data']->subscription_sign_up_fee = $sign_up_fee; |
|
459
|
459
|
} |
|
460
|
460
|
|
|
461
|
|
- $trial_length = isset( $subscription_prices['trial_length'] ) ? $subscription_prices['trial_length'] : 0; |
|
462
|
|
- $trial_period = isset( $subscription_prices['trial_period'] ) ? $subscription_prices['trial_period'] : ''; |
|
|
461
|
+ $trial_length = isset($subscription_prices['trial_length']) ? $subscription_prices['trial_length'] : 0; |
|
|
462
|
+ $trial_period = isset($subscription_prices['trial_period']) ? $subscription_prices['trial_period'] : ''; |
|
463
|
463
|
|
|
464
|
464
|
// If a trial length is more than zero then re-adjust the price. |
|
465
|
|
- if ( $trial_length > 0 ) { |
|
|
465
|
+ if ($trial_length > 0) { |
|
466
|
466
|
|
|
467
|
467
|
/*$cart_item['data']->price = $new_price; |
|
468
|
468
|
$cart_item['data']->subscription_price = $new_price; |