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.

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

fix(recaptcha): improvements for reCAPTCHA v2 + modal checkout #3692

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+36 −12
Open

fix(recaptcha): improvements for reCAPTCHA v2 + modal checkout #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2c902
fix(modal-checkout): use clone of #place_order button
dkoo Jan 21, 2025
3cb4cf9
feat: allow "auto-complete orders" for shippable products too
dkoo Jan 21, 2025
2989b84
chore: undo unwanted change
dkoo Jan 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
8 changes: 2 additions & 6 deletions includes/reader-revenue/woocommerce/class-woocommerce-products.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static function get_custom_options() {
return [
'newspack_autocomplete_orders' => [
'id' => '_newspack_autocomplete_orders',
'wrapper_class' => 'show_if_virtual',
'wrapper_class' => '',
'label' => __( 'Auto-complete orders', 'newspack-plugin' ),
'description' => __( 'Allow orders containing this product to automatically complete upon successful payment.', 'newspack-plugin' ),
'default' => 'yes',
Expand Down Expand Up @@ -197,11 +197,7 @@ public static function save_custom_variation_options( $variation, $i ) {
* @param WC_Product $product The product associated with this order item.
*/
public static function require_order_processing( $needs_proccessing, $product ) {
if ( $product->is_virtual() ) {
return self::get_custom_option_value( $product, 'newspack_autocomplete_orders' ) ? false : $needs_proccessing;
}

return $needs_proccessing;
return self::get_custom_option_value( $product, 'newspack_autocomplete_orders' ) ? false : $needs_proccessing;
}
}

Expand Down
29 changes: 23 additions & 6 deletions src/other-scripts/recaptcha/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,16 @@ function renderV2Widget( form, onSuccess = null, onError = null ) {
form.appendChild( hiddenField );
}
hiddenField.value = token;
const buttons = [
...form.querySelectorAll( 'input[type="submit"], button[type="submit"]' )
];
form.setAttribute( 'data-recaptcha-validated', '1' );
form.requestSubmit( buttons[ buttons.length - 1 ] );

// If the form has a #place_order button, click it.
const placeOrder = form.querySelector( '#place_order' );
if ( placeOrder ) {
placeOrder.click();
} else {
form.requestSubmit( form.querySelector( 'input[type="submit"], button[type="submit"]' ) );
}

refreshV2Widget( form );
};
// Callback when reCAPTCHA rendering fails or expires.
Expand All @@ -77,8 +82,10 @@ function renderV2Widget( form, onSuccess = null, onError = null ) {

// Attach widget to form events.
const attachListeners = () => {
form.removeAttribute( 'data-submit-button-click' );
getIntersectionObserver( () => renderV2Widget( form, onSuccess, onError ) ).observe( form, { attributes: true } );
form.addEventListener( 'submit', e => {

const handleSubmit = e => {
if ( ! form.hasAttribute( 'data-recaptcha-validated' ) && ! form.hasAttribute( 'data-skip-recaptcha' ) ) {
e.preventDefault();
e.stopImmediatePropagation();
Expand All @@ -94,7 +101,17 @@ function renderV2Widget( form, onSuccess = null, onError = null ) {
} else {
form.removeAttribute( 'data-recaptcha-validated' );
}
}, true );
};
form.addEventListener( 'submit', handleSubmit, true );

const placeOrderClone = form.querySelector( '#place_order_clone' );
if ( placeOrderClone ) {
placeOrderClone.addEventListener( 'click', e => {
e.preventDefault();
e.stopImmediatePropagation();
handleSubmit( e )
}, true );
}
}
// Refresh reCAPTCHA widgets on Woo checkout update and error.
if ( jQuery ) {
Expand Down
11 changes: 11 additions & 0 deletions src/other-scripts/recaptcha/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@
margin-top: 0 !important;
}
}

// Hide the "real" #place_order button but only in modal checkout and if we've rendered a v2 widget.
/* stylelint-disable-next-line selector-id-pattern */
#newspack_modal_checkout_container form[name="checkout"] {
&[data-recaptcha-widget-id] {
/* stylelint-disable-next-line selector-id-pattern */
#place_order {
display: none !important;
}
}
}
Loading