| @@ -78,9 +78,9 @@ | ||
| 78 | 78 | private function pro_core_fields() { |
| 79 | 79 | return [ |
| 80 | 80 | [ |
| 81 | 81 | 'type' => 'select', |
| 82 | - 'group' => 'main', | |
| 82 | + 'group' => 'renewals', | |
| 83 | 83 | 'priority' => 7, |
| 84 | 84 | 'field_data' => [ |
| 85 | 85 | 'id' => 'subscrpt_renewal_price', |
| 86 | 86 | 'title' => __( 'Renewal Price', 'subscription' ), |
| @@ -93,9 +93,9 @@ | ||
| 93 | 93 | ], |
| 94 | 94 | ], |
| 95 | 95 | [ |
| 96 | 96 | 'type' => 'toggle', |
| 97 | - 'group' => 'main', | |
| 97 | + 'group' => 'renewals', | |
| 98 | 98 | 'priority' => 8, |
| 99 | 99 | 'field_data' => [ |
| 100 | 100 | 'id' => 'subscrpt_early_renew', |
| 101 | 101 | 'title' => __( 'Early Renewal', 'subscription' ), |
| @@ -117,9 +117,9 @@ | ||
| 117 | 117 | return [ |
| 118 | 118 | [ |
| 119 | 119 | 'type' => 'heading', |
| 120 | 120 | 'group' => 'grace_period', |
| 121 | - 'priority' => 3, | |
| 121 | + 'priority' => 5, | |
| 122 | 122 | 'field_data' => [ |
| 123 | 123 | 'title' => __( 'Grace Period Settings', 'subscription' ), |
| 124 | 124 | ], |
| 125 | 125 | ], |
| @@ -180,9 +180,9 @@ | ||
| 180 | 180 | return [ |
| 181 | 181 | [ |
| 182 | 182 | 'type' => 'heading', |
| 183 | 183 | 'group' => 'payment_failure', |
| 184 | - 'priority' => 4, | |
| 184 | + 'priority' => 6, | |
| 185 | 185 | 'field_data' => [ |
| 186 | 186 | 'title' => __( 'Payment Failure Handling', 'subscription' ), |
| 187 | 187 | ], |
| 188 | 188 | ], |
| @@ -316,9 +316,9 @@ | ||
| 316 | 316 | return [ |
| 317 | 317 | [ |
| 318 | 318 | 'type' => 'heading', |
| 319 | 319 | 'group' => 'health_queue', |
| 320 | - 'priority' => 8, | |
| 320 | + 'priority' => 9, | |
| 321 | 321 | 'field_data' => [ |
| 322 | 322 | 'title' => __( 'Subscription Health', 'subscription' ), |
| 323 | 323 | ], |
| 324 | 324 | ], |
| @@ -360,8 +360,21 @@ | ||
| 360 | 360 | 'value' => '1', |
| 361 | 361 | 'checked' => '1' === get_option( 'wp_subscription_auto_complete_order', '1' ), |
| 362 | 362 | ], |
| 363 | 363 | ], |
| 364 | + [ | |
| 365 | + 'type' => 'toggle', | |
| 366 | + 'group' => 'payment_gateways', | |
| 367 | + 'priority' => 2, | |
| 368 | + 'field_data' => [ | |
| 369 | + 'id' => 'subscrpt_require_payment_on_trial', | |
| 370 | + 'title' => __( 'Require Payment for Free Trials', 'subscription' ), | |
| 371 | + 'label' => __( 'Collect payment details at checkout for trial subscriptions', 'subscription' ), | |
| 372 | + 'description' => __( 'Collect payment details up front on free trials so renewals charge automatically.', 'subscription' ), | |
| 373 | + 'value' => '1', | |
| 374 | + 'checked' => '1' === get_option( 'subscrpt_require_payment_on_trial', '1' ), | |
| 375 | + ], | |
| 376 | + ], | |
| 364 | 377 | ]; |
| 365 | 378 | } |
| 366 | 379 | |
| 367 | 380 | /** |
| @@ -371,10 +384,18 @@ | ||
| 371 | 384 | */ |
| 372 | 385 | private function switch_fields() { |
| 373 | 386 | return [ |
| 374 | 387 | [ |
| 388 | + 'type' => 'heading', | |
| 389 | + 'group' => 'switching', | |
| 390 | + 'priority' => 3, | |
| 391 | + 'field_data' => [ | |
| 392 | + 'title' => __( 'Switching & Upgrades', 'subscription' ), | |
| 393 | + ], | |
| 394 | + ], | |
| 395 | + [ | |
| 375 | 396 | 'type' => 'toggle', |
| 376 | - 'group' => 'general', | |
| 397 | + 'group' => 'switching', | |
| 377 | 398 | 'priority' => 9, |
| 378 | 399 | 'field_data' => [ |
| 379 | 400 | 'id' => 'subscrpt_switch_enabled', |
| 380 | 401 | 'title' => __( 'Switch Subscription', 'subscription' ), |
| @@ -385,9 +406,9 @@ | ||
| 385 | 406 | ], |
| 386 | 407 | ], |
| 387 | 408 | [ |
| 388 | 409 | 'type' => 'toggle', |
| 389 | - 'group' => 'general', | |
| 410 | + 'group' => 'switching', | |
| 390 | 411 | 'priority' => 10, |
| 391 | 412 | 'field_data' => [ |
| 392 | 413 | 'id' => 'subscrpt_downgrade_allowed', |
| 393 | 414 | 'title' => __( 'Downgrade Subscription', 'subscription' ), |
| @@ -398,9 +419,9 @@ | ||
| 398 | 419 | ], |
| 399 | 420 | ], |
| 400 | 421 | [ |
| 401 | 422 | 'type' => 'join', |
| 402 | - 'group' => 'general', | |
| 423 | + 'group' => 'switching', | |
| 403 | 424 | 'priority' => 11, |
| 404 | 425 | 'field_data' => [ |
| 405 | 426 | 'title' => __( 'Switch Fee', 'subscription' ), |
| 406 | 427 | 'description' => __( 'Optional fee charged when a customer switches plans. Use a flat amount or a percentage of the new plan price. (0 = no fee)', 'subscription' ), |
| @@ -438,9 +459,9 @@ | ||
| 438 | 459 | ], |
| 439 | 460 | ], |
| 440 | 461 | [ |
| 441 | 462 | 'type' => 'select', |
| 442 | - 'group' => 'general', | |
| 463 | + 'group' => 'switching', | |
| 443 | 464 | 'priority' => 12, |
| 444 | 465 | 'field_data' => [ |
| 445 | 466 | 'id' => 'subscrpt_switch_fee_apply_to', |
| 446 | 467 | 'title' => __( 'Apply Fee To', 'subscription' ), |
| @@ -465,9 +486,9 @@ | ||
| 465 | 486 | return [ |
| 466 | 487 | [ |
| 467 | 488 | 'type' => 'heading', |
| 468 | 489 | 'group' => 'role_based_settings', |
| 469 | - 'priority' => 6, | |
| 490 | + 'priority' => 7, | |
| 470 | 491 | 'field_data' => [ |
| 471 | 492 | 'title' => __( 'Role-Based Settings', 'subscription' ), |
| 472 | 493 | ], |
| 473 | 494 | ], |
| @@ -495,9 +516,9 @@ | ||
| 495 | 516 | return [ |
| 496 | 517 | [ |
| 497 | 518 | 'type' => 'heading', |
| 498 | 519 | 'group' => 'live_qr_settings', |
| 499 | - 'priority' => 5, | |
| 520 | + 'priority' => 8, | |
| 500 | 521 | 'field_data' => [ |
| 501 | 522 | 'title' => __( 'Quick Details QR Settings', 'subscription' ), |
| 502 | 523 | ], |
| 503 | 524 | ], |
| @@ -568,9 +589,9 @@ | ||
| 568 | 589 | return [ |
| 569 | 590 | [ |
| 570 | 591 | 'type' => 'heading', |
| 571 | 592 | 'group' => 'payment_gateways', |
| 572 | - 'priority' => 0.1, | |
| 593 | + 'priority' => 1, | |
| 573 | 594 | 'field_data' => [ |
| 574 | 595 | 'title' => __( 'Payment Gateway Settings', 'subscription' ), |
| 575 | 596 | ], |
| 576 | 597 | ], |
