Skip to content

Update gateway setting toggle logic #3095

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

Open
Crabcyborg wants to merge 2 commits into
base: master
Choose a base branch
from
+61 −20
Open

Update gateway setting toggle logic #3095

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a18ae98
Update gateway setting toggle logic
Crabcyborg May 8, 2026
1b61848
Update logic for possibility of multiple selected gateways
Crabcyborg May 8, 2026
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
81 changes: 61 additions & 20 deletions square/js/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,77 @@

const { __ } = wp.i18n;

function onGatewayToggle( { gateway, settings, checked } ) {
if ( 'square' === gateway && checked ) {
syncRepeat( settings.get( 0 ) );
function updateGatewaySettingsVisibility( settings ) {
const typeDropdown = settings.querySelector( 'select.frm_trans_type' );
if ( ! typeDropdown ) {
return;
}

syncCurrency( gateway, settings.get( 0 ) );
if ( 'recurring' === typeDropdown.value ) {
const activeGateways = Array.from( settings.querySelectorAll( '[name*="[post_content][gateway]"]:checked' ) ).map( function( el ) {
return el.value;
} );

const typeDropdown = settings.get( 0 ).querySelector( 'select.frm_trans_type' );
if ( typeDropdown && 'recurring' !== typeDropdown.value ) {
settings.get( 0 ).querySelectorAll( '.frm_trans_sub_opts' ).forEach(
settings.querySelectorAll( '.frm_trans_sub_opts' ).forEach(
function( subOpts ) {
subOpts.style.display = 'none';
// Check if this setting has a show_* class for any active gateway
const hasActiveGatewayClass = Array.from( subOpts.classList ).some( function( className ) {
return activeGateways.some( function( gateway ) {
return className === 'show_' + gateway;
Copy link
Copy Markdown

@deepsource-io deepsource-io Bot May 8, 2026

Choose a reason for hiding this comment

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

Unexpected string concatenation


In ES2015 (ES6), we can use template literals instead of string concatenation.

} );
} );

if ( hasActiveGatewayClass ) {
subOpts.classList.remove( 'frm_hidden' );
if ( subOpts.classList.contains( 'frm_grid_container' ) ) {
subOpts.style.display = 'grid';
}
Comment on lines +31 to +35
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot May 8, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Visible sub-options can stay hidden after mode/gateway switches

updateGatewaySettingsVisibility hides elements via inline style.display = 'none' (Line 55-56), but in the show paths it does not reset style.display for non-grid containers. After toggling away and back, those rows can remain hidden even after removing frm_hidden.

💡 Suggested fix 
-					if ( hasActiveGatewayClass ) {
-						subOpts.classList.remove( 'frm_hidden' );
-						if ( subOpts.classList.contains( 'frm_grid_container' ) ) {
-							subOpts.style.display = 'grid';
-						}
+					if ( hasActiveGatewayClass ) {
+						subOpts.classList.remove( 'frm_hidden' );
+						subOpts.style.display = subOpts.classList.contains( 'frm_grid_container' ) ? 'grid' : '';
 					} else {
@@
-						} else {
-							// Show if it has no show_* class (shared setting)
-							subOpts.classList.remove( 'frm_hidden' );
-							if ( subOpts.classList.contains( 'frm_grid_container' ) ) {
-								subOpts.style.display = 'grid';
-							}
+						} else {
+							// Show if it has no show_* class (shared setting)
+							subOpts.classList.remove( 'frm_hidden' );
+							subOpts.style.display = subOpts.classList.contains( 'frm_grid_container' ) ? 'grid' : '';
 						}
 					}

Also applies to: 42-45, 55-56

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@square/js/action.js` around lines 25 - 29, The show-paths in
updateGatewaySettingsVisibility (and the similar blocks around the other two
occurrences) remove the frm_hidden class but do not clear inline style.display,
so elements hidden earlier with style.display = 'none' remain invisible; update
the show logic that handles subOpts (and the two analogous blocks) to set
subOpts.style.display = 'grid' when
subOpts.classList.contains('frm_grid_container') and otherwise reset
subOpts.style.display = '' (or an appropriate default like 'block') so
visibility is fully restored after toggles.

} else {
// Check if it has any show_* class for a different gateway
const hasAnyGatewayClass = Array.from( subOpts.classList ).some( function( className ) {
return className.startsWith( 'show_' );
} );

if ( hasAnyGatewayClass ) {
// Hide if it has a show_* class but not for any active gateway
subOpts.classList.add( 'frm_hidden' );
subOpts.style.display = 'none';
} else {
// Show if it has no show_* class (shared setting)
subOpts.classList.remove( 'frm_hidden' );
if ( subOpts.classList.contains( 'frm_grid_container' ) ) {
subOpts.style.display = 'grid';
}
}
}
}
);
return;
}

settings.querySelectorAll( '.frm_trans_sub_opts' ).forEach(
function( subOpts ) {
subOpts.classList.add( 'frm_hidden' );
subOpts.style.display = 'none';
}
);
}

function onGatewayToggle( { gateway, settings, checked } ) {
if ( 'square' === gateway && checked ) {
syncRepeat( settings.get( 0 ) );
}

syncCurrency( gateway, settings.get( 0 ) );

updateGatewaySettingsVisibility( settings.get( 0 ) );

const captureSetting = settings.get( 0 ).querySelector( '[name*="[post_content][capture]"]' );
if ( captureSetting ) {
const wrapper = captureSetting.closest( '.frm_gateway_no_recur' );
if ( wrapper ) {
if ( 'square' === gateway ) {
wrapper.style.display = 'none';
} else if ( 'recurring' !== typeDropdown.value ) {
// Capture appearing with Stripe selected and recurring selected.
wrapper.style.removeProperty( 'display' );
}
}
}
Expand All @@ -48,21 +94,15 @@
if ( squareGatewayOption?.checked ) {
syncRepeat( settings );
}

updateGatewaySettingsVisibility( settings );
}

function onToggleSub() {
const target = this;
setTimeout( function() {
const settings = target.closest( '.frm_form_action_settings' );
const squareIsActive = settings.querySelector( '[name*="[post_content][gateway]"][value="square"]' ).checked;

settings.querySelectorAll( '.frm_trans_sub_opts' ).forEach(
function( subOpts ) {
if ( subOpts.classList.contains( 'show_stripe' ) && ! subOpts.classList.contains( 'show_square' ) && squareIsActive ) {
subOpts.style.display = 'none';
}
}
);
updateGatewaySettingsVisibility( settings );
}, 0 );
}

Expand Down Expand Up @@ -132,6 +172,7 @@
}

newDropdown.closest( '.frm_trans_sub_opts' )?.classList.add( 'show_square' );
newDropdown.closest( '.frm_trans_sub_opts' )?.classList.remove( 'frm_hidden' );

const stripeLabel = intervalCount.closest( '.frm_trans_sub_opts' )?.querySelector( 'label' );
if ( stripeLabel?.textContent.includes( 'Repeat Every' ) ) {
Expand Down
Loading