| @@ -113,9 +113,9 @@ | ||
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | 115 | * Persist the "Switch to New UI" dismissal for the current user. |
| 116 | 116 | * |
| 117 | - * Writes the same `notice-dismissed` user_meta key that Astra_Notices uses | |
| 117 | + * Writes the same `notice-dismissed` user_meta key that BSF_Admin_Notices uses | |
| 118 | 118 | * so the WP admin_notices banner and the React-shell banner stay in sync — |
| 119 | 119 | * dismissing either one hides both on the next load. |
| 120 | 120 | * |
| 121 | 121 | * @since 2.2.4 |
| @@ -328,9 +328,9 @@ | ||
| 328 | 328 | </a> |
| 329 | 329 | |
| 330 | 330 | <a href="#" class="astra-notice-close astra-review-notice"> |
| 331 | 331 | <span class="dashicons dashicons-smiley"></span> |
| 332 | - <u>%8$s</u> | |
| 332 | + %8$s | |
| 333 | 333 | </a> |
| 334 | 334 | </div> |
| 335 | 335 | </div>', |
| 336 | 336 | $image_path, |
| @@ -347,9 +347,9 @@ | ||
| 347 | 347 | ) |
| 348 | 348 | ); |
| 349 | 349 | |
| 350 | 350 | // CartFlows 3.0 — soft notice inviting legacy users to opt into the new admin UI. |
| 351 | - // Registered through Astra_Notices so it inherits the standard notice | |
| 351 | + // Registered through BSF_Admin_Notices so it inherits the standard notice | |
| 352 | 352 | // design, dismiss handling and per-user storage the rest of CartFlows uses. |
| 353 | 353 | if ( $this->is_new_ui_notice_visible() ) { |
| 354 | 354 | $this->enqueue_new_ui_notice_assets(); |
| 355 | 355 | |
| @@ -618,9 +618,9 @@ | ||
| 618 | 618 | if ( ! defined( 'CARTFLOWS_LEGACY_ADMIN' ) || ! CARTFLOWS_LEGACY_ADMIN ) { |
| 619 | 619 | return false; |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | - // Astra_Notices' own astra-notice-close JS writes 'notice-dismissed' to | |
| 622 | + // BSF_Admin_Notices' own astra-notice-close JS writes 'notice-dismissed' to | |
| 623 | 623 | // this user_meta key when the user dismisses the notice. |
| 624 | 624 | if ( 'notice-dismissed' === get_user_meta( get_current_user_id(), 'cartflows-switch-to-new-ui-notice', true ) ) { |
| 625 | 625 | return false; |
| 626 | 626 | } |
| @@ -745,22 +745,19 @@ | ||
| 745 | 745 | public function should_display_nps_survey_notice() { |
| 746 | 746 | |
| 747 | 747 | $is_store_checkout_imported = (bool) get_option( '_cartflows_wizard_store_checkout_set', false ); |
| 748 | 748 | $onboarding_completed = (bool) get_option( 'wcf_setup_complete', false ); |
| 749 | - $is_first_funnel_imported = (bool) get_option( 'wcf_first_flow_imported', false ); | |
| 750 | 749 | $total_funnels = $this->get_published_flow_count(); |
| 751 | 750 | |
| 752 | 751 | /** |
| 753 | - * Show the notice in any of these conditions: | |
| 752 | + * Show the notice in either of these conditions: | |
| 754 | 753 | * 1. User finished the onboarding wizard AND imported the store checkout funnel. |
| 755 | - * 2. User imported their first funnel AND has at least one published funnel. | |
| 756 | - * 3. User has at least one published funnel (built manually). | |
| 757 | - * | |
| 758 | - * Note: condition 3 intentionally has NO upper bound on funnel count, | |
| 759 | - * so power users with many funnels still see the survey. | |
| 754 | + * 2. User has at least one published funnel — imported or built by hand. This has | |
| 755 | + * NO upper bound on funnel count, so power users still see the survey, and it | |
| 756 | + * subsumes the old "imported their first funnel" branch. | |
| 760 | 757 | */ |
| 761 | 758 | return ( true === $is_store_checkout_imported && true === $onboarding_completed ) |
| 762 | - || ( true === $is_first_funnel_imported && ! empty( $total_funnels ) && 1 >= $total_funnels ); | |
| 759 | + || ! empty( $total_funnels ); | |
| 763 | 760 | } |
| 764 | 761 | } |
| 765 | 762 | |
| 766 | 763 | Cartflows_Admin_Notices::get_instance(); |
