| @@ -28,26 +28,13 @@ | ||
| 28 | 28 | return false; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | $full_screen_value = $is_full_screen ? 'On' : 'Off'; |
| 32 | - $cookie_path = ( defined( 'COOKIEPATH' ) && COOKIEPATH ) ? COOKIEPATH : '/'; | |
| 33 | - $cookie_domain = defined( 'COOKIE_DOMAIN' ) ? COOKIE_DOMAIN : ''; | |
| 34 | 32 | |
| 35 | - if ( ! headers_sent() ) { | |
| 36 | - setcookie( | |
| 37 | - 'wpbc_admin_full_screen', | |
| 38 | - $full_screen_value, | |
| 39 | - time() + YEAR_IN_SECONDS, | |
| 40 | - $cookie_path, | |
| 41 | - $cookie_domain, | |
| 42 | - is_ssl(), | |
| 43 | - false | |
| 44 | - ); | |
| 33 | + if ( function_exists( 'wpbc_ui__set_full_screen_mode_cookie' ) ) { | |
| 34 | + wpbc_ui__set_full_screen_mode_cookie( $full_screen_value ); | |
| 45 | 35 | } |
| 46 | 36 | |
| 47 | - // Keep cookie-aware page rendering deterministic during the current request. | |
| 48 | - $_COOKIE['wpbc_admin_full_screen'] = $full_screen_value; | |
| 49 | - | |
| 50 | 37 | return update_user_option( |
| 51 | 38 | $user_id, |
| 52 | 39 | 'booking_custom_is_full_screen', |
| 53 | 40 | array( 'value' => $full_screen_value ) |
| @@ -307,9 +294,29 @@ | ||
| 307 | 294 | $profile = ( null === $profile ) ? wpbc_setup_wizard__get_selected_profile() : $profile; |
| 308 | 295 | $mode_id = wpbc_setup_wizard__get_selected_mode_id(); |
| 309 | 296 | $route_map = wpbc_setup_wizard__get_profile_route_map(); |
| 310 | 297 | |
| 311 | - if ( 'appointment' === $mode_id ) { | |
| 298 | + /** | |
| 299 | + * Filter whether Setup temporarily ends with a Form Builder handoff. | |
| 300 | + * | |
| 301 | + * The compact route keeps the four introductory screens and uses Form | |
| 302 | + * Builder as the fifth and final destination. Returning false restores the | |
| 303 | + * longer mode-aware route while it remains available for compatibility. | |
| 304 | + * | |
| 305 | + * @param bool $is_enabled Whether the compact Form Builder handoff is enabled. | |
| 306 | + * @param string $mode_id Active administration mode. | |
| 307 | + * @param string $profile Selected booking behavior profile. | |
| 308 | + */ | |
| 309 | + $is_compact_form_builder_handoff = (bool) apply_filters( | |
| 310 | + 'wpbc_setup_wizard_compact_form_builder_handoff_enabled', | |
| 311 | + true, | |
| 312 | + $mode_id, | |
| 313 | + $profile | |
| 314 | + ); | |
| 315 | + | |
| 316 | + if ( $is_compact_form_builder_handoff ) { | |
| 317 | + $route = array( 'form_structure' ); | |
| 318 | + } elseif ( 'appointment' === $mode_id ) { | |
| 312 | 319 | $route = array( |
| 313 | 320 | 'service_provider', |
| 314 | 321 | 'working_time', |
| 315 | 322 | 'date_availability', |
| @@ -621,9 +628,9 @@ | ||
| 621 | 628 | return __( 'Open a published Property booking page to test the Rental flow. If no page is listed, run Rental QuickStart or publish the booking form first.', 'booking' ); |
| 622 | 629 | } |
| 623 | 630 | |
| 624 | 631 | if ( 'date_availability' === $step_name && 'appointment' === $mode_id ) { |
| 625 | - return __( 'Use the canonical Days Availability calendar to block holidays, leave, and other Provider-specific exceptions.', 'booking' ); | |
| 632 | + return __( 'Use the Block Dates calendar to block holidays, leave, and other Provider-specific exceptions.', 'booking' ); | |
| 626 | 633 | } |
| 627 | 634 | |
| 628 | 635 | $step_descriptions = array( |
| 629 | 636 | 'welcome' => __( 'Begin the guided setup. You can leave the wizard at any time and continue later from the setup bar.', 'booking' ), |
