Skip to content
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.

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

Add Mailchimp Signup Flow #51

Merged
merged 42 commits into from
Sep 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d0e49ee
Add create account button to login screen.
iamdharmesh Aug 14, 2024
69f6bfe
Add initial create account markup.
iamdharmesh Aug 17, 2024
47fc199
Added form validation and form submission handling.
iamdharmesh Aug 20, 2024
9013bce
Completed intial create account flow.
iamdharmesh Aug 20, 2024
2d3089f
Remove waiting for login option on logout.
iamdharmesh Aug 20, 2024
3ec4ec7
- Moved CSS and JS to assets folder and added Means web fonts for cre…
iamdharmesh Aug 20, 2024
676365c
PHPCS fixes.
iamdharmesh Aug 21, 2024
907573a
Update wizard steps to reflect current step.
iamdharmesh Aug 21, 2024
3220e61
Add address 2 data as well.
iamdharmesh Aug 21, 2024
3200f54
Remove unwanted code.
iamdharmesh Aug 21, 2024
316b214
Merge branch 'develop' of github.com:mailchimp/wordpress into enhance…
iamdharmesh Aug 21, 2024
f57605f
Add basic E2E tests.
iamdharmesh Aug 21, 2024
435e10c
Apply suggestions from code review
iamdharmesh Aug 23, 2024
da72685
Remove hardcoded fallback string.
iamdharmesh Aug 23, 2024
f77a82b
Merge branch 'develop' into enhancement/46
dkotter Aug 27, 2024
dc327f2
Added Graphik web fonts.
iamdharmesh Aug 28, 2024
240f130
Create account page design updates.
iamdharmesh Aug 29, 2024
2e21c4a
Update design of confirm email page.
iamdharmesh Aug 29, 2024
6f467aa
Update designs for suggest to login.
iamdharmesh Aug 29, 2024
6964674
Include country in validation check.
iamdharmesh Aug 29, 2024
b4e2da9
Break down account page in templates and CSS updates.
iamdharmesh Aug 30, 2024
9603cda
Combined CSS into single file.
iamdharmesh Aug 30, 2024
9549795
Update CSS to use var for color.
iamdharmesh Aug 30, 2024
28b95a1
Add retry with different email address functionality.
iamdharmesh Aug 30, 2024
5702291
Updated main settings page header and connect button designs.
iamdharmesh Aug 30, 2024
b833832
Updates in setup_page.php to handle only logged user.
iamdharmesh Aug 30, 2024
f4eb23e
Background color update for main settings page.
iamdharmesh Aug 30, 2024
a8a6cf9
E2E test updates.
iamdharmesh Aug 30, 2024
2b2b7dd
Update error color to match Mailchimp design.
iamdharmesh Aug 30, 2024
1211cbc
Update blocked popup design to match new design.
iamdharmesh Aug 30, 2024
f7411a8
Update wordings as per PR feedback
iamdharmesh Sep 4, 2024
7c3664a
Trigger oauth process from suggest to login page.
iamdharmesh Sep 4, 2024
d7271f0
Update terms wordings.
iamdharmesh Sep 5, 2024
c7634c4
Formatting updates for setup_page.php
iamdharmesh Sep 5, 2024
2129c14
Update button styles.
iamdharmesh Sep 5, 2024
ae2a2df
Update header title for signup flow pages.
iamdharmesh Sep 5, 2024
561fd35
Remove extra line.
iamdharmesh Sep 5, 2024
4464b74
Hide timezone field.
iamdharmesh Sep 5, 2024
eea7826
Fix spacing issue.
iamdharmesh Sep 5, 2024
960e44a
"Log in" button wording updates and footer text updates.
iamdharmesh Sep 6, 2024
bc5e682
Remove exra trailing comma.
iamdharmesh Sep 6, 2024
a28b1ca
Display notice to users to activate account incase they access settin…
iamdharmesh Sep 10, 2024
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
25 changes: 25 additions & 0 deletions includes/class-mailchimp-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,31 @@ public function admin_notices() {
<?php
}

// Display a notice if the user is waiting for the login to complete.
$current_screen = get_current_screen();
if ( $current_screen && 'toplevel_page_mailchimp_sf_options' === $current_screen->id ) {
$api = mailchimp_sf_get_api();
if ( $api && 'waiting' === get_option( 'mailchimp_sf_waiting_for_login' ) ) {
$profile = $api->get( '' );
if ( ! is_wp_error( $profile ) ) {
if ( ! empty( $profile['last_login'] ) ) {
// Clear the waiting flag if the user is logged in.
delete_option( 'mailchimp_sf_waiting_for_login' );
} else {
?>
<div class="notice notice-warning is-dismissible">
<p>
<?php
esc_html_e( 'Please activate your Mailchimp account to complete the setup. Without activation, the connection to WordPress may be interrupted.', 'mailchimp' );
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dkotter @jeffpaul Please let me know if any wording updates are needed here.

?>
</p>
</div>
<?php
}
}
}
}

if (
! get_option( 'mailchimp_sf_auth_error', false ) ||
! get_option( 'mailchimp_sf_access_token', '' )
Expand Down
Loading