Skip to content

fix(modal-checkout): prevent session reload after new customer account #4310

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

Merged
dkoo merged 4 commits into from
Nov 21, 2025
Merged

fix(modal-checkout): prevent session reload after new customer account #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da52668
fix(modal-checkout): prevent session reload after new customer account
dkoo Nov 17, 2025
9a9066d
Merge branch 'trunk' into fix/anon-transaction-failures
dkoo Nov 20, 2025
e44f4e3
style: apply newspack-ui notice styles to all nested woo notices
dkoo Nov 21, 2025
17efbb7
fix: no border on notices nested in notices
dkoo Nov 21, 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
16 changes: 16 additions & 0 deletions includes/data-events/class-woo-user-registration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public static function init() {

// created a user?
add_action( 'woocommerce_created_customer', [ __CLASS__, 'created_customer' ], 1 );

// checkout order processed?
add_action( 'woocommerce_checkout_order_processed', [ __CLASS__, 'checkout_order_processed' ] );
}

/**
Expand Down Expand Up @@ -99,6 +102,19 @@ public static function created_customer( $user_id ) {
*/
\do_action( 'newspack_registered_reader_via_woo', $user->user_email, $user_id, self::$metadata );
}

/**
* After a checkout order is processed, prevent the modal checkout from reloading.
*
* @param int $order_id The ID of the processed order.
* @return void
*/
public static function checkout_order_processed( $order_id ) {
// Prevent the modal checkout from reloading after the user is created.
if ( method_exists( 'Newspack_Blocks\Modal_Checkout', 'is_modal_checkout' ) && \Newspack_Blocks\Modal_Checkout::is_modal_checkout() ) {
\WC()->session->set( 'reload_checkout', null );
}
}
}

Woo_User_Registration::init();
41 changes: 2 additions & 39 deletions src/newspack-ui/scss/elements/woocommerce/_my-account.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,10 @@
*/

@use "../forms";
@use "../notices";
@use "../typography";
@use "../../variables/breakpoints";

.woocommerce-account.newspack-my-account.newspack-ui {
.woocommerce-notices-wrapper:not(:empty) {
margin-bottom: var(--newspack-ui-spacer-6);

> *:first-child {
margin-top: 0;
}
}
.newspack-wc-message,
.woocommerce-message,
.woocommerce-info,
.woocommerce-error {
@extend .newspack-ui__notice;
display: block;
list-style: none;
margin: var(--newspack-ui-spacer-3) 0;

> p:first-child {
margin-top: 0;
padding-top: 0;
}

> p:last-child {
margin-bottom: 0;
padding-bottom: 0;
}
}
.newspack-wc-message,
.woocommerce-message {
@extend .newspack-ui__notice--success;
}
.woocommerce-info {
@extend .newspack-ui__notice--warning;
}
.newspack-wc-message--error,
.woocommerce-error {
@extend .newspack-ui__notice--error;
}
p.woocommerce-form-row {
margin: var(--newspack-ui-spacer-3) 0;
}
Expand Down Expand Up @@ -190,7 +152,8 @@
address {
font-style: normal;
}
#registration-link_field .regenerate-link { // stylelint-disable-line selector-id-pattern
/* stylelint-disable-next-line selector-id-pattern */
#registration-link_field .regenerate-link {
margin-left: var(--newspack-ui-spacer-3);
}
}
48 changes: 48 additions & 0 deletions src/newspack-ui/scss/elements/woocommerce/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/** Some general overrides for WooCommerce styles. */

@use "../notices";

.newspack-ui {
label .optional {
color: var(--newspack-ui-color-neutral-60);
Expand Down Expand Up @@ -26,6 +29,51 @@
font-weight: normal;
}
}
.woocommerce-notices-wrapper:not(:empty) {
margin-bottom: var(--newspack-ui-spacer-6);

> *:first-child {
margin-top: 0;
}
}
.newspack-wc-message,
.woocommerce-message,
.woocommerce-info,
.woocommerce-error {
@extend .newspack-ui__notice;
display: block;
list-style: none;
margin: var(--newspack-ui-spacer-3) 0;

> p:first-child {
margin-top: 0;
padding-top: 0;
}

> p:last-child {
margin-bottom: 0;
padding-bottom: 0;
}
}
.newspack-wc-message,
.woocommerce-message {
@extend .newspack-ui__notice--success;
}
.woocommerce-info {
@extend .newspack-ui__notice--warning;
}
.newspack-wc-message--error,
.woocommerce-error {
@extend .newspack-ui__notice--error;
}
.woocommerce-NoticeGroup {
.newspack-wc-message,
.woocommerce-message,
.woocommerce-info,
.woocommerce-error {
border: none !important;
}
}
}

/** See #3292. */
Expand Down