plugin updates

This commit is contained in:
Tony Volpe
2024-11-20 22:40:39 -05:00
parent 0238f0c4ca
commit 3362947c6e
434 changed files with 13405 additions and 9202 deletions

View File

@@ -155,8 +155,14 @@ class WcPayWelcomePage {
call_user_func_array( 'add_menu_page', $menu_with_nav_data );
}
} else {
// Determine the path to the active Payments task page.
$menu_path = 'admin.php?page=wc-admin&task=' . $this->get_active_payments_task_slug();
// Default to linking to the Payments settings page.
$menu_path = 'admin.php?page=wc-settings&tab=checkout';
// Determine the path to the active Payments task page, if any.
$task_slug = $this->get_active_payments_task_slug();
if ( ! empty( $task_slug ) ) {
$menu_path = 'admin.php?page=wc-admin&task=' . $task_slug;
}
add_menu_page(
$menu_title,
@@ -583,23 +589,38 @@ class WcPayWelcomePage {
private function get_active_payments_task_slug(): string {
$setup_task_list = TaskLists::get_list( 'setup' );
$extended_task_list = TaskLists::get_list( 'extended' );
if ( empty( $setup_task_list ) && empty( $extended_task_list ) ) {
// The task pages are not available if the task lists don't exist or are not visible.
// Bail early if we have no task to work with.
if (
( empty( $setup_task_list ) || ! $setup_task_list->is_visible() ) &&
( empty( $extended_task_list ) || ! $extended_task_list->is_visible() )
) {
return '';
}
$payments_task = $setup_task_list->get_task( 'payments' );
if ( ! empty( $payments_task ) && $payments_task->can_view() ) {
return 'payments';
// The Payments task in the setup task list.
if ( ! empty( $setup_task_list ) && $setup_task_list->is_visible() ) {
$payments_task = $setup_task_list->get_task( 'payments' );
if ( ! empty( $payments_task ) && $payments_task->can_view() ) {
return 'payments';
}
}
$payments_task = $extended_task_list->get_task( 'payments' );
if ( ! empty( $payments_task ) && $payments_task->can_view() ) {
return 'payments';
// The Additional Payments task in the extended task list.
if ( ! empty( $extended_task_list ) && $extended_task_list->is_visible() ) {
$payments_task = $extended_task_list->get_task( 'payments' );
if ( ! empty( $payments_task ) && $payments_task->can_view() ) {
return 'payments';
}
}
$woopayments_task = $setup_task_list->get_task( 'woocommerce-payments' );
if ( ! empty( $woopayments_task ) && $woopayments_task->can_view() ) {
return 'woocommerce-payments';
// The WooPayments task in the setup task list.
if ( ! empty( $setup_task_list ) && $setup_task_list->is_visible() ) {
$payments_task = $setup_task_list->get_task( 'woocommerce-payments' );
if ( ! empty( $payments_task ) && $payments_task->can_view() ) {
return 'woocommerce-payments';
}
}
return '';