Skip to content

Create enhanced settings UI #2968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ajello-meta wants to merge 10 commits into from
Closed

Create enhanced settings UI #2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f95c1c2
Inital changes for enhanced settings
Mar 26, 2025
5a45eb9
Fix iframe formatting
Mar 26, 2025
ca817fc
Set default enhanced onboarding value to false
Mar 26, 2025
cceab44
Add tests
Mar 26, 2025
a3846ee
Fix iframe styles
Mar 26, 2025
d161e71
Fix bug on iframe
Mar 26, 2025
607264f
Fix linter errors
Mar 26, 2025
11d2708
Fix test cases
Mar 26, 2025
6a5d782
Fix test cases again
Mar 26, 2025
1569ef9
Add some old tabs back in
Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion assets/css/admin/facebook-for-woocommerce-connection.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@
min-height: calc(100vh - 200px);
}

#facebook-commerce-iframe-enhanced {
width: 100%;
max-width: 1100px;
min-height: calc(100vh - 200px);
background: transparent;
border: none;
}

.woocommerce-embed-page #wpbody-content {
padding-bottom: 0;
}
}
9 changes: 8 additions & 1 deletion class-wc-facebookcommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ class WC_Facebookcommerce extends WooCommerce\Facebook\Framework\Plugin {
/** @var WooCommerce\Facebook\Admin\Settings */
private $admin_settings;

/** @var WooCommerce\Facebook\Admin\Enhanced_Settings */
private $admin_enhanced_settings;

/** @var WooCommerce\Facebook\AJAX Ajax handler instance */
private $ajax;

Expand Down Expand Up @@ -234,7 +237,11 @@ public function init() {

// load admin handlers, before admin_init
if ( is_admin() ) {
$this->admin_settings = new WooCommerce\Facebook\Admin\Settings( $this->connection_handler->is_connected() );
if ($this->get_integration()->use_enhanced_onboarding()) {
$this->admin_enhanced_settings = new WooCommerce\Facebook\Admin\Enhanced_Settings( $this->connection_handler->is_connected() );
} else {
$this->admin_settings = new WooCommerce\Facebook\Admin\Settings( $this->connection_handler->is_connected() );
}
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions includes/Admin/Abstract_Settings_Screen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,11 @@ protected function is_current_screen_page() {
return false;
}
// assume we are on the Connection tab by default because the link under Marketing doesn't include the tab query arg
$connection_handler = facebook_for_woocommerce()->get_connection_handler();
$default_tab = $connection_handler->is_connected() ? 'advertise' : 'connection';
$tab = Helper::get_requested_value( 'tab', $default_tab );
$connection_handler = facebook_for_woocommerce()->get_connection_handler();
$use_enhanced_onboarding = facebook_for_woocommerce()->get_integration()->use_enhanced_onboarding();
$default_tab = $use_enhanced_onboarding ? 'shops' : ( $connection_handler->is_connected() ? 'advertise' : 'connection' );
$tab = Helper::get_requested_value( 'tab', $default_tab );

return ! empty( $tab ) && $tab === $this->get_id();
}

Expand Down
Loading