@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | */ |
9 | 9 | |
10 | 10 | if ( ! defined( 'ABSPATH' ) ) { |
11 | - exit; // Exit if accessed directly |
|
11 | + exit; // Exit if accessed directly |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | /** |
@@ -75,16 +75,16 @@ discard block |
||
75 | 75 | $class .= ' wpi-recurring'; |
76 | 76 | } |
77 | 77 | |
78 | - $refund_url = wp_nonce_url( |
|
79 | - add_query_arg( |
|
80 | - array( |
|
81 | - 'getpaid-admin-action' => 'refund_invoice', |
|
82 | - 'invoice_id' => $invoice->get_id(), |
|
83 | - ) |
|
84 | - ), |
|
85 | - 'getpaid-nonce', |
|
86 | - 'getpaid-nonce' |
|
87 | - ); |
|
78 | + $refund_url = wp_nonce_url( |
|
79 | + add_query_arg( |
|
80 | + array( |
|
81 | + 'getpaid-admin-action' => 'refund_invoice', |
|
82 | + 'invoice_id' => $invoice->get_id(), |
|
83 | + ) |
|
84 | + ), |
|
85 | + 'getpaid-nonce', |
|
86 | + 'getpaid-nonce' |
|
87 | + ); |
|
88 | 88 | ?> |
89 | 89 | |
90 | 90 | <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>"> |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | <th class=" |
97 | 97 | <?php |
98 | 98 | echo esc_attr( $key ); |
99 | - echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : ''; |
|
100 | - ?> |
|
99 | + echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : ''; |
|
100 | + ?> |
|
101 | 101 | "><?php echo wp_kses_post( $label ); ?></th> |
102 | 102 | <?php endforeach; ?> |
103 | 103 | </tr> |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | <tbody class="wpinv-line-items"> |
107 | 107 | <?php |
108 | 108 | foreach ( $invoice->get_items() as $int => $item ) { |
109 | - self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' ); |
|
109 | + self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' ); |
|
110 | 110 | } |
111 | 111 | ?> |
112 | 112 | </tbody> |
@@ -151,13 +151,13 @@ discard block |
||
151 | 151 | <?php |
152 | 152 | wpinv_html_select( |
153 | 153 | array( |
154 | - 'options' => $item_types, |
|
155 | - 'name' => '_wpinv_quick[type]', |
|
156 | - 'id' => '_wpinv_quick_type', |
|
157 | - 'selected' => 'custom', |
|
158 | - 'show_option_all' => false, |
|
159 | - 'show_option_none' => false, |
|
160 | - 'class' => 'gdmbx2-text-medium wpinv-quick-type', |
|
154 | + 'options' => $item_types, |
|
155 | + 'name' => '_wpinv_quick[type]', |
|
156 | + 'id' => '_wpinv_quick_type', |
|
157 | + 'selected' => 'custom', |
|
158 | + 'show_option_all' => false, |
|
159 | + 'show_option_none' => false, |
|
160 | + 'class' => 'gdmbx2-text-medium wpinv-quick-type', |
|
161 | 161 | ) |
162 | 162 | ); |
163 | 163 | ?> |
@@ -172,16 +172,16 @@ discard block |
||
172 | 172 | <?php |
173 | 173 | wpinv_html_select( |
174 | 174 | array( |
175 | - 'options' => array_merge( |
|
176 | - array( '' => __( 'Select VAT Rule', 'invoicing' ) ), |
|
177 | - getpaid_get_tax_rules() |
|
178 | - ), |
|
179 | - 'name' => '_wpinv_quick[vat_rule]', |
|
180 | - 'id' => '_wpinv_quick_vat_rule', |
|
181 | - 'show_option_all' => false, |
|
182 | - 'show_option_none' => false, |
|
183 | - 'class' => 'gdmbx2-text-medium wpinv-quick-vat-rule', |
|
184 | - 'selected' => 'digital', |
|
175 | + 'options' => array_merge( |
|
176 | + array( '' => __( 'Select VAT Rule', 'invoicing' ) ), |
|
177 | + getpaid_get_tax_rules() |
|
178 | + ), |
|
179 | + 'name' => '_wpinv_quick[vat_rule]', |
|
180 | + 'id' => '_wpinv_quick_vat_rule', |
|
181 | + 'show_option_all' => false, |
|
182 | + 'show_option_none' => false, |
|
183 | + 'class' => 'gdmbx2-text-medium wpinv-quick-vat-rule', |
|
184 | + 'selected' => 'digital', |
|
185 | 185 | ) |
186 | 186 | ); |
187 | 187 | ?> |
@@ -194,16 +194,16 @@ discard block |
||
194 | 194 | <?php |
195 | 195 | wpinv_html_select( |
196 | 196 | array( |
197 | - 'options' => array_merge( |
|
198 | - array( '' => __( 'Select VAT Class', 'invoicing' ) ), |
|
199 | - getpaid_get_tax_classes() |
|
200 | - ), |
|
201 | - 'name' => '_wpinv_quick[vat_class]', |
|
202 | - 'id' => '_wpinv_quick_vat_class', |
|
203 | - 'show_option_all' => false, |
|
204 | - 'show_option_none' => false, |
|
205 | - 'class' => 'gdmbx2-text-medium wpinv-quick-vat-class', |
|
206 | - 'selected' => '_standard', |
|
197 | + 'options' => array_merge( |
|
198 | + array( '' => __( 'Select VAT Class', 'invoicing' ) ), |
|
199 | + getpaid_get_tax_classes() |
|
200 | + ), |
|
201 | + 'name' => '_wpinv_quick[vat_class]', |
|
202 | + 'id' => '_wpinv_quick_vat_class', |
|
203 | + 'show_option_all' => false, |
|
204 | + 'show_option_none' => false, |
|
205 | + 'class' => 'gdmbx2-text-medium wpinv-quick-vat-class', |
|
206 | + 'selected' => '_standard', |
|
207 | 207 | ) |
208 | 208 | ); |
209 | 209 | ?> |
@@ -294,37 +294,37 @@ discard block |
||
294 | 294 | </p> |
295 | 295 | <?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?> |
296 | 296 | <?php |
297 | - aui()->input( |
|
298 | - array( |
|
299 | - 'type' => 'checkbox', |
|
300 | - 'name' => 'getpaid_refund_remote', |
|
301 | - 'id' => 'getpaid_refund_remote', |
|
302 | - 'label' => sprintf( |
|
303 | - 'Refund payment in %s', |
|
304 | - wpinv_get_gateway_admin_label( $invoice->get_gateway() ) |
|
305 | - ), |
|
306 | - 'value' => 1, |
|
307 | - 'class' => 'getpaid-refund-field', |
|
308 | - ), |
|
309 | - true |
|
310 | - ); |
|
311 | - ?> |
|
297 | + aui()->input( |
|
298 | + array( |
|
299 | + 'type' => 'checkbox', |
|
300 | + 'name' => 'getpaid_refund_remote', |
|
301 | + 'id' => 'getpaid_refund_remote', |
|
302 | + 'label' => sprintf( |
|
303 | + 'Refund payment in %s', |
|
304 | + wpinv_get_gateway_admin_label( $invoice->get_gateway() ) |
|
305 | + ), |
|
306 | + 'value' => 1, |
|
307 | + 'class' => 'getpaid-refund-field', |
|
308 | + ), |
|
309 | + true |
|
310 | + ); |
|
311 | + ?> |
|
312 | 312 | <?php endif; ?> |
313 | 313 | |
314 | 314 | <?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?> |
315 | 315 | <?php |
316 | - aui()->input( |
|
317 | - array( |
|
318 | - 'type' => 'checkbox', |
|
319 | - 'name' => 'getpaid_cancel_subscription', |
|
320 | - 'id' => 'getpaid_cancel_subscription', |
|
321 | - 'label' => __( 'Cancel subscription', 'invoicing' ), |
|
322 | - 'value' => 1, |
|
323 | - 'class' => 'getpaid-refund-field', |
|
324 | - ), |
|
325 | - true |
|
326 | - ); |
|
327 | - ?> |
|
316 | + aui()->input( |
|
317 | + array( |
|
318 | + 'type' => 'checkbox', |
|
319 | + 'name' => 'getpaid_cancel_subscription', |
|
320 | + 'id' => 'getpaid_cancel_subscription', |
|
321 | + 'label' => __( 'Cancel subscription', 'invoicing' ), |
|
322 | + 'value' => 1, |
|
323 | + 'class' => 'getpaid-refund-field', |
|
324 | + ), |
|
325 | + true |
|
326 | + ); |
|
327 | + ?> |
|
328 | 328 | <?php endif; ?> |
329 | 329 | </div> |
330 | 330 | <div class="modal-footer"> |
@@ -364,23 +364,23 @@ discard block |
||
364 | 364 | <?php |
365 | 365 | if ( $invoice->is_paid() ) { |
366 | 366 | |
367 | - printf( |
|
368 | - '<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>', |
|
369 | - esc_html__( 'Refund', 'invoicing' ) |
|
370 | - ); |
|
367 | + printf( |
|
368 | + '<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>', |
|
369 | + esc_html__( 'Refund', 'invoicing' ) |
|
370 | + ); |
|
371 | 371 | } elseif ( ! $invoice->is_refunded() ) { |
372 | - wpinv_item_dropdown( |
|
373 | - array( |
|
374 | - 'name' => 'wpinv_invoice_item', |
|
375 | - 'id' => 'wpinv_invoice_item', |
|
376 | - 'show_recurring' => true, |
|
377 | - 'class' => 'wpi_select2', |
|
378 | - ) |
|
379 | - ); |
|
380 | - |
|
381 | - echo ' ' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>'; |
|
382 | - echo ' ' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>'; |
|
383 | - echo ' ' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>'; |
|
372 | + wpinv_item_dropdown( |
|
373 | + array( |
|
374 | + 'name' => 'wpinv_invoice_item', |
|
375 | + 'id' => 'wpinv_invoice_item', |
|
376 | + 'show_recurring' => true, |
|
377 | + 'class' => 'wpi_select2', |
|
378 | + ) |
|
379 | + ); |
|
380 | + |
|
381 | + echo ' ' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>'; |
|
382 | + echo ' ' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>'; |
|
383 | + echo ' ' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>'; |
|
384 | 384 | |
385 | 385 | } |
386 | 386 | ?> |
@@ -397,72 +397,72 @@ discard block |
||
397 | 397 | <?php foreach ( array_keys( $columns ) as $column ) : ?> |
398 | 398 | <td class=" |
399 | 399 | <?php |
400 | - echo esc_attr( $column ); |
|
401 | - echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : ''; |
|
402 | - ?> |
|
400 | + echo esc_attr( $column ); |
|
401 | + echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : ''; |
|
402 | + ?> |
|
403 | 403 | "> |
404 | 404 | <?php |
405 | 405 | switch ( $column ) { |
406 | - case 'id': |
|
407 | - echo (int) $item->get_id(); |
|
408 | - break; |
|
409 | - case 'title': |
|
410 | - printf( |
|
411 | - '<a href="%s" target="_blank">%s</a>', |
|
412 | - esc_url( get_edit_post_link( $item->get_id() ) ), |
|
413 | - esc_html( $item->get_raw_name() ) |
|
414 | - ); |
|
415 | - |
|
416 | - $summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice ); |
|
417 | - if ( $summary !== '' ) { |
|
418 | - printf( |
|
419 | - '<span class="meta">%s</span>', |
|
420 | - wp_kses_post( wpautop( $summary ) ) |
|
421 | - ); |
|
422 | - } |
|
423 | - |
|
424 | - printf( |
|
425 | - '<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />', |
|
426 | - esc_attr( $item->get_raw_name() ), |
|
427 | - (int) $item->get_id() |
|
428 | - ); |
|
429 | - |
|
430 | - printf( |
|
431 | - '<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>', |
|
432 | - (int) $item->get_id(), |
|
433 | - esc_attr( $item->get_description() ) |
|
434 | - ); |
|
435 | - |
|
436 | - break; |
|
437 | - case 'price': |
|
438 | - printf( |
|
439 | - '<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />', |
|
440 | - esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ), |
|
441 | - (int) $item->get_id() |
|
442 | - ); |
|
443 | - |
|
444 | - break; |
|
445 | - case 'qty': |
|
446 | - printf( |
|
447 | - '<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />', |
|
448 | - floatval( $item->get_quantity() ), |
|
449 | - (int) $item->get_id() |
|
450 | - ); |
|
451 | - |
|
452 | - break; |
|
453 | - case 'total': |
|
454 | - wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() ); |
|
455 | - |
|
456 | - break; |
|
457 | - case 'tax': |
|
458 | - echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%'; |
|
459 | - |
|
460 | - break; |
|
461 | - case 'action': |
|
462 | - if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) { |
|
463 | - echo '<i class="fa fa-trash wpinv-item-remove"></i>'; |
|
406 | + case 'id': |
|
407 | + echo (int) $item->get_id(); |
|
408 | + break; |
|
409 | + case 'title': |
|
410 | + printf( |
|
411 | + '<a href="%s" target="_blank">%s</a>', |
|
412 | + esc_url( get_edit_post_link( $item->get_id() ) ), |
|
413 | + esc_html( $item->get_raw_name() ) |
|
414 | + ); |
|
415 | + |
|
416 | + $summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice ); |
|
417 | + if ( $summary !== '' ) { |
|
418 | + printf( |
|
419 | + '<span class="meta">%s</span>', |
|
420 | + wp_kses_post( wpautop( $summary ) ) |
|
421 | + ); |
|
422 | + } |
|
423 | + |
|
424 | + printf( |
|
425 | + '<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />', |
|
426 | + esc_attr( $item->get_raw_name() ), |
|
427 | + (int) $item->get_id() |
|
428 | + ); |
|
429 | + |
|
430 | + printf( |
|
431 | + '<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>', |
|
432 | + (int) $item->get_id(), |
|
433 | + esc_attr( $item->get_description() ) |
|
434 | + ); |
|
435 | + |
|
436 | + break; |
|
437 | + case 'price': |
|
438 | + printf( |
|
439 | + '<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />', |
|
440 | + esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ), |
|
441 | + (int) $item->get_id() |
|
442 | + ); |
|
443 | + |
|
444 | + break; |
|
445 | + case 'qty': |
|
446 | + printf( |
|
447 | + '<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />', |
|
448 | + floatval( $item->get_quantity() ), |
|
449 | + (int) $item->get_id() |
|
450 | + ); |
|
451 | + |
|
452 | + break; |
|
453 | + case 'total': |
|
454 | + wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() ); |
|
455 | + |
|
456 | + break; |
|
457 | + case 'tax': |
|
458 | + echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%'; |
|
459 | + |
|
460 | + break; |
|
461 | + case 'action': |
|
462 | + if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) { |
|
463 | + echo '<i class="fa fa-trash wpinv-item-remove"></i>'; |
|
464 | 464 | } |
465 | - break; |
|
465 | + break; |
|
466 | 466 | } |
467 | 467 | do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice ); |
468 | 468 | ?> |
@@ -473,10 +473,10 @@ discard block |
||
473 | 473 | } |
474 | 474 | |
475 | 475 | /** |
476 | - * Output the metabox. |
|
477 | - * |
|
478 | - * @param WP_Post $post |
|
479 | - */ |
|
476 | + * Output the metabox. |
|
477 | + * |
|
478 | + * @param WP_Post $post |
|
479 | + */ |
|
480 | 480 | public static function output2( $post ) { |
481 | 481 | |
482 | 482 | // Prepare the invoice. |
@@ -14,94 +14,94 @@ discard block |
||
14 | 14 | class GetPaid_Admin { |
15 | 15 | |
16 | 16 | /** |
17 | - * Local path to this plugins admin directory |
|
18 | - * |
|
19 | - * @var string |
|
20 | - */ |
|
21 | - public $admin_path; |
|
22 | - |
|
23 | - /** |
|
24 | - * Web path to this plugins admin directory |
|
25 | - * |
|
26 | - * @var string |
|
27 | - */ |
|
28 | - public $admin_url; |
|
29 | - |
|
30 | - /** |
|
31 | - * Reports components. |
|
32 | - * |
|
33 | - * @var GetPaid_Reports |
|
34 | - */ |
|
17 | + * Local path to this plugins admin directory |
|
18 | + * |
|
19 | + * @var string |
|
20 | + */ |
|
21 | + public $admin_path; |
|
22 | + |
|
23 | + /** |
|
24 | + * Web path to this plugins admin directory |
|
25 | + * |
|
26 | + * @var string |
|
27 | + */ |
|
28 | + public $admin_url; |
|
29 | + |
|
30 | + /** |
|
31 | + * Reports components. |
|
32 | + * |
|
33 | + * @var GetPaid_Reports |
|
34 | + */ |
|
35 | 35 | public $reports; |
36 | 36 | |
37 | 37 | /** |
38 | - * Class constructor. |
|
39 | - */ |
|
40 | - public function __construct() { |
|
38 | + * Class constructor. |
|
39 | + */ |
|
40 | + public function __construct() { |
|
41 | 41 | |
42 | 42 | $this->admin_path = plugin_dir_path( __FILE__ ); |
43 | - $this->admin_url = plugins_url( '/', __FILE__ ); |
|
44 | - $this->reports = new GetPaid_Reports(); |
|
43 | + $this->admin_url = plugins_url( '/', __FILE__ ); |
|
44 | + $this->reports = new GetPaid_Reports(); |
|
45 | 45 | |
46 | 46 | if ( is_admin() ) { |
47 | - $this->init_admin_hooks(); |
|
47 | + $this->init_admin_hooks(); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | - * Init action and filter hooks |
|
54 | - * |
|
55 | - */ |
|
56 | - private function init_admin_hooks() { |
|
53 | + * Init action and filter hooks |
|
54 | + * |
|
55 | + */ |
|
56 | + private function init_admin_hooks() { |
|
57 | 57 | add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ), 9 ); |
58 | 58 | add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) ); |
59 | 59 | add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) ); |
60 | 60 | add_action( 'admin_init', array( $this, 'activation_redirect' ) ); |
61 | 61 | add_action( 'admin_init', array( $this, 'maybe_do_admin_action' ) ); |
62 | - add_action( 'admin_notices', array( $this, 'show_notices' ) ); |
|
63 | - add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) ); |
|
64 | - add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) ); |
|
65 | - add_action( 'getpaid_authenticated_admin_action_reset_form_stats', array( $this, 'reset_form_stats' ) ); |
|
66 | - add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) ); |
|
67 | - add_action( 'getpaid_authenticated_admin_action_refund_invoice', array( $this, 'refund_invoice' ) ); |
|
68 | - add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) ); |
|
69 | - add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) ); |
|
62 | + add_action( 'admin_notices', array( $this, 'show_notices' ) ); |
|
63 | + add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) ); |
|
64 | + add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) ); |
|
65 | + add_action( 'getpaid_authenticated_admin_action_reset_form_stats', array( $this, 'reset_form_stats' ) ); |
|
66 | + add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) ); |
|
67 | + add_action( 'getpaid_authenticated_admin_action_refund_invoice', array( $this, 'refund_invoice' ) ); |
|
68 | + add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) ); |
|
69 | + add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) ); |
|
70 | 70 | add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) ); |
71 | - add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) ); |
|
72 | - add_action( 'getpaid_authenticated_admin_action_refresh_permalinks', array( $this, 'admin_refresh_permalinks' ) ); |
|
73 | - add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) ); |
|
74 | - add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) ); |
|
75 | - add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) ); |
|
76 | - add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) ); |
|
77 | - add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) ); |
|
78 | - add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) ); |
|
79 | - add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) ); |
|
80 | - do_action( 'getpaid_init_admin_hooks', $this ); |
|
81 | - |
|
82 | - // Setup/welcome |
|
83 | - if ( ! empty( $_GET['page'] ) ) { |
|
84 | - switch ( sanitize_text_field( $_GET['page'] ) ) { |
|
85 | - case 'gp-setup': |
|
86 | - include_once dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php'; |
|
87 | - break; |
|
88 | - } |
|
89 | - } |
|
90 | - |
|
91 | - } |
|
92 | - |
|
93 | - /** |
|
94 | - * Register admin scripts |
|
95 | - * |
|
96 | - */ |
|
97 | - public function enqeue_scripts() { |
|
71 | + add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) ); |
|
72 | + add_action( 'getpaid_authenticated_admin_action_refresh_permalinks', array( $this, 'admin_refresh_permalinks' ) ); |
|
73 | + add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) ); |
|
74 | + add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) ); |
|
75 | + add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) ); |
|
76 | + add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) ); |
|
77 | + add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) ); |
|
78 | + add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) ); |
|
79 | + add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) ); |
|
80 | + do_action( 'getpaid_init_admin_hooks', $this ); |
|
81 | + |
|
82 | + // Setup/welcome |
|
83 | + if ( ! empty( $_GET['page'] ) ) { |
|
84 | + switch ( sanitize_text_field( $_GET['page'] ) ) { |
|
85 | + case 'gp-setup': |
|
86 | + include_once dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php'; |
|
87 | + break; |
|
88 | + } |
|
89 | + } |
|
90 | + |
|
91 | + } |
|
92 | + |
|
93 | + /** |
|
94 | + * Register admin scripts |
|
95 | + * |
|
96 | + */ |
|
97 | + public function enqeue_scripts() { |
|
98 | 98 | global $current_screen, $pagenow; |
99 | 99 | |
100 | - $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : ''; |
|
101 | - $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php'; |
|
100 | + $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : ''; |
|
101 | + $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php'; |
|
102 | 102 | |
103 | 103 | if ( ! empty( $current_screen->post_type ) ) { |
104 | - $page = $current_screen->post_type; |
|
104 | + $page = $current_screen->post_type; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | // General styles. |
@@ -122,53 +122,53 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | // Payment form scripts. |
125 | - if ( 'wpi_payment_form' == $page && $editing ) { |
|
125 | + if ( 'wpi_payment_form' == $page && $editing ) { |
|
126 | 126 | $this->load_payment_form_scripts(); |
127 | 127 | } |
128 | 128 | |
129 | - if ( $page == 'wpinv-subscriptions' ) { |
|
130 | - wp_enqueue_script( 'postbox' ); |
|
131 | - } |
|
129 | + if ( $page == 'wpinv-subscriptions' ) { |
|
130 | + wp_enqueue_script( 'postbox' ); |
|
131 | + } |
|
132 | 132 | |
133 | 133 | } |
134 | 134 | |
135 | 135 | /** |
136 | - * Returns admin js translations. |
|
137 | - * |
|
138 | - */ |
|
139 | - protected function get_admin_i18() { |
|
136 | + * Returns admin js translations. |
|
137 | + * |
|
138 | + */ |
|
139 | + protected function get_admin_i18() { |
|
140 | 140 | global $post; |
141 | 141 | |
142 | - $date_range = array( |
|
143 | - 'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days', |
|
144 | - ); |
|
142 | + $date_range = array( |
|
143 | + 'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days', |
|
144 | + ); |
|
145 | 145 | |
146 | - if ( $date_range['period'] == 'custom' ) { |
|
146 | + if ( $date_range['period'] == 'custom' ) { |
|
147 | 147 | |
148 | - if ( isset( $_GET['from'] ) ) { |
|
149 | - $date_range['after'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS ); |
|
150 | - } |
|
148 | + if ( isset( $_GET['from'] ) ) { |
|
149 | + $date_range['after'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS ); |
|
150 | + } |
|
151 | 151 | |
152 | - if ( isset( $_GET['to'] ) ) { |
|
153 | - $date_range['before'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS ); |
|
154 | - } |
|
152 | + if ( isset( $_GET['to'] ) ) { |
|
153 | + $date_range['before'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS ); |
|
154 | + } |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | $i18n = array( |
158 | 158 | 'ajax_url' => admin_url( 'admin-ajax.php' ), |
159 | 159 | 'post_ID' => isset( $post->ID ) ? $post->ID : '', |
160 | - 'wpinv_nonce' => wp_create_nonce( 'wpinv-nonce' ), |
|
161 | - 'rest_nonce' => wp_create_nonce( 'wp_rest' ), |
|
162 | - 'rest_root' => esc_url_raw( rest_url() ), |
|
163 | - 'date_range' => $date_range, |
|
160 | + 'wpinv_nonce' => wp_create_nonce( 'wpinv-nonce' ), |
|
161 | + 'rest_nonce' => wp_create_nonce( 'wp_rest' ), |
|
162 | + 'rest_root' => esc_url_raw( rest_url() ), |
|
163 | + 'date_range' => $date_range, |
|
164 | 164 | 'add_invoice_note_nonce' => wp_create_nonce( 'add-invoice-note' ), |
165 | 165 | 'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ), |
166 | 166 | 'invoice_item_nonce' => wp_create_nonce( 'invoice-item' ), |
167 | 167 | 'billing_details_nonce' => wp_create_nonce( 'get-billing-details' ), |
168 | 168 | 'tax' => wpinv_tax_amount(), |
169 | 169 | 'discount' => 0, |
170 | - 'currency_symbol' => wpinv_currency_symbol(), |
|
171 | - 'currency' => wpinv_get_currency(), |
|
170 | + 'currency_symbol' => wpinv_currency_symbol(), |
|
171 | + 'currency' => wpinv_get_currency(), |
|
172 | 172 | 'currency_pos' => wpinv_currency_position(), |
173 | 173 | 'thousand_sep' => wpinv_thousands_separator(), |
174 | 174 | 'decimal_sep' => wpinv_decimal_separator(), |
@@ -188,118 +188,118 @@ discard block |
||
188 | 188 | 'item_description' => __( 'Item Description', 'invoicing' ), |
189 | 189 | 'invoice_description' => __( 'Invoice Description', 'invoicing' ), |
190 | 190 | 'discount_description' => __( 'Discount Description', 'invoicing' ), |
191 | - 'searching' => __( 'Searching', 'invoicing' ), |
|
192 | - 'loading' => __( 'Loading...', 'invoicing' ), |
|
193 | - 'search_customers' => __( 'Enter customer name or email', 'invoicing' ), |
|
194 | - 'search_items' => __( 'Enter item name', 'invoicing' ), |
|
195 | - 'graphs' => array_merge( array( 'refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax' ), array_keys( wpinv_get_report_graphs() ) ), |
|
191 | + 'searching' => __( 'Searching', 'invoicing' ), |
|
192 | + 'loading' => __( 'Loading...', 'invoicing' ), |
|
193 | + 'search_customers' => __( 'Enter customer name or email', 'invoicing' ), |
|
194 | + 'search_items' => __( 'Enter item name', 'invoicing' ), |
|
195 | + 'graphs' => array_merge( array( 'refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax' ), array_keys( wpinv_get_report_graphs() ) ), |
|
196 | 196 | ); |
197 | 197 | |
198 | - if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) { |
|
198 | + if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) { |
|
199 | 199 | |
200 | - $invoice = new WPInv_Invoice( $post ); |
|
201 | - $i18n['save_invoice'] = sprintf( |
|
202 | - __( 'Save %s', 'invoicing' ), |
|
203 | - ucfirst( $invoice->get_invoice_quote_type() ) |
|
204 | - ); |
|
200 | + $invoice = new WPInv_Invoice( $post ); |
|
201 | + $i18n['save_invoice'] = sprintf( |
|
202 | + __( 'Save %s', 'invoicing' ), |
|
203 | + ucfirst( $invoice->get_invoice_quote_type() ) |
|
204 | + ); |
|
205 | 205 | |
206 | - $i18n['invoice_description'] = sprintf( |
|
207 | - __( '%s Description', 'invoicing' ), |
|
208 | - ucfirst( $invoice->get_invoice_quote_type() ) |
|
209 | - ); |
|
206 | + $i18n['invoice_description'] = sprintf( |
|
207 | + __( '%s Description', 'invoicing' ), |
|
208 | + ucfirst( $invoice->get_invoice_quote_type() ) |
|
209 | + ); |
|
210 | 210 | |
211 | - } |
|
212 | - return $i18n; |
|
213 | - } |
|
211 | + } |
|
212 | + return $i18n; |
|
213 | + } |
|
214 | 214 | |
215 | - /** |
|
216 | - * Change the admin footer text on GetPaid admin pages. |
|
217 | - * |
|
218 | - * @since 2.0.0 |
|
219 | - * @param string $footer_text |
|
220 | - * @return string |
|
221 | - */ |
|
222 | - public function admin_footer_text( $footer_text ) { |
|
223 | - global $current_screen; |
|
215 | + /** |
|
216 | + * Change the admin footer text on GetPaid admin pages. |
|
217 | + * |
|
218 | + * @since 2.0.0 |
|
219 | + * @param string $footer_text |
|
220 | + * @return string |
|
221 | + */ |
|
222 | + public function admin_footer_text( $footer_text ) { |
|
223 | + global $current_screen; |
|
224 | 224 | |
225 | - $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : ''; |
|
225 | + $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : ''; |
|
226 | 226 | |
227 | 227 | if ( ! empty( $current_screen->post_type ) ) { |
228 | - $page = $current_screen->post_type; |
|
228 | + $page = $current_screen->post_type; |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | // General styles. |
232 | 232 | if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) { |
233 | 233 | |
234 | - // Change the footer text |
|
235 | - if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) { |
|
234 | + // Change the footer text |
|
235 | + if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) { |
|
236 | 236 | |
237 | - $rating_url = esc_url( |
|
238 | - wp_nonce_url( |
|
239 | - admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ), |
|
240 | - 'getpaid-nonce', |
|
241 | - 'getpaid-nonce' |
|
237 | + $rating_url = esc_url( |
|
238 | + wp_nonce_url( |
|
239 | + admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ), |
|
240 | + 'getpaid-nonce', |
|
241 | + 'getpaid-nonce' |
|
242 | 242 | ) |
243 | - ); |
|
243 | + ); |
|
244 | 244 | |
245 | - $footer_text = sprintf( |
|
246 | - /* translators: %s: five stars */ |
|
247 | - __( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ), |
|
248 | - "<a href='$rating_url'>★★★★★</a>" |
|
249 | - ); |
|
245 | + $footer_text = sprintf( |
|
246 | + /* translators: %s: five stars */ |
|
247 | + __( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ), |
|
248 | + "<a href='$rating_url'>★★★★★</a>" |
|
249 | + ); |
|
250 | 250 | |
251 | - } else { |
|
251 | + } else { |
|
252 | 252 | |
253 | - $footer_text = sprintf( |
|
254 | - /* translators: %s: GetPaid */ |
|
255 | - __( 'Thank you for using %s!', 'invoicing' ), |
|
256 | - "<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>" |
|
257 | - ); |
|
253 | + $footer_text = sprintf( |
|
254 | + /* translators: %s: GetPaid */ |
|
255 | + __( 'Thank you for using %s!', 'invoicing' ), |
|
256 | + "<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>" |
|
257 | + ); |
|
258 | 258 | |
259 | - } |
|
259 | + } |
|
260 | 260 | } |
261 | 261 | |
262 | - return $footer_text; |
|
263 | - } |
|
264 | - |
|
265 | - /** |
|
266 | - * Redirects to wp.org to rate the plugin. |
|
267 | - * |
|
268 | - * @since 2.0.0 |
|
269 | - */ |
|
270 | - public function redirect_to_wordpress_rating_page() { |
|
271 | - update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 ); |
|
272 | - wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' ); |
|
273 | - exit; |
|
274 | - } |
|
275 | - |
|
276 | - /** |
|
277 | - * Loads payment form js. |
|
278 | - * |
|
279 | - */ |
|
280 | - protected function load_payment_form_scripts() { |
|
262 | + return $footer_text; |
|
263 | + } |
|
264 | + |
|
265 | + /** |
|
266 | + * Redirects to wp.org to rate the plugin. |
|
267 | + * |
|
268 | + * @since 2.0.0 |
|
269 | + */ |
|
270 | + public function redirect_to_wordpress_rating_page() { |
|
271 | + update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 ); |
|
272 | + wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' ); |
|
273 | + exit; |
|
274 | + } |
|
275 | + |
|
276 | + /** |
|
277 | + * Loads payment form js. |
|
278 | + * |
|
279 | + */ |
|
280 | + protected function load_payment_form_scripts() { |
|
281 | 281 | global $post; |
282 | 282 | |
283 | 283 | wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.js', array(), WPINV_VERSION ); |
284 | - wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION ); |
|
285 | - wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION ); |
|
284 | + wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION ); |
|
285 | + wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION ); |
|
286 | 286 | |
287 | - $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' ); |
|
288 | - wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable', 'wp-hooks' ), $version ); |
|
287 | + $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' ); |
|
288 | + wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable', 'wp-hooks' ), $version ); |
|
289 | 289 | |
290 | - wp_localize_script( |
|
290 | + wp_localize_script( |
|
291 | 291 | 'wpinv-admin-payment-form-script', |
292 | 292 | 'wpinvPaymentFormAdmin', |
293 | 293 | array( |
294 | - 'elements' => wpinv_get_data( 'payment-form-elements' ), |
|
295 | - 'form_elements' => getpaid_get_payment_form_elements( $post->ID ), |
|
296 | - 'currency' => wpinv_currency_symbol(), |
|
297 | - 'position' => wpinv_currency_position(), |
|
298 | - 'decimals' => (int) wpinv_decimals(), |
|
299 | - 'thousands_sep' => wpinv_thousands_separator(), |
|
300 | - 'decimals_sep' => wpinv_decimal_separator(), |
|
301 | - 'form_items' => gepaid_get_form_items( $post->ID ), |
|
302 | - 'is_default' => $post->ID == wpinv_get_default_payment_form(), |
|
294 | + 'elements' => wpinv_get_data( 'payment-form-elements' ), |
|
295 | + 'form_elements' => getpaid_get_payment_form_elements( $post->ID ), |
|
296 | + 'currency' => wpinv_currency_symbol(), |
|
297 | + 'position' => wpinv_currency_position(), |
|
298 | + 'decimals' => (int) wpinv_decimals(), |
|
299 | + 'thousands_sep' => wpinv_thousands_separator(), |
|
300 | + 'decimals_sep' => wpinv_decimal_separator(), |
|
301 | + 'form_items' => gepaid_get_form_items( $post->ID ), |
|
302 | + 'is_default' => $post->ID == wpinv_get_default_payment_form(), |
|
303 | 303 | ) |
304 | 304 | ); |
305 | 305 | |
@@ -308,19 +308,19 @@ discard block |
||
308 | 308 | } |
309 | 309 | |
310 | 310 | /** |
311 | - * Add our classes to admin pages. |
|
311 | + * Add our classes to admin pages. |
|
312 | 312 | * |
313 | 313 | * @param string $classes |
314 | 314 | * @return string |
315 | - * |
|
316 | - */ |
|
315 | + * |
|
316 | + */ |
|
317 | 317 | public function admin_body_class( $classes ) { |
318 | - global $pagenow, $post, $current_screen; |
|
318 | + global $pagenow, $post, $current_screen; |
|
319 | 319 | |
320 | 320 | $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : ''; |
321 | 321 | |
322 | 322 | if ( ! empty( $current_screen->post_type ) ) { |
323 | - $page = $current_screen->post_type; |
|
323 | + $page = $current_screen->post_type; |
|
324 | 324 | } |
325 | 325 | |
326 | 326 | if ( false !== stripos( $page, 'wpi' ) ) { |
@@ -329,70 +329,70 @@ discard block |
||
329 | 329 | |
330 | 330 | if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) { |
331 | 331 | $classes .= ' wpinv-cpt wpinv'; |
332 | - } |
|
332 | + } |
|
333 | 333 | |
334 | - if ( getpaid_is_invoice_post_type( $page ) ) { |
|
334 | + if ( getpaid_is_invoice_post_type( $page ) ) { |
|
335 | 335 | $classes .= ' getpaid-is-invoice-cpt'; |
336 | 336 | } |
337 | 337 | |
338 | - return $classes; |
|
338 | + return $classes; |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | /** |
342 | - * Maybe show the AyeCode Connect Notice. |
|
343 | - */ |
|
344 | - public function init_ayecode_connect_helper() { |
|
342 | + * Maybe show the AyeCode Connect Notice. |
|
343 | + */ |
|
344 | + public function init_ayecode_connect_helper() { |
|
345 | 345 | |
346 | - // Register with the deactivation survey class. |
|
347 | - AyeCode_Deactivation_Survey::instance( |
|
346 | + // Register with the deactivation survey class. |
|
347 | + AyeCode_Deactivation_Survey::instance( |
|
348 | 348 | array( |
349 | - 'slug' => 'invoicing', |
|
350 | - 'version' => WPINV_VERSION, |
|
351 | - 'support_url' => 'https://wpgetpaid.com/support/', |
|
352 | - 'documentation_url' => 'https://docs.wpgetpaid.com/', |
|
353 | - 'activated' => (int) get_option( 'gepaid_installed_on' ), |
|
349 | + 'slug' => 'invoicing', |
|
350 | + 'version' => WPINV_VERSION, |
|
351 | + 'support_url' => 'https://wpgetpaid.com/support/', |
|
352 | + 'documentation_url' => 'https://docs.wpgetpaid.com/', |
|
353 | + 'activated' => (int) get_option( 'gepaid_installed_on' ), |
|
354 | 354 | ) |
355 | 355 | ); |
356 | 356 | |
357 | 357 | new AyeCode_Connect_Helper( |
358 | 358 | array( |
359 | - 'connect_title' => __( 'WP Invoicing - an AyeCode product!', 'invoicing' ), |
|
360 | - 'connect_external' => __( 'Please confirm you wish to connect your site?', 'invoicing' ), |
|
361 | - 'connect' => sprintf( __( '<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>' ), |
|
362 | - 'connect_button' => __( 'Connect Site', 'invoicing' ), |
|
363 | - 'connecting_button' => __( 'Connecting...', 'invoicing' ), |
|
364 | - 'error_localhost' => __( 'This service will only work with a live domain, not a localhost.', 'invoicing' ), |
|
365 | - 'error' => __( 'Something went wrong, please refresh and try again.', 'invoicing' ), |
|
359 | + 'connect_title' => __( 'WP Invoicing - an AyeCode product!', 'invoicing' ), |
|
360 | + 'connect_external' => __( 'Please confirm you wish to connect your site?', 'invoicing' ), |
|
361 | + 'connect' => sprintf( __( '<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>' ), |
|
362 | + 'connect_button' => __( 'Connect Site', 'invoicing' ), |
|
363 | + 'connecting_button' => __( 'Connecting...', 'invoicing' ), |
|
364 | + 'error_localhost' => __( 'This service will only work with a live domain, not a localhost.', 'invoicing' ), |
|
365 | + 'error' => __( 'Something went wrong, please refresh and try again.', 'invoicing' ), |
|
366 | 366 | ), |
367 | 367 | array( 'wpi-addons' ) |
368 | 368 | ); |
369 | 369 | |
370 | 370 | } |
371 | 371 | |
372 | - /** |
|
373 | - * Redirect users to settings on activation. |
|
374 | - * |
|
375 | - * @return void |
|
376 | - */ |
|
377 | - public function activation_redirect() { |
|
372 | + /** |
|
373 | + * Redirect users to settings on activation. |
|
374 | + * |
|
375 | + * @return void |
|
376 | + */ |
|
377 | + public function activation_redirect() { |
|
378 | 378 | |
379 | - $redirected = get_option( 'wpinv_redirected_to_settings' ); |
|
379 | + $redirected = get_option( 'wpinv_redirected_to_settings' ); |
|
380 | 380 | |
381 | - if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) { |
|
382 | - return; |
|
383 | - } |
|
381 | + if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) { |
|
382 | + return; |
|
383 | + } |
|
384 | 384 | |
385 | - // Bail if activating from network, or bulk |
|
386 | - if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { |
|
387 | - return; |
|
388 | - } |
|
385 | + // Bail if activating from network, or bulk |
|
386 | + if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { |
|
387 | + return; |
|
388 | + } |
|
389 | 389 | |
390 | - update_option( 'wpinv_redirected_to_settings', 1 ); |
|
390 | + update_option( 'wpinv_redirected_to_settings', 1 ); |
|
391 | 391 | |
392 | 392 | wp_safe_redirect( admin_url( 'index.php?page=gp-setup' ) ); |
393 | 393 | exit; |
394 | 394 | |
395 | - } |
|
395 | + } |
|
396 | 396 | |
397 | 397 | /** |
398 | 398 | * Fires an admin action after verifying that a user can fire them. |
@@ -405,555 +405,555 @@ discard block |
||
405 | 405 | } |
406 | 406 | } |
407 | 407 | |
408 | - /** |
|
408 | + /** |
|
409 | 409 | * Duplicate invoice. |
410 | - * |
|
411 | - * @param array $args |
|
410 | + * |
|
411 | + * @param array $args |
|
412 | 412 | */ |
413 | 413 | public function duplicate_invoice( $args ) { |
414 | 414 | |
415 | - if ( empty( $args['invoice_id'] ) ) { |
|
416 | - return; |
|
417 | - } |
|
415 | + if ( empty( $args['invoice_id'] ) ) { |
|
416 | + return; |
|
417 | + } |
|
418 | 418 | |
419 | - $invoice = new WPInv_Invoice( (int) $args['invoice_id'] ); |
|
419 | + $invoice = new WPInv_Invoice( (int) $args['invoice_id'] ); |
|
420 | 420 | |
421 | - if ( ! $invoice->exists() ) { |
|
422 | - return; |
|
423 | - } |
|
421 | + if ( ! $invoice->exists() ) { |
|
422 | + return; |
|
423 | + } |
|
424 | 424 | |
425 | - $new_invoice = getpaid_duplicate_invoice( $invoice ); |
|
426 | - $new_invoice->save(); |
|
425 | + $new_invoice = getpaid_duplicate_invoice( $invoice ); |
|
426 | + $new_invoice->save(); |
|
427 | 427 | |
428 | - if ( $new_invoice->exists() ) { |
|
428 | + if ( $new_invoice->exists() ) { |
|
429 | 429 | |
430 | - getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'invoicing' ) ); |
|
430 | + getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'invoicing' ) ); |
|
431 | 431 | |
432 | - wp_safe_redirect( |
|
433 | - add_query_arg( |
|
434 | - array( |
|
435 | - 'action' => 'edit', |
|
436 | - 'post' => $new_invoice->get_id(), |
|
437 | - ), |
|
438 | - admin_url( 'post.php' ) |
|
439 | - ) |
|
440 | - ); |
|
441 | - exit; |
|
432 | + wp_safe_redirect( |
|
433 | + add_query_arg( |
|
434 | + array( |
|
435 | + 'action' => 'edit', |
|
436 | + 'post' => $new_invoice->get_id(), |
|
437 | + ), |
|
438 | + admin_url( 'post.php' ) |
|
439 | + ) |
|
440 | + ); |
|
441 | + exit; |
|
442 | 442 | |
443 | - } |
|
443 | + } |
|
444 | 444 | |
445 | - getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'invoicing' ) ); |
|
445 | + getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'invoicing' ) ); |
|
446 | 446 | |
447 | - } |
|
447 | + } |
|
448 | 448 | |
449 | - /** |
|
449 | + /** |
|
450 | 450 | * Refund an invoice. |
451 | - * |
|
452 | - * @param array $args |
|
451 | + * |
|
452 | + * @param array $args |
|
453 | 453 | */ |
454 | 454 | public function refund_invoice( $args ) { |
455 | 455 | |
456 | - if ( empty( $args['invoice_id'] ) ) { |
|
457 | - return; |
|
458 | - } |
|
459 | - |
|
460 | - $invoice = new WPInv_Invoice( (int) $args['invoice_id'] ); |
|
461 | - |
|
462 | - if ( ! $invoice->exists() || $invoice->is_refunded() ) { |
|
463 | - return; |
|
464 | - } |
|
465 | - |
|
466 | - $invoice->refund(); |
|
467 | - |
|
468 | - // Refund remotely. |
|
469 | - if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) && ! empty( $args['getpaid_refund_remote'] ) ) { |
|
470 | - do_action( 'getpaid_refund_invoice_remotely', $invoice ); |
|
471 | - } |
|
472 | - |
|
473 | - // Cancel subscriptions. |
|
474 | - if ( ! empty( $args['getpaid_cancel_subscription'] ) ) { |
|
475 | - $subscriptions = getpaid_get_invoice_subscriptions( $invoice ); |
|
476 | - |
|
477 | - if ( ! empty( $subscriptions ) ) { |
|
478 | - if ( ! is_array( $subscriptions ) ) { |
|
479 | - $subscriptions = array( $subscriptions ); |
|
480 | - } |
|
481 | - |
|
482 | - foreach ( $subscriptions as $subscription ) { |
|
483 | - $subscription->cancel(); |
|
484 | - $invoice->add_system_note( |
|
485 | - sprintf( |
|
486 | - // translators: %s: subscription ID. |
|
487 | - __( 'Subscription #%s cancelled', 'invoicing' ), |
|
488 | - $subscription->get_id() |
|
489 | - ) |
|
490 | - ); |
|
491 | - } |
|
492 | - } |
|
493 | - } |
|
494 | - |
|
495 | - // Add notice. |
|
496 | - $this->show_success( __( 'Invoice refunded successfully.', 'invoicing' ) ); |
|
497 | - |
|
498 | - // Redirect. |
|
499 | - wp_safe_redirect( |
|
500 | - remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote' ) ) |
|
501 | - ); |
|
502 | - } |
|
503 | - |
|
504 | - /** |
|
456 | + if ( empty( $args['invoice_id'] ) ) { |
|
457 | + return; |
|
458 | + } |
|
459 | + |
|
460 | + $invoice = new WPInv_Invoice( (int) $args['invoice_id'] ); |
|
461 | + |
|
462 | + if ( ! $invoice->exists() || $invoice->is_refunded() ) { |
|
463 | + return; |
|
464 | + } |
|
465 | + |
|
466 | + $invoice->refund(); |
|
467 | + |
|
468 | + // Refund remotely. |
|
469 | + if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) && ! empty( $args['getpaid_refund_remote'] ) ) { |
|
470 | + do_action( 'getpaid_refund_invoice_remotely', $invoice ); |
|
471 | + } |
|
472 | + |
|
473 | + // Cancel subscriptions. |
|
474 | + if ( ! empty( $args['getpaid_cancel_subscription'] ) ) { |
|
475 | + $subscriptions = getpaid_get_invoice_subscriptions( $invoice ); |
|
476 | + |
|
477 | + if ( ! empty( $subscriptions ) ) { |
|
478 | + if ( ! is_array( $subscriptions ) ) { |
|
479 | + $subscriptions = array( $subscriptions ); |
|
480 | + } |
|
481 | + |
|
482 | + foreach ( $subscriptions as $subscription ) { |
|
483 | + $subscription->cancel(); |
|
484 | + $invoice->add_system_note( |
|
485 | + sprintf( |
|
486 | + // translators: %s: subscription ID. |
|
487 | + __( 'Subscription #%s cancelled', 'invoicing' ), |
|
488 | + $subscription->get_id() |
|
489 | + ) |
|
490 | + ); |
|
491 | + } |
|
492 | + } |
|
493 | + } |
|
494 | + |
|
495 | + // Add notice. |
|
496 | + $this->show_success( __( 'Invoice refunded successfully.', 'invoicing' ) ); |
|
497 | + |
|
498 | + // Redirect. |
|
499 | + wp_safe_redirect( |
|
500 | + remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote' ) ) |
|
501 | + ); |
|
502 | + } |
|
503 | + |
|
504 | + /** |
|
505 | 505 | * Sends a payment reminder to a customer. |
506 | - * |
|
507 | - * @param array $args |
|
506 | + * |
|
507 | + * @param array $args |
|
508 | 508 | */ |
509 | 509 | public function duplicate_payment_form( $args ) { |
510 | 510 | |
511 | - if ( empty( $args['form_id'] ) ) { |
|
512 | - return; |
|
513 | - } |
|
514 | - |
|
515 | - $form = new GetPaid_Payment_Form( (int) $args['form_id'] ); |
|
511 | + if ( empty( $args['form_id'] ) ) { |
|
512 | + return; |
|
513 | + } |
|
516 | 514 | |
517 | - if ( ! $form->exists() ) { |
|
518 | - return; |
|
519 | - } |
|
515 | + $form = new GetPaid_Payment_Form( (int) $args['form_id'] ); |
|
520 | 516 | |
521 | - $new_form = new GetPaid_Payment_Form(); |
|
522 | - $new_form->set_author( $form->get_author( 'edit' ) ); |
|
523 | - $new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) ); |
|
524 | - $new_form->set_elements( $form->get_elements( 'edit' ) ); |
|
525 | - $new_form->set_items( $form->get_items( 'edit' ) ); |
|
526 | - $new_form->save(); |
|
517 | + if ( ! $form->exists() ) { |
|
518 | + return; |
|
519 | + } |
|
527 | 520 | |
528 | - if ( $new_form->exists() ) { |
|
529 | - $this->show_success( __( 'Form duplicated successfully', 'invoicing' ) ); |
|
530 | - $url = get_edit_post_link( $new_form->get_id(), 'edit' ); |
|
531 | - } else { |
|
532 | - $this->show_error( __( 'Unable to duplicate form', 'invoicing' ) ); |
|
533 | - $url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ); |
|
534 | - } |
|
521 | + $new_form = new GetPaid_Payment_Form(); |
|
522 | + $new_form->set_author( $form->get_author( 'edit' ) ); |
|
523 | + $new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) ); |
|
524 | + $new_form->set_elements( $form->get_elements( 'edit' ) ); |
|
525 | + $new_form->set_items( $form->get_items( 'edit' ) ); |
|
526 | + $new_form->save(); |
|
527 | + |
|
528 | + if ( $new_form->exists() ) { |
|
529 | + $this->show_success( __( 'Form duplicated successfully', 'invoicing' ) ); |
|
530 | + $url = get_edit_post_link( $new_form->get_id(), 'edit' ); |
|
531 | + } else { |
|
532 | + $this->show_error( __( 'Unable to duplicate form', 'invoicing' ) ); |
|
533 | + $url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ); |
|
534 | + } |
|
535 | 535 | |
536 | - wp_redirect( $url ); |
|
537 | - exit; |
|
538 | - } |
|
536 | + wp_redirect( $url ); |
|
537 | + exit; |
|
538 | + } |
|
539 | 539 | |
540 | - /** |
|
540 | + /** |
|
541 | 541 | * Resets form stats. |
542 | - * |
|
543 | - * @param array $args |
|
542 | + * |
|
543 | + * @param array $args |
|
544 | 544 | */ |
545 | 545 | public function reset_form_stats( $args ) { |
546 | 546 | |
547 | - if ( empty( $args['form_id'] ) ) { |
|
548 | - return; |
|
549 | - } |
|
547 | + if ( empty( $args['form_id'] ) ) { |
|
548 | + return; |
|
549 | + } |
|
550 | 550 | |
551 | - $form = new GetPaid_Payment_Form( (int) $args['form_id'] ); |
|
551 | + $form = new GetPaid_Payment_Form( (int) $args['form_id'] ); |
|
552 | 552 | |
553 | - if ( ! $form->exists() ) { |
|
554 | - return; |
|
555 | - } |
|
553 | + if ( ! $form->exists() ) { |
|
554 | + return; |
|
555 | + } |
|
556 | 556 | |
557 | - $form->set_earned( 0 ); |
|
558 | - $form->set_refunded( 0 ); |
|
559 | - $form->set_cancelled( 0 ); |
|
560 | - $form->set_failed( 0 ); |
|
561 | - $form->save(); |
|
557 | + $form->set_earned( 0 ); |
|
558 | + $form->set_refunded( 0 ); |
|
559 | + $form->set_cancelled( 0 ); |
|
560 | + $form->set_failed( 0 ); |
|
561 | + $form->save(); |
|
562 | 562 | |
563 | - $this->show_success( __( 'Form stats reset successfully', 'invoicing' ) ); |
|
563 | + $this->show_success( __( 'Form stats reset successfully', 'invoicing' ) ); |
|
564 | 564 | |
565 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ) ); |
|
566 | - exit; |
|
567 | - } |
|
565 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ) ); |
|
566 | + exit; |
|
567 | + } |
|
568 | 568 | |
569 | - /** |
|
569 | + /** |
|
570 | 570 | * Sends a payment reminder to a customer. |
571 | - * |
|
572 | - * @param array $args |
|
571 | + * |
|
572 | + * @param array $args |
|
573 | 573 | */ |
574 | 574 | public function send_customer_invoice( $args ) { |
575 | - getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true ); |
|
576 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) ); |
|
577 | - exit; |
|
578 | - } |
|
575 | + getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true ); |
|
576 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) ); |
|
577 | + exit; |
|
578 | + } |
|
579 | 579 | |
580 | - /** |
|
580 | + /** |
|
581 | 581 | * Sends a payment reminder to a customer. |
582 | - * |
|
583 | - * @param array $args |
|
582 | + * |
|
583 | + * @param array $args |
|
584 | 584 | */ |
585 | 585 | public function send_customer_payment_reminder( $args ) { |
586 | - $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) ); |
|
586 | + $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) ); |
|
587 | 587 | |
588 | - if ( $sent ) { |
|
589 | - $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) ); |
|
590 | - } else { |
|
591 | - $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) ); |
|
592 | - } |
|
588 | + if ( $sent ) { |
|
589 | + $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) ); |
|
590 | + } else { |
|
591 | + $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) ); |
|
592 | + } |
|
593 | 593 | |
594 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) ); |
|
595 | - exit; |
|
596 | - } |
|
594 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) ); |
|
595 | + exit; |
|
596 | + } |
|
597 | 597 | |
598 | - /** |
|
598 | + /** |
|
599 | 599 | * Resets tax rates. |
600 | - * |
|
600 | + * |
|
601 | 601 | */ |
602 | 602 | public function admin_reset_tax_rates() { |
603 | 603 | |
604 | - update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) ); |
|
605 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
606 | - exit; |
|
604 | + update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) ); |
|
605 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
606 | + exit; |
|
607 | 607 | |
608 | - } |
|
608 | + } |
|
609 | 609 | |
610 | - /** |
|
610 | + /** |
|
611 | 611 | * Resets admin pages. |
612 | - * |
|
612 | + * |
|
613 | 613 | */ |
614 | 614 | public function admin_create_missing_pages() { |
615 | - $installer = new GetPaid_Installer(); |
|
616 | - $installer->create_pages(); |
|
617 | - $this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) ); |
|
618 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
619 | - exit; |
|
620 | - } |
|
621 | - |
|
622 | - /** |
|
623 | - * Refreshes the permalinks. |
|
624 | - */ |
|
625 | - public function admin_refresh_permalinks() { |
|
626 | - flush_rewrite_rules(); |
|
627 | - $this->show_success( __( 'Permalinks refreshed.', 'invoicing' ) ); |
|
628 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
629 | - exit; |
|
630 | - } |
|
631 | - |
|
632 | - /** |
|
615 | + $installer = new GetPaid_Installer(); |
|
616 | + $installer->create_pages(); |
|
617 | + $this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) ); |
|
618 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
619 | + exit; |
|
620 | + } |
|
621 | + |
|
622 | + /** |
|
623 | + * Refreshes the permalinks. |
|
624 | + */ |
|
625 | + public function admin_refresh_permalinks() { |
|
626 | + flush_rewrite_rules(); |
|
627 | + $this->show_success( __( 'Permalinks refreshed.', 'invoicing' ) ); |
|
628 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
629 | + exit; |
|
630 | + } |
|
631 | + |
|
632 | + /** |
|
633 | 633 | * Creates missing admin tables. |
634 | - * |
|
634 | + * |
|
635 | 635 | */ |
636 | 636 | public function admin_create_missing_tables() { |
637 | - global $wpdb; |
|
637 | + global $wpdb; |
|
638 | 638 | |
639 | - GetPaid_Installer::create_db_tables(); |
|
640 | - GetPaid_Installer::migrate_old_customers(); |
|
639 | + GetPaid_Installer::create_db_tables(); |
|
640 | + GetPaid_Installer::migrate_old_customers(); |
|
641 | 641 | |
642 | - if ( '' !== $wpdb->last_error ) { |
|
643 | - $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error ); |
|
644 | - } else { |
|
645 | - $this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) ); |
|
646 | - } |
|
642 | + if ( '' !== $wpdb->last_error ) { |
|
643 | + $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error ); |
|
644 | + } else { |
|
645 | + $this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) ); |
|
646 | + } |
|
647 | 647 | |
648 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
649 | - exit; |
|
650 | - } |
|
648 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
649 | + exit; |
|
650 | + } |
|
651 | 651 | |
652 | - /** |
|
652 | + /** |
|
653 | 653 | * Migrates old invoices to the new database tables. |
654 | - * |
|
654 | + * |
|
655 | 655 | */ |
656 | 656 | public function admin_migrate_old_invoices() { |
657 | 657 | |
658 | - // Migrate the invoices. |
|
659 | - $installer = new GetPaid_Installer(); |
|
660 | - $installer->migrate_old_invoices(); |
|
658 | + // Migrate the invoices. |
|
659 | + $installer = new GetPaid_Installer(); |
|
660 | + $installer->migrate_old_invoices(); |
|
661 | 661 | |
662 | - // Show an admin message. |
|
663 | - $this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) ); |
|
662 | + // Show an admin message. |
|
663 | + $this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) ); |
|
664 | 664 | |
665 | - // Redirect the admin. |
|
666 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
667 | - exit; |
|
665 | + // Redirect the admin. |
|
666 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
667 | + exit; |
|
668 | 668 | |
669 | - } |
|
669 | + } |
|
670 | 670 | |
671 | - /** |
|
671 | + /** |
|
672 | 672 | * Download customers. |
673 | - * |
|
673 | + * |
|
674 | 674 | */ |
675 | 675 | public function admin_download_customers() { |
676 | 676 | |
677 | - $output = fopen( 'php://output', 'w' ); |
|
677 | + $output = fopen( 'php://output', 'w' ); |
|
678 | 678 | |
679 | - if ( false === $output ) { |
|
680 | - wp_die( esc_html__( 'Unsupported server', 'invoicing' ), 500 ); |
|
681 | - } |
|
679 | + if ( false === $output ) { |
|
680 | + wp_die( esc_html__( 'Unsupported server', 'invoicing' ), 500 ); |
|
681 | + } |
|
682 | 682 | |
683 | - header( 'Content-Type:text/csv' ); |
|
684 | - header( 'Content-Disposition:attachment;filename=customers.csv' ); |
|
683 | + header( 'Content-Type:text/csv' ); |
|
684 | + header( 'Content-Disposition:attachment;filename=customers.csv' ); |
|
685 | 685 | |
686 | - /** @var GetPaid_Customer[] $customers */ |
|
687 | - $customers = getpaid_get_customers( array( 'number' => -1 ) ); |
|
688 | - $columns = array_keys( GetPaid_Customer_Data_Store::get_database_fields() ); |
|
686 | + /** @var GetPaid_Customer[] $customers */ |
|
687 | + $customers = getpaid_get_customers( array( 'number' => -1 ) ); |
|
688 | + $columns = array_keys( GetPaid_Customer_Data_Store::get_database_fields() ); |
|
689 | 689 | |
690 | - // Output the csv column headers. |
|
691 | - fputcsv( $output, $columns ); |
|
690 | + // Output the csv column headers. |
|
691 | + fputcsv( $output, $columns ); |
|
692 | 692 | |
693 | - // Loop through |
|
694 | - foreach ( $customers as $customer ) { |
|
693 | + // Loop through |
|
694 | + foreach ( $customers as $customer ) { |
|
695 | 695 | |
696 | - $row = array(); |
|
696 | + $row = array(); |
|
697 | 697 | |
698 | - foreach ( $columns as $column ) { |
|
699 | - $row[] = (string) maybe_serialize( $customer->get( $column, 'edit' ) ); |
|
700 | - } |
|
698 | + foreach ( $columns as $column ) { |
|
699 | + $row[] = (string) maybe_serialize( $customer->get( $column, 'edit' ) ); |
|
700 | + } |
|
701 | 701 | |
702 | - fputcsv( $output, $row ); |
|
703 | - } |
|
702 | + fputcsv( $output, $row ); |
|
703 | + } |
|
704 | 704 | |
705 | - fclose( $output ); |
|
706 | - exit; |
|
705 | + fclose( $output ); |
|
706 | + exit; |
|
707 | 707 | |
708 | - } |
|
708 | + } |
|
709 | 709 | |
710 | - /** |
|
710 | + /** |
|
711 | 711 | * Installs a plugin. |
712 | - * |
|
713 | - * @param array $data |
|
712 | + * |
|
713 | + * @param array $data |
|
714 | 714 | */ |
715 | 715 | public function admin_install_plugin( $data ) { |
716 | 716 | |
717 | - if ( ! empty( $data['plugins'] ) ) { |
|
718 | - include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
|
719 | - wp_cache_flush(); |
|
717 | + if ( ! empty( $data['plugins'] ) ) { |
|
718 | + include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
|
719 | + wp_cache_flush(); |
|
720 | 720 | |
721 | - foreach ( $data['plugins'] as $slug => $file ) { |
|
722 | - $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' ); |
|
723 | - $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() ); |
|
724 | - $installed = $upgrader->install( $plugin_zip ); |
|
721 | + foreach ( $data['plugins'] as $slug => $file ) { |
|
722 | + $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' ); |
|
723 | + $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() ); |
|
724 | + $installed = $upgrader->install( $plugin_zip ); |
|
725 | 725 | |
726 | - if ( ! is_wp_error( $installed ) && $installed ) { |
|
727 | - activate_plugin( $file, '', false, true ); |
|
728 | - } else { |
|
729 | - wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false ); |
|
730 | - } |
|
726 | + if ( ! is_wp_error( $installed ) && $installed ) { |
|
727 | + activate_plugin( $file, '', false, true ); |
|
728 | + } else { |
|
729 | + wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false ); |
|
730 | + } |
|
731 | 731 | } |
732 | 732 | } |
733 | 733 | |
734 | - $redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' ); |
|
735 | - wp_safe_redirect( $redirect ); |
|
736 | - exit; |
|
734 | + $redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' ); |
|
735 | + wp_safe_redirect( $redirect ); |
|
736 | + exit; |
|
737 | 737 | |
738 | - } |
|
738 | + } |
|
739 | 739 | |
740 | - /** |
|
740 | + /** |
|
741 | 741 | * Connects a gateway. |
742 | - * |
|
743 | - * @param array $data |
|
742 | + * |
|
743 | + * @param array $data |
|
744 | 744 | */ |
745 | 745 | public function admin_connect_gateway( $data ) { |
746 | 746 | |
747 | - if ( ! empty( $data['plugin'] ) ) { |
|
747 | + if ( ! empty( $data['plugin'] ) ) { |
|
748 | 748 | |
749 | - $gateway = sanitize_key( $data['plugin'] ); |
|
750 | - $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data ); |
|
749 | + $gateway = sanitize_key( $data['plugin'] ); |
|
750 | + $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data ); |
|
751 | 751 | |
752 | - if ( ! empty( $connect_url ) ) { |
|
753 | - wp_redirect( $connect_url ); |
|
754 | - exit; |
|
755 | - } |
|
752 | + if ( ! empty( $connect_url ) ) { |
|
753 | + wp_redirect( $connect_url ); |
|
754 | + exit; |
|
755 | + } |
|
756 | 756 | |
757 | - if ( 'stripe' == $data['plugin'] ) { |
|
758 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
|
759 | - include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
|
760 | - wp_cache_flush(); |
|
757 | + if ( 'stripe' == $data['plugin'] ) { |
|
758 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
|
759 | + include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
|
760 | + wp_cache_flush(); |
|
761 | 761 | |
762 | - if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) { |
|
763 | - $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' ); |
|
764 | - $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() ); |
|
765 | - $upgrader->install( $plugin_zip ); |
|
766 | - } |
|
762 | + if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) { |
|
763 | + $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' ); |
|
764 | + $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() ); |
|
765 | + $upgrader->install( $plugin_zip ); |
|
766 | + } |
|
767 | 767 | |
768 | - activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true ); |
|
769 | - } |
|
768 | + activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true ); |
|
769 | + } |
|
770 | 770 | |
771 | - $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data ); |
|
772 | - if ( ! empty( $connect_url ) ) { |
|
773 | - wp_redirect( $connect_url ); |
|
774 | - exit; |
|
775 | - } |
|
771 | + $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data ); |
|
772 | + if ( ! empty( $connect_url ) ) { |
|
773 | + wp_redirect( $connect_url ); |
|
774 | + exit; |
|
775 | + } |
|
776 | 776 | } |
777 | 777 | |
778 | - $redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' ); |
|
779 | - wp_safe_redirect( $redirect ); |
|
780 | - exit; |
|
778 | + $redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' ); |
|
779 | + wp_safe_redirect( $redirect ); |
|
780 | + exit; |
|
781 | 781 | |
782 | - } |
|
782 | + } |
|
783 | 783 | |
784 | - /** |
|
784 | + /** |
|
785 | 785 | * Recalculates discounts. |
786 | - * |
|
786 | + * |
|
787 | 787 | */ |
788 | 788 | public function admin_recalculate_discounts() { |
789 | - global $wpdb; |
|
789 | + global $wpdb; |
|
790 | 790 | |
791 | - // Fetch all invoices that have discount codes. |
|
792 | - $table = $wpdb->prefix . 'getpaid_invoices'; |
|
793 | - $invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" ); |
|
791 | + // Fetch all invoices that have discount codes. |
|
792 | + $table = $wpdb->prefix . 'getpaid_invoices'; |
|
793 | + $invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" ); |
|
794 | 794 | |
795 | - foreach ( $invoices as $invoice ) { |
|
795 | + foreach ( $invoices as $invoice ) { |
|
796 | 796 | |
797 | - $invoice = new WPInv_Invoice( $invoice ); |
|
797 | + $invoice = new WPInv_Invoice( $invoice ); |
|
798 | 798 | |
799 | - if ( ! $invoice->exists() ) { |
|
800 | - continue; |
|
801 | - } |
|
799 | + if ( ! $invoice->exists() ) { |
|
800 | + continue; |
|
801 | + } |
|
802 | 802 | |
803 | - // Abort if the discount does not exist or does not apply here. |
|
804 | - $discount = new WPInv_Discount( $invoice->get_discount_code() ); |
|
805 | - if ( ! $discount->exists() ) { |
|
806 | - continue; |
|
807 | - } |
|
803 | + // Abort if the discount does not exist or does not apply here. |
|
804 | + $discount = new WPInv_Discount( $invoice->get_discount_code() ); |
|
805 | + if ( ! $discount->exists() ) { |
|
806 | + continue; |
|
807 | + } |
|
808 | 808 | |
809 | - $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) ); |
|
810 | - $invoice->recalculate_total(); |
|
809 | + $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) ); |
|
810 | + $invoice->recalculate_total(); |
|
811 | 811 | |
812 | - if ( $invoice->get_total_discount() > 0 ) { |
|
813 | - $invoice->save(); |
|
814 | - } |
|
812 | + if ( $invoice->get_total_discount() > 0 ) { |
|
813 | + $invoice->save(); |
|
814 | + } |
|
815 | 815 | } |
816 | 816 | |
817 | - // Show an admin message. |
|
818 | - $this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) ); |
|
817 | + // Show an admin message. |
|
818 | + $this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) ); |
|
819 | 819 | |
820 | - // Redirect the admin. |
|
821 | - wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
822 | - exit; |
|
820 | + // Redirect the admin. |
|
821 | + wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) ); |
|
822 | + exit; |
|
823 | 823 | |
824 | - } |
|
824 | + } |
|
825 | 825 | |
826 | 826 | /** |
827 | - * Returns an array of admin notices. |
|
828 | - * |
|
829 | - * @since 1.0.19 |
|
827 | + * Returns an array of admin notices. |
|
828 | + * |
|
829 | + * @since 1.0.19 |
|
830 | 830 | * @return array |
831 | - */ |
|
832 | - public function get_notices() { |
|
833 | - $notices = get_option( 'wpinv_admin_notices' ); |
|
831 | + */ |
|
832 | + public function get_notices() { |
|
833 | + $notices = get_option( 'wpinv_admin_notices' ); |
|
834 | 834 | return is_array( $notices ) ? $notices : array(); |
835 | - } |
|
835 | + } |
|
836 | 836 | |
837 | - /** |
|
838 | - * Checks if we have any admin notices. |
|
839 | - * |
|
840 | - * @since 2.0.4 |
|
837 | + /** |
|
838 | + * Checks if we have any admin notices. |
|
839 | + * |
|
840 | + * @since 2.0.4 |
|
841 | 841 | * @return array |
842 | - */ |
|
843 | - public function has_notices() { |
|
844 | - return count( $this->get_notices() ) > 0; |
|
845 | - } |
|
846 | - |
|
847 | - /** |
|
848 | - * Clears all admin notices |
|
849 | - * |
|
850 | - * @access public |
|
851 | - * @since 1.0.19 |
|
852 | - */ |
|
853 | - public function clear_notices() { |
|
854 | - delete_option( 'wpinv_admin_notices' ); |
|
855 | - } |
|
856 | - |
|
857 | - /** |
|
858 | - * Saves a new admin notice |
|
859 | - * |
|
860 | - * @access public |
|
861 | - * @since 1.0.19 |
|
862 | - */ |
|
863 | - public function save_notice( $type, $message ) { |
|
864 | - $notices = $this->get_notices(); |
|
865 | - |
|
866 | - if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ] ) ) { |
|
867 | - $notices[ $type ] = array(); |
|
868 | - } |
|
869 | - |
|
870 | - $notices[ $type ][] = $message; |
|
871 | - |
|
872 | - update_option( 'wpinv_admin_notices', $notices ); |
|
873 | - } |
|
874 | - |
|
875 | - /** |
|
876 | - * Displays a success notice |
|
877 | - * |
|
878 | - * @param string $msg The message to qeue. |
|
879 | - * @access public |
|
880 | - * @since 1.0.19 |
|
881 | - */ |
|
882 | - public function show_success( $msg ) { |
|
883 | - $this->save_notice( 'success', $msg ); |
|
884 | - } |
|
885 | - |
|
886 | - /** |
|
887 | - * Displays a error notice |
|
888 | - * |
|
889 | - * @access public |
|
890 | - * @param string $msg The message to qeue. |
|
891 | - * @since 1.0.19 |
|
892 | - */ |
|
893 | - public function show_error( $msg ) { |
|
894 | - $this->save_notice( 'error', $msg ); |
|
895 | - } |
|
896 | - |
|
897 | - /** |
|
898 | - * Displays a warning notice |
|
899 | - * |
|
900 | - * @access public |
|
901 | - * @param string $msg The message to qeue. |
|
902 | - * @since 1.0.19 |
|
903 | - */ |
|
904 | - public function show_warning( $msg ) { |
|
905 | - $this->save_notice( 'warning', $msg ); |
|
906 | - } |
|
907 | - |
|
908 | - /** |
|
909 | - * Displays a info notice |
|
910 | - * |
|
911 | - * @access public |
|
912 | - * @param string $msg The message to qeue. |
|
913 | - * @since 1.0.19 |
|
914 | - */ |
|
915 | - public function show_info( $msg ) { |
|
916 | - $this->save_notice( 'info', $msg ); |
|
917 | - } |
|
918 | - |
|
919 | - /** |
|
920 | - * Show notices |
|
921 | - * |
|
922 | - * @access public |
|
923 | - * @since 1.0.19 |
|
924 | - */ |
|
925 | - public function show_notices() { |
|
842 | + */ |
|
843 | + public function has_notices() { |
|
844 | + return count( $this->get_notices() ) > 0; |
|
845 | + } |
|
846 | + |
|
847 | + /** |
|
848 | + * Clears all admin notices |
|
849 | + * |
|
850 | + * @access public |
|
851 | + * @since 1.0.19 |
|
852 | + */ |
|
853 | + public function clear_notices() { |
|
854 | + delete_option( 'wpinv_admin_notices' ); |
|
855 | + } |
|
856 | + |
|
857 | + /** |
|
858 | + * Saves a new admin notice |
|
859 | + * |
|
860 | + * @access public |
|
861 | + * @since 1.0.19 |
|
862 | + */ |
|
863 | + public function save_notice( $type, $message ) { |
|
864 | + $notices = $this->get_notices(); |
|
865 | + |
|
866 | + if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ] ) ) { |
|
867 | + $notices[ $type ] = array(); |
|
868 | + } |
|
869 | + |
|
870 | + $notices[ $type ][] = $message; |
|
871 | + |
|
872 | + update_option( 'wpinv_admin_notices', $notices ); |
|
873 | + } |
|
874 | + |
|
875 | + /** |
|
876 | + * Displays a success notice |
|
877 | + * |
|
878 | + * @param string $msg The message to qeue. |
|
879 | + * @access public |
|
880 | + * @since 1.0.19 |
|
881 | + */ |
|
882 | + public function show_success( $msg ) { |
|
883 | + $this->save_notice( 'success', $msg ); |
|
884 | + } |
|
885 | + |
|
886 | + /** |
|
887 | + * Displays a error notice |
|
888 | + * |
|
889 | + * @access public |
|
890 | + * @param string $msg The message to qeue. |
|
891 | + * @since 1.0.19 |
|
892 | + */ |
|
893 | + public function show_error( $msg ) { |
|
894 | + $this->save_notice( 'error', $msg ); |
|
895 | + } |
|
896 | + |
|
897 | + /** |
|
898 | + * Displays a warning notice |
|
899 | + * |
|
900 | + * @access public |
|
901 | + * @param string $msg The message to qeue. |
|
902 | + * @since 1.0.19 |
|
903 | + */ |
|
904 | + public function show_warning( $msg ) { |
|
905 | + $this->save_notice( 'warning', $msg ); |
|
906 | + } |
|
907 | + |
|
908 | + /** |
|
909 | + * Displays a info notice |
|
910 | + * |
|
911 | + * @access public |
|
912 | + * @param string $msg The message to qeue. |
|
913 | + * @since 1.0.19 |
|
914 | + */ |
|
915 | + public function show_info( $msg ) { |
|
916 | + $this->save_notice( 'info', $msg ); |
|
917 | + } |
|
918 | + |
|
919 | + /** |
|
920 | + * Show notices |
|
921 | + * |
|
922 | + * @access public |
|
923 | + * @since 1.0.19 |
|
924 | + */ |
|
925 | + public function show_notices() { |
|
926 | 926 | |
927 | 927 | $notices = $this->get_notices(); |
928 | 928 | $this->clear_notices(); |
929 | 929 | |
930 | - foreach ( $notices as $type => $messages ) { |
|
930 | + foreach ( $notices as $type => $messages ) { |
|
931 | 931 | |
932 | - if ( ! is_array( $messages ) ) { |
|
933 | - continue; |
|
934 | - } |
|
932 | + if ( ! is_array( $messages ) ) { |
|
933 | + continue; |
|
934 | + } |
|
935 | 935 | |
936 | 936 | $type = esc_attr( $type ); |
937 | - foreach ( $messages as $message ) { |
|
938 | - echo wp_kses_post( "<div class='notice notice-$type is-dismissible'><p>$message</p></div>" ); |
|
937 | + foreach ( $messages as $message ) { |
|
938 | + echo wp_kses_post( "<div class='notice notice-$type is-dismissible'><p>$message</p></div>" ); |
|
939 | 939 | } |
940 | 940 | } |
941 | 941 | |
942 | - foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) { |
|
943 | - |
|
944 | - if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) { |
|
945 | - $url = wp_nonce_url( |
|
946 | - add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ), |
|
947 | - 'getpaid-nonce', |
|
948 | - 'getpaid-nonce' |
|
949 | - ); |
|
950 | - $message = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' ); |
|
951 | - $message2 = __( 'Generate Pages', 'invoicing' ); |
|
952 | - echo wp_kses_post( "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>" ); |
|
953 | - break; |
|
954 | - } |
|
942 | + foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) { |
|
943 | + |
|
944 | + if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) { |
|
945 | + $url = wp_nonce_url( |
|
946 | + add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ), |
|
947 | + 'getpaid-nonce', |
|
948 | + 'getpaid-nonce' |
|
949 | + ); |
|
950 | + $message = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' ); |
|
951 | + $message2 = __( 'Generate Pages', 'invoicing' ); |
|
952 | + echo wp_kses_post( "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>" ); |
|
953 | + break; |
|
954 | + } |
|
955 | 955 | } |
956 | 956 | |
957 | - } |
|
957 | + } |
|
958 | 958 | |
959 | 959 | } |