rebase on oct-10-2023
This commit is contained in:
@@ -35,7 +35,7 @@ class CouponPageMoved {
|
||||
|
||||
add_action( 'admin_init', [ $this, 'possibly_add_note' ] );
|
||||
add_action( 'admin_init', [ $this, 'redirect_to_coupons' ] );
|
||||
add_action( 'woocommerce_admin_newly_installed', [ $this, 'disable_legacy_menu_for_new_install' ] );
|
||||
add_action( 'woocommerce_newly_installed', [ $this, 'disable_legacy_menu_for_new_install' ] );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace Automattic\WooCommerce\Internal\Admin\Notes;
|
||||
|
||||
use Automattic\WooCommerce\Admin\Notes\Note;
|
||||
use Automattic\WooCommerce\Admin\Notes\NoteTraits;
|
||||
use Automattic\WooCommerce\Admin\PluginsHelper;
|
||||
use Automattic\WooCommerce\Internal\Admin\WcPayWelcomePage;
|
||||
|
||||
defined( 'ABSPATH' ) || exit;
|
||||
|
||||
@@ -38,19 +38,13 @@ class PaymentsMoreInfoNeeded {
|
||||
* @return bool
|
||||
*/
|
||||
public static function should_display_note() {
|
||||
// If user has installed WCPay, don't show this note.
|
||||
$installed_plugins = PluginsHelper::get_installed_plugin_slugs();
|
||||
if ( in_array( 'woocommerce-payments', $installed_plugins, true ) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// User has dismissed the WCPay Welcome Page.
|
||||
if ( 'yes' !== get_option( 'wc_calypso_bridge_payments_dismissed', 'no' ) ) {
|
||||
// WCPay welcome page must not be visible.
|
||||
if ( WcPayWelcomePage::instance()->must_be_visible() ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// More than 30 days since viewing the welcome page.
|
||||
$exit_survey_timestamp = get_option( 'wc_pay_exit_survey_more_info_needed_timestamp', false );
|
||||
$exit_survey_timestamp = get_option( 'wcpay_welcome_page_exit_survey_more_info_needed_timestamp', false );
|
||||
if ( ! $exit_survey_timestamp ||
|
||||
( time() - $exit_survey_timestamp < 30 * DAY_IN_SECONDS )
|
||||
) {
|
||||
@@ -69,10 +63,10 @@ class PaymentsMoreInfoNeeded {
|
||||
if ( ! self::should_display_note() ) {
|
||||
return;
|
||||
}
|
||||
$content = __( 'We recently asked you if you wanted more information about WooCommerce Payments. Run your business and manage your payments in one place with the solution built and supported by WooCommerce.', 'woocommerce' );
|
||||
$content = __( 'We recently asked you if you wanted more information about WooPayments. Run your business and manage your payments in one place with the solution built and supported by WooCommerce.', 'woocommerce' );
|
||||
|
||||
$note = new Note();
|
||||
$note->set_title( __( 'Payments made simple with WooCommerce Payments', 'woocommerce' ) );
|
||||
$note->set_title( __( 'Payments made simple with WooPayments', 'woocommerce' ) );
|
||||
$note->set_content( $content );
|
||||
$note->set_content_data( (object) array() );
|
||||
$note->set_type( Note::E_WC_ADMIN_NOTE_INFORMATIONAL );
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace Automattic\WooCommerce\Internal\Admin\Notes;
|
||||
|
||||
use Automattic\WooCommerce\Admin\Notes\Note;
|
||||
use Automattic\WooCommerce\Admin\Notes\NoteTraits;
|
||||
use Automattic\WooCommerce\Admin\PluginsHelper;
|
||||
use Automattic\WooCommerce\Internal\Admin\WcPayWelcomePage;
|
||||
|
||||
defined( 'ABSPATH' ) || exit;
|
||||
|
||||
@@ -38,18 +38,13 @@ class PaymentsRemindMeLater {
|
||||
* @return bool
|
||||
*/
|
||||
public static function should_display_note() {
|
||||
// Installed WCPay.
|
||||
$installed_plugins = PluginsHelper::get_installed_plugin_slugs();
|
||||
if ( in_array( 'woocommerce-payments', $installed_plugins, true ) ) {
|
||||
return false;
|
||||
}
|
||||
// Dismissed WCPay welcome page.
|
||||
if ( 'yes' === get_option( 'wc_calypso_bridge_payments_dismissed', 'no' ) ) {
|
||||
// WCPay welcome page must be visible.
|
||||
if ( ! WcPayWelcomePage::instance()->must_be_visible() ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Less than 3 days since viewing welcome page.
|
||||
$view_timestamp = get_option( 'wc_pay_welcome_page_viewed_timestamp', false );
|
||||
$view_timestamp = get_option( 'wcpay_welcome_page_viewed_timestamp', false );
|
||||
if ( ! $view_timestamp ||
|
||||
( time() - $view_timestamp < 3 * DAY_IN_SECONDS )
|
||||
) {
|
||||
@@ -68,10 +63,10 @@ class PaymentsRemindMeLater {
|
||||
if ( ! self::should_display_note() ) {
|
||||
return;
|
||||
}
|
||||
$content = __( 'Save up to $800 in fees by managing transactions with WooCommerce Payments. With WooCommerce Payments, you can securely accept major cards, Apple Pay, and payments in over 100 currencies.', 'woocommerce' );
|
||||
$content = __( 'Save up to $800 in fees by managing transactions with WooPayments. With WooPayments, you can securely accept major cards, Apple Pay, and payments in over 100 currencies.', 'woocommerce' );
|
||||
|
||||
$note = new Note();
|
||||
$note->set_title( __( 'Save big with WooCommerce Payments', 'woocommerce' ) );
|
||||
$note->set_title( __( 'Save big with WooPayments', 'woocommerce' ) );
|
||||
$note->set_content( $content );
|
||||
$note->set_content_data( (object) array() );
|
||||
$note->set_type( Note::E_WC_ADMIN_NOTE_INFORMATIONAL );
|
||||
|
||||
@@ -105,7 +105,7 @@ class WooCommercePayments {
|
||||
$note = new Note();
|
||||
$note->set_title( __( 'Try the new way to get paid', 'woocommerce' ) );
|
||||
$note->set_content(
|
||||
__( 'Securely accept credit and debit cards on your site. Manage transactions without leaving your WordPress dashboard. Only with <strong>WooCommerce Payments</strong>.', 'woocommerce' ) .
|
||||
__( 'Securely accept credit and debit cards on your site. Manage transactions without leaving your WordPress dashboard. Only with <strong>WooPayments</strong>.', 'woocommerce' ) .
|
||||
'<br><br>' .
|
||||
sprintf(
|
||||
/* translators: 1: opening link tag, 2: closing tag */
|
||||
|
||||
@@ -11,6 +11,7 @@ defined( 'ABSPATH' ) || exit;
|
||||
|
||||
use Automattic\WooCommerce\Admin\Notes\Note;
|
||||
use Automattic\WooCommerce\Admin\Notes\Notes;
|
||||
use Automattic\WooCommerce\Admin\PageController;
|
||||
|
||||
/**
|
||||
* Woo_Subscriptions_Notes
|
||||
@@ -36,7 +37,7 @@ class WooSubscriptionsNotes {
|
||||
* Hook all the things.
|
||||
*/
|
||||
public function __construct() {
|
||||
add_action( 'admin_init', array( $this, 'admin_init' ) );
|
||||
add_action( 'admin_head', array( $this, 'admin_head' ) );
|
||||
add_action( 'update_option_woocommerce_helper_data', array( $this, 'update_option_woocommerce_helper_data' ), 10, 2 );
|
||||
}
|
||||
|
||||
@@ -75,9 +76,16 @@ class WooSubscriptionsNotes {
|
||||
}
|
||||
|
||||
/**
|
||||
* Things to do on admin_init.
|
||||
* Runs on `admin_head` hook. Checks the connection and refreshes subscription notes on relevant pages.
|
||||
*/
|
||||
public function admin_init() {
|
||||
public function admin_head() {
|
||||
if ( ! PageController::is_admin_or_embed_page() ) {
|
||||
// To avoid unnecessarily calling Helper API, we only want to refresh subscription notes,
|
||||
// if the request is initiated from the wc admin dashboard or a WC related page which includes
|
||||
// the Activity button in WC header.
|
||||
return;
|
||||
}
|
||||
|
||||
$this->check_connection();
|
||||
|
||||
if ( $this->is_connected() ) {
|
||||
|
||||
Reference in New Issue
Block a user