Changeset 3321344

Timestamp:

07/02/2025 03:41:08 PM (8 months ago)

Author:

gocardless

Message:

Update to version 2.9.6 from GitHub

Location:

woocommerce-gateway-gocardless

Files:

• tags/2.9.6 (copied) (copied from woocommerce-gateway-gocardless/trunk)
• tags/2.9.6/assets/css/admin.css (modified) (1 diff)
• tags/2.9.6/build/index.asset.php (modified) (1 diff)
• tags/2.9.6/build/index.js (modified) (1 diff)
• tags/2.9.6/build/wc-gocardless-checkout.asset.php (deleted)
• tags/2.9.6/build/wc-gocardless-checkout.js (deleted)
• tags/2.9.6/changelog.txt (modified) (1 diff)
• tags/2.9.6/client/blocks/gocardless-utils.js (modified) (1 diff)
• tags/2.9.6/client/blocks/index.js (modified) (3 diffs)
• tags/2.9.6/client/wc-gocardless-checkout.js (deleted)
• tags/2.9.6/includes/class-wc-gocardless-ajax.php (modified) (2 diffs)
• tags/2.9.6/includes/class-wc-gocardless-gateway-blocks-support.php (modified) (3 diffs)
• tags/2.9.6/includes/class-wc-gocardless-gateway.php (modified) (17 diffs)
• tags/2.9.6/readme.txt (modified) (3 diffs)
• tags/2.9.6/woocommerce-gateway-gocardless.php (modified) (3 diffs)
• trunk/assets/css/admin.css (modified) (1 diff)
• trunk/build/index.asset.php (modified) (1 diff)
• trunk/build/index.js (modified) (1 diff)
• trunk/build/wc-gocardless-checkout.asset.php (deleted)
• trunk/build/wc-gocardless-checkout.js (deleted)
• trunk/changelog.txt (modified) (1 diff)
• trunk/client/blocks/gocardless-utils.js (modified) (1 diff)
• trunk/client/blocks/index.js (modified) (3 diffs)
• trunk/client/wc-gocardless-checkout.js (deleted)
• trunk/includes/class-wc-gocardless-ajax.php (modified) (2 diffs)
• trunk/includes/class-wc-gocardless-gateway-blocks-support.php (modified) (3 diffs)
• trunk/includes/class-wc-gocardless-gateway.php (modified) (17 diffs)
• trunk/readme.txt (modified) (3 diffs)
• trunk/woocommerce-gateway-gocardless.php (modified) (3 diffs)

woocommerce-gateway-gocardless/tags/2.9.6/assets/css/admin.css

@@ -40 +40 @@
     margin-top: 6px;
 }
+
+.wcgc-sandbox-mode-notice {
+    margin-top: 12px;
+    align-items: center;
+    background-color: #fff2d7;
+    color: #4d3716;
+    display: flex;
+    font-size: 13px;
+    padding: 12px;
+    width: max-content;
+}

woocommerce-gateway-gocardless/tags/2.9.6/build/index.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '494e4afed799f2cde0fa');
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-html-entities', 'wp-i18n'), 'version' => '70c5c2023330429d40bb');

woocommerce-gateway-gocardless/tags/2.9.6/build/index.js

@@ -1 @@
-(()=>{"use strict";var e={20:(e,t,o)=>{var s=o(609),r=Symbol.for("react.element"),n=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),i=s.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,a={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,o){var s,l={},c=null,d=null;for(s in void 0!==o&&(c=""+o),void 0!==t.key&&(c=""+t.key),void 0!==t.ref&&(d=t.ref),t)n.call(t,s)&&!a.hasOwnProperty(s)&&(l[s]=t[s]);if(e&&e.defaultProps)for(s in t=e.defaultProps)void 0===l[s]&&(l[s]=t[s]);return{$$typeof:r,type:e,key:c,ref:d,props:l,_owner:i.current}}},848:(e,t,o)=>{e.exports=o(20)},609:e=>{e.exports=window.React}},t={};const o=window.wp.htmlEntities,s=window.wp.i18n,r=window.wc.wcBlocksRegistry,n=window.wp.element,i=window.wc.wcSettings,a=()=>{const e=(0,i.getSetting)("gocardless_data",null);if(!e)throw new Error((0,s.__)("GoCardless initialization data is not available","woocommerce-gateway-gocardless"));return e};var l,c,d,u=function o(s){var r=t[s];if(void 0!==r)return r.exports;var n=t[s]={exports:{}};return e[s](n,n.exports,o),n.exports}(848);const{description:p,logo_url:w,title:g,isTest:m,billingRequestNonce:_}=a(),f=e=>{const{eventRegistration:t,emitResponse:r,shouldSavePayment:i}=e,{onCheckoutSuccess:l}=t;return(0,n.useEffect)((()=>l((e=>{let t;return new Promise(((o,n)=>{const l={type:"error",messageContext:r.noticeContexts.PAYMENTS},{GoCardlessDropin:c}=window;if(!c)return void o({...l,message:(0,s.__)("GoCardless Drop-in is not available","woocommerce-gateway-gocardless")});const d=e?.processingResponse?.paymentDetails?.billing_request_flow_id,u=e?.processingResponse?.paymentDetails?.billing_request_nonce||_;if(!d)return void o({...l,message:(0,s.__)("Invalid billing request flow ID","woocommerce-gateway-gocardless")});const p={billingRequestFlowID:d,environment:m?"sandbox":"live",onSuccess:(t,r)=>{w(),t&&["fulfilling","fulfilled"].includes(t.status)?(e=>{const{wcAjaxUrl:t}=a(),o=new FormData;for(const t in e)o.append(t,e[t]);const s=t.replace("%%endpoint%%","gocardless_complete_billing_request_flow");return fetch(s,{method:"POST",body:o}).then((e=>e.json()))})({security:u,order_id:e.orderId,billing_request_id:t.id,save_customer_token:i?"yes":"no"}).then((e=>{e&&e.success?o({type:"success",redirectUrl:e.data.redirect_url}):o({...l,message:e.data?.message})})).catch((e=>{o({...l,message:e.message})})):o({...l,message:(0,s.__)("Billing request is not fulfulling or fulfilled yet, please try again later.","woocommerce-gateway-gocardless")})},onExit:(t,o)=>{t&&console.error(t),window.location.href=e.redirectUrl}};t=c.create(p),t.open();const w=()=>{t?.exit()}}))}))),[l,i,r.noticeContexts.PAYMENTS]),(0,o.decodeEntities)(p||"")},y=()=>(0,u.jsx)("img",{src:w,alt:(0,o.decodeEntities)(g),style:{marginRight:"12px",marginBottom:"4px"}}),v=e=>{const{PaymentMethodLabel:t}=e.components;return(0,u.jsx)(t,{text:(0,o.decodeEntities)(g),icon:(0,u.jsx)(y,{})})};(0,r.registerPaymentMethod)({name:"gocardless",label:(0,u.jsx)(v,{}),ariaLabel:(0,s.__)("GoCardless payment method","woocommerce-gateway-gocardless"),canMakePayment:({billingData:e,cartTotals:t})=>{const o=t?.currency_code,s=a()?.supportedCountries||[],r=a()?.supportedCurrencies||[];return s.includes(e?.country)&&r.includes(o)},content:(0,u.jsx)(f,{}),edit:(0,u.jsx)(f,{}),supports:{showSavedCards:null!==(l=a().showSavedCards)&&void 0!==l&&l,showSaveOption:null!==(c=a().showSaveOption)&&void 0!==c&&c,features:null!==(d=a()?.supports)&&void 0!==d?d:[]}})})();
+(()=>{"use strict";var e={20:(e,t,o)=>{var r=o(609),n=Symbol.for("react.element"),s=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),a=r.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,o){var r,c={},l=null,d=null;for(r in void 0!==o&&(l=""+o),void 0!==t.key&&(l=""+t.key),void 0!==t.ref&&(d=t.ref),t)s.call(t,r)&&!i.hasOwnProperty(r)&&(c[r]=t[r]);if(e&&e.defaultProps)for(r in t=e.defaultProps)void 0===c[r]&&(c[r]=t[r]);return{$$typeof:n,type:e,key:l,ref:d,props:c,_owner:a.current}}},848:(e,t,o)=>{e.exports=o(20)},609:e=>{e.exports=window.React}},t={};const o=window.wp.htmlEntities,r=window.wp.i18n,n=window.wc.wcBlocksRegistry,s=window.wc.wcSettings,a=()=>{const e=(0,s.getSetting)("gocardless_data",null);if(!e)throw new Error((0,r.__)("GoCardless initialization data is not available","woocommerce-gateway-gocardless"));return e};var i,c,l,d=function o(r){var n=t[r];if(void 0!==n)return n.exports;var s=t[r]={exports:{}};return e[r](s,s.exports,o),s.exports}(848);const{description:p,logo_url:u,title:w}=a(),_=e=>(0,o.decodeEntities)(p||""),y=()=>(0,d.jsx)("img",{src:u,alt:(0,o.decodeEntities)(w),style:{marginRight:"12px",marginBottom:"4px"}}),m=e=>{const{PaymentMethodLabel:t}=e.components;return(0,d.jsx)(t,{text:(0,o.decodeEntities)(w),icon:(0,d.jsx)(y,{})})};(0,n.registerPaymentMethod)({name:"gocardless",label:(0,d.jsx)(m,{}),ariaLabel:(0,r.__)("GoCardless payment method","woocommerce-gateway-gocardless"),canMakePayment:({billingData:e,cartTotals:t})=>{const o=t?.currency_code,r=a()?.supportedCountries||[],n=a()?.supportedCurrencies||[];return r.includes(e?.country)&&n.includes(o)},content:(0,d.jsx)(_,{}),edit:(0,d.jsx)(_,{}),supports:{showSavedCards:null!==(i=a().showSavedCards)&&void 0!==i&&i,showSaveOption:null!==(c=a().showSaveOption)&&void 0!==c&&c,features:null!==(l=a()?.supports)&&void 0!==l?l:[]}})})();

woocommerce-gateway-gocardless/tags/2.9.6/changelog.txt

@@ -1 +1 @@
 *** GoCardless for WooCommerce Changelog ***
+
+2025-07-02 - version 2.9.6
+* Add - Respond with an error to the GoCardless webhook call if the scheduling action fails.
+* Add - A notice indicating that GoCardless is connected in sandbox mode if the merchant is connected to a sandbox account.
+* Update - Replaced JavaScript Drop-in with the redirect-to-GoCardless approach for the transaction/direct debit setup.
+* Dev - Bump WooCommerce "tested up to" version 10.0.
+* Dev - Bump WooCommerce minimum supported version to 9.8.
 
 2025-05-15 - version 2.9.5

woocommerce-gateway-gocardless/tags/2.9.6/client/blocks/gocardless-utils.js

@@ -20 +20 @@
     return goCardlessServerData;
 };
-
-/**
- * Call the server to complete a billing request flow.
- *
- * @param {Object} data Data to send to the server.
- * @return {Promise<Object>} Response from the server.
- */
-export const completeBillingRequestFlow = (data) => {
-    const { wcAjaxUrl } = getGoCardlessServerData();
-    const formData = new FormData();
-    for (const key in data) {
-        formData.append(key, data[key]);
-    }
-    const ajaxUrl = wcAjaxUrl.replace(
-        '%%endpoint%%',
-        'gocardless_complete_billing_request_flow'
-    );
-
-    return fetch(ajaxUrl, {
-        method: 'POST',
-        body: formData,
-    }).then((response) => response.json());
-};

woocommerce-gateway-gocardless/tags/2.9.6/client/blocks/index.js

@@ -5 +5 @@
 import { __ } from '@wordpress/i18n';
 import { registerPaymentMethod } from '@woocommerce/blocks-registry';
-import { useEffect } from '@wordpress/element';
 
 /**
@@ -11 +10 @@
  */
 import { PAYMENT_METHOD_NAME } from './constants';
-import {
-    completeBillingRequestFlow,
-    getGoCardlessServerData,
-} from './gocardless-utils';
+import { getGoCardlessServerData } from './gocardless-utils';
 
 const {
@@ -20 +16 @@
     logo_url: logoUrl,
     title,
-    isTest,
-    billingRequestNonce,
 } = getGoCardlessServerData();
 
 const Content = (props) => {
-    const { eventRegistration, emitResponse, shouldSavePayment } = props;
-    const { onCheckoutSuccess } = eventRegistration;
-
-    // Handle the checkout success event.
-    useEffect(() => {
-        const unsubscribe = onCheckoutSuccess((data) => {
-            let handler;
-            // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-            return new Promise((resolve, reject) => {
-                const errorOptions = {
-                    type: 'error',
-                    messageContext: emitResponse.noticeContexts.PAYMENTS,
-                };
-
-                const { GoCardlessDropin } = window;
-                if (!GoCardlessDropin) {
-                    resolve({
-                        ...errorOptions,
-                        message: __(
-                            'GoCardless Drop-in is not available',
-                            'woocommerce-gateway-gocardless'
-                        ),
-                    });
-                    return;
-                }
-
-                const billingRequestFlowId =
-                    data?.processingResponse?.paymentDetails
-                        ?.billing_request_flow_id;
-                const securityNonce = data?.processingResponse?.paymentDetails?.billing_request_nonce || billingRequestNonce;
-                if (!billingRequestFlowId) {
-                    resolve({
-                        ...errorOptions,
-                        message: __(
-                            'Invalid billing request flow ID',
-                            'woocommerce-gateway-gocardless'
-                        ),
-                    });
-                    return;
-                }
-
-                const options = {
-                    billingRequestFlowID: billingRequestFlowId,
-                    environment: isTest ? 'sandbox' : 'live',
-                    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-                    onSuccess: (billingRequest, billingRequestFlow) => {
-                        closeDropIn();
-                        if (
-                            billingRequest &&
-                            ['fulfilling', 'fulfilled'].includes(
-                                billingRequest.status
-                            )
-                        ) {
-                            const params = {
-                                security: securityNonce,
-                                order_id: data.orderId,
-                                billing_request_id: billingRequest.id,
-                                save_customer_token: shouldSavePayment
-                                    ? 'yes'
-                                    : 'no',
-                            };
-
-                            completeBillingRequestFlow(params)
-                                .then((res) => {
-                                    if (res && res.success) {
-                                        resolve({
-                                            type: 'success',
-                                            redirectUrl: res.data.redirect_url,
-                                        });
-                                    } else {
-                                        resolve({
-                                            ...errorOptions,
-                                            message: res.data?.message,
-                                        });
-                                    }
-                                })
-                                .catch((error) => {
-                                    resolve({
-                                        ...errorOptions,
-                                        message: error.message,
-                                    });
-                                });
-                        } else {
-                            resolve({
-                                ...errorOptions,
-                                message: __(
-                                    'Billing request is not fulfulling or fulfilled yet, please try again later.',
-                                    'woocommerce-gateway-gocardless'
-                                ),
-                            });
-                        }
-                    },
-                    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-                    onExit: (error, metadata) => {
-                        if (error) {
-                            console.error(error); // eslint-disable-line no-console
-                        }
-                        window.location.href = data.redirectUrl;
-                    },
-                };
-                handler = GoCardlessDropin.create(options);
-                handler.open();
-                const closeDropIn = () => {
-                    handler?.exit();
-                };
-            });
-        });
-        return unsubscribe;
-    }, [
-        onCheckoutSuccess,
-        shouldSavePayment,
-        emitResponse.noticeContexts.PAYMENTS,
-    ]);
-
     return decodeEntities(description || '');
 };

woocommerce-gateway-gocardless/tags/2.9.6/includes/class-wc-gocardless-ajax.php

@@ -32 +32 @@
      */
     public function init() {
-        // Ajax handler for billing request flow.
-        add_action( 'wc_ajax_gocardless_create_billing_request_flow', array( $this, 'ajax_create_billing_request_flow' ) );
-        add_action( 'wc_ajax_gocardless_complete_billing_request_flow', array( $this, 'ajax_complete_billing_request_flow' ) );
         add_action( 'wc_ajax_gocardless_regenerate_webhook_secret', array( $this, 'ajax_regenerate_webhook_secret' ) );
     }
@@ -51 +48 @@
 
         return $this->gateway;
-    }
-
-
-    /**
-     * Create a billing request and billing request flow to process the payment.
-     *
-     * This method creates a billing request and billing request flow to process the payment.
-     *
-     * @see https://developer.gocardless.com/api-reference/#billing-requests-billing-requests
-     * @see https://developer.gocardless.com/api-reference/#billing-requests-billing-request-flows
-     *
-     * @since 2.7.0
-     */
-    public function ajax_create_billing_request_flow() {
-        check_ajax_referer( 'wc_gocardless_create_billing_request_flow', 'security' );
-
-        $order_id = isset( $_POST['order_id'] ) ? absint( $_POST['order_id'] ) : 0;
-
-        $order = wc_get_order( $order_id );
-        if ( ! $order ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Invalid order.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        $gateway              = $this->get_gateway();
-        $billing_request_flow = $gateway->create_billing_request_flow( $order );
-        if ( 'success' === $billing_request_flow['result'] ) {
-            $billing_request_flow_id = $billing_request_flow['billing_request_flow_id'];
-            wp_send_json_success( array( 'billing_request_flow_id' => $billing_request_flow_id ) );
-        } else {
-            $message = $billing_request_flow['message'] ?? esc_html__( 'Failed to create billing request flow.', 'woocommerce-gateway-gocardless' );
-            wp_send_json_error( array( 'message' => $message ) );
-        }
-    }
-
-    /**
-     * Complete the billing request flow.
-     *
-     * @since 2.7.0
-     */
-    public function ajax_complete_billing_request_flow() {
-        check_ajax_referer( 'wc_gocardless_complete_billing_request_flow', 'security' );
-        $order_id           = isset( $_POST['order_id'] ) ? absint( $_POST['order_id'] ) : 0;
-        $billing_request_id = isset( $_POST['billing_request_id'] ) ? wc_clean( wp_unslash( $_POST['billing_request_id'] ) ) : '';
-
-        // Maybe save customer token.
-        $gateway             = $this->get_gateway();
-        $save_bank_accounts  = 'yes' === $gateway->get_option( 'saved_bank_accounts', 'yes' );
-        $save_customer_token = (
-            ! empty( $_POST['save_customer_token'] ) &&
-            'yes' === wc_clean( wp_unslash( $_POST['save_customer_token'] ) ) &&
-            get_current_user_id() &&
-            $save_bank_accounts
-        );
-
-        if ( ! $order_id || ! $billing_request_id ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Invalid request.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        $order = wc_get_order( $order_id );
-        if ( ! $order ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Order not found.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        wc_gocardless()->log( sprintf( '%s - GoCardless billing request fulfilled ajax call: "%s" and order ID %s', __METHOD__, $billing_request_id, $order_id ) );
-
-        $response = $gateway->handle_billing_request_complete( $order, $billing_request_id, $save_customer_token );
-        if ( 'success' === $response['result'] ) {
-            wp_send_json_success( array( 'redirect_url' => $response['redirect'] ) );
-        } else {
-            $message = ! empty( $response['message'] ) ? $response['message'] : esc_html__( 'Failed to process billing request.', 'woocommerce-gateway-gocardless' );
-            wp_send_json_error( array( 'message' => $message ) );
-        }
     }
 

woocommerce-gateway-gocardless/tags/2.9.6/includes/class-wc-gocardless-gateway-blocks-support.php

@@ -61 +61 @@
         }
 
-        // Register GoCardless Drop-in script.
-        wp_register_script(
-            'gocardless-dropin',
-            'https://pay.gocardless.com/billing/static/dropin/v2/initialise.js',
-            array(),
-            $version,
-            true
-        );
-
         wp_register_script(
             'wc-gocardless-blocks-integration',
@@ -82 +73 @@
         );
 
-        return array( 'gocardless-dropin', 'wc-gocardless-blocks-integration' );
+        return array( 'wc-gocardless-blocks-integration' );
     }
 
@@ -100 +91 @@
             'supportedCountries'  => WC_GoCardless_API::get_supported_countries(),
             'supportedCurrencies' => WC_GoCardless_API::get_supported_currencies(),
-            'isTest'              => 'yes' === $this->settings['testmode'],
-            'wcAjaxUrl'           => WC_AJAX::get_endpoint( '%%endpoint%%' ),
-            'billingRequestNonce' => wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' ),
         );
     }

woocommerce-gateway-gocardless/tags/2.9.6/includes/class-wc-gocardless-gateway.php

@@ -116 +116 @@
         add_filter( 'woocommerce_payment_methods_list_item', array( $this, 'saved_payment_methods_list_item' ), 99, 2 );
         add_action( 'woocommerce_account_payment_methods_column_method', array( $this, 'saved_payment_methods_column_method' ) );
-
-        // Order Pay (Receipt) page handling for complete billing request flow.
-        add_filter( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-
-        // Update the logged_in cookie in current request, after a guest user is created to avoid nonce inconsistencies.
-        add_action( 'set_logged_in_cookie', array( $this, 'set_cookie_on_current_request' ) );
     }
 
@@ -231 +225 @@
                 <?php if ( ! empty( $access_token ) ) : ?>
                     <span class="gocardless-connected"><span style="color: #00a32a">&#9679;</span>&nbsp;<?php esc_html_e( 'Connected', 'woocommerce-gateway-gocardless' ); ?></span>
+
+                    <?php if ( $this->testmode ) : ?>
+                        <div class="wcgc-sandbox-mode-notice">
+                            <span>
+                                <?php
+                                printf(
+                                    '<strong>%1$s</strong> %2$s',
+                                    esc_html__( 'GoCardless is connected in sandbox mode.', 'woocommerce-gateway-gocardless' ),
+                                    esc_html__( 'You need to connect a live GoCardless account before you can accept real bank payments.', 'woocommerce-gateway-gocardless' )
+                                );
+                                ?>
+                            </span>
+                        </div>
+                    <?php endif; ?>
                 <?php endif; ?>
 
@@ -702 +710 @@
             $this->save_payment_method_checkbox();
         }
-        if ( is_wc_endpoint_url( 'order-pay' ) ) {
-            ?>
-            <div id="wc-gocardless-hidden-fields">
-                <input name="wc-gocardless-billing-request-id" type="hidden" value="" />
-            </div>
-            <?php
-        }
-        ?>
-        <noscript>
-            <?php esc_html_e( 'Since your browser does not support or has disabled JavaScript, you will not be able to use the GoCardless payment method. To proceed with your payment, please enable JavaScript in your current browser or switch to a browser that supports JavaScript.', 'woocommerce-gateway-gocardless' ); ?>
-        </noscript>
-        <?php
     }
 
@@ -931 +927 @@
             ),
             'links'              => array( 'billing_request' => $billing_request_id ),
+            'redirect_uri'       => $this->get_success_redirect_url( $order ),
+            'exit_uri'           => $order->get_checkout_payment_url(),
         );
 
@@ -951 +949 @@
             );
         }
-        if ( empty( $billing_request_flow['billing_request_flows']['id'] ) ) {
+        if ( empty( $billing_request_flow['billing_request_flows']['id'] ) || empty( $billing_request_flow['billing_request_flows']['authorisation_url'] ) ) {
             return array(
                 'result'  => 'failure',
@@ -962 +960 @@
 
         $response = array(
-            'result'                  => 'success',
-            'redirect'                => $order->get_checkout_payment_url(),
-            'billing_request_flow_id' => $billing_request_flow['billing_request_flows']['id'],
+            'result'   => 'success',
+            'redirect' => esc_url_raw( $billing_request_flow['billing_request_flows']['authorisation_url'] ),
         );
 
-        // Update nonce if the customer is created.
-        if ( did_action( 'woocommerce_created_customer' ) > 0 ) {
-            $response['billing_request_nonce'] = wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' );
-        }
-
-        return $response;
-    }
-
-    /**
-     * Process payment for pay page.
-     *
-     * @param WC_Order $order Order object.
-     * @return array Returns array with redirect url succeed, otherwise array with error message is returned.
-     */
-    public function process_payment_for_pay_page( WC_Order $order ) {
-        $billing_request_id = isset( $_POST['wc-gocardless-billing-request-id'] ) ? sanitize_text_field( wp_unslash( $_POST['wc-gocardless-billing-request-id'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification is already handled on the WooCommerce side.
-        if ( empty( $billing_request_id ) ) {
-            wc_add_notice( esc_html__( 'Billing request ID is required.', 'woocommerce-gateway-gocardless' ), 'error' );
-            return array(
-                'result'  => 'failure',
-                'message' => esc_html__( 'Billing request ID is required.', 'woocommerce-gateway-gocardless' ),
-            );
-        }
-
-        $save_token = (
-            ! empty( $_POST['wc-gocardless-new-payment-method'] ) //phpcs:ignore WordPress.Security.NonceVerification -- Nonce verification is already handled on the WooCommerce side.
-            && $this->saved_bank_accounts
-            && get_current_user_id()
-        );
-
-        $response = $this->handle_billing_request_complete( $order, $billing_request_id, $save_token );
-        if ( 'failure' === $response['result'] ) {
-            wc_add_notice( $response['message'], 'error' );
-        }
         return $response;
     }
@@ -1130 +1093 @@
 
     /**
-     * Set logged_in cookie with current request using new login session (to ensure consistent nonce).
-     * Only apply during the checkout process with the account creation.
-     *
-     * @param string $cookie Cookie value.
-     */
-    public function set_cookie_on_current_request( $cookie ) {
-        if ( defined( 'WOOCOMMERCE_CHECKOUT' ) && WOOCOMMERCE_CHECKOUT && did_action( 'woocommerce_created_customer' ) > 0 ) {
-            if ( ! defined( 'LOGGED_IN_COOKIE' ) ) {
-                return;
-            }
-
-            $_COOKIE[ LOGGED_IN_COOKIE ] = $cookie;
-        }
-    }
-
-    /**
      * Process the payment and return the result
      *
@@ -1157 +1104 @@
         if ( $this->_is_processing_payment_with_saved_token() ) {
             return $this->_process_payment_with_saved_token( $order );
-        }
-
-        if ( isset( $_GET['pay_for_order'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce verification is already handled on the WooCommerce side.
-            // Pay for order page.
-            return $this->process_payment_for_pay_page( $order );
         }
 
@@ -1250 +1192 @@
     /**
      * Get success redirect URL.
-     *
-     * @since 2.4.0
-     * @deprecated 2.7.0
+     * URL to redirect after successfull GoCardless transcation.
+     *
+     * @since 2.4.0
      *
      * @param WC_Order|int $order Order object or ID.
@@ -1259 +1201 @@
      */
     public function get_success_redirect_url( $order ) {
-        wc_deprecated_function( __METHOD__, '2.7.0' );
-
-        $order    = wc_get_order( $order );
-        $order_id = wc_gocardless_get_order_prop( $order, 'id' );
-        $params   = array(
-            'request'  => 'redirect_flow',
-            'order_id' => $order_id,
+        $order              = wc_get_order( $order );
+        $order_id           = wc_gocardless_get_order_prop( $order, 'id' );
+        $billing_request_id = $this->get_order_resource( $order_id, 'billing_request', 'id' );
+        $params             = array(
+            'request'            => 'billing_request_flow',
+            'order_id'           => $order_id,
+            'billing_request_id' => $billing_request_id,
         );
 
@@ -1275 +1217 @@
 
         if ( $save_token ) {
-            $params['save_customer_token'] = 'true';
-        }
-
-        $url = add_query_arg( $params, WC()->api_request_url( __CLASS__, true ) );
+            $params['save_customer_token'] = 'yes';
+        }
+
+        $url = add_query_arg( $params, WC()->api_request_url( 'WC_Gateway_GoCardless', true ) );
 
         return $url;
@@ -1317 +1259 @@
 
             switch ( $_GET['request'] ) { //phpcs:ignore WordPress.Security.NonceVerification
+                case 'billing_request_flow':
+                    $this->handle_billing_request_flow();
+                    break;
                 case 'webhook':
                     $this->_handle_webhook();
@@ -1327 +1272 @@
             header( 'HTTP/1.1 400 Bad request' );
             wp_send_json_error( array( 'message' => $e->getMessage() ) );
+        }
+    }
+
+    /**
+     * Handle redirect back from GoCardless for billing request flow.
+     *
+     * @since 2.9.6
+     *
+     * @return void
+     */
+    protected function handle_billing_request_flow() {
+        try {
+            if ( empty( $_GET['billing_request_id'] ) || empty( $_GET['order_id'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification
+                throw new Exception( esc_html__( 'Invalid billing request flow request.', 'woocommerce-gateway-gocardless' ) );
+            }
+            $order_id           = absint( $_GET['order_id'] ); //phpcs:ignore WordPress.Security.NonceVerification
+            $billing_request_id = sanitize_text_field( wp_unslash( $_GET['billing_request_id'] ) ); //phpcs:ignore WordPress.Security.NonceVerification
+            $order              = wc_get_order( $order_id );
+
+            if ( ! $order ) {
+                throw new Exception( esc_html__( 'Order not found.', 'woocommerce-gateway-gocardless' ) );
+            }
+
+            wc_gocardless()->log( sprintf( '%s - Maybe redirected from GoCardless with billing_request_id "%s" and order ID %s', __METHOD__, $billing_request_id, $order_id ) );
+
+            $save_bank_accounts  = 'yes' === $this->get_option( 'saved_bank_accounts', 'no' );
+            $save_customer_token = (
+                ! empty( $_GET['save_customer_token'] ) && //phpcs:ignore WordPress.Security.NonceVerification
+                'yes' === wc_clean( wp_unslash( $_GET['save_customer_token'] ) ) && //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                get_current_user_id() &&
+                $save_bank_accounts
+            );
+
+            $response = $this->handle_billing_request_complete( $order, $billing_request_id, $save_customer_token );
+            if ( 'success' === $response['result'] ) {
+                wp_safe_redirect( $response['redirect'] );
+                exit;
+            } else {
+                wc_add_notice( $response['message'], 'error' );
+                wp_safe_redirect( wc_get_page_permalink( 'checkout' ) );
+                exit;
+            }
+        } catch ( Exception $e ) {
+            wc_gocardless()->log( sprintf( '%s - Error when handling billing request flow request: %s', __METHOD__, $e->getMessage() ) );
+
+            $order           = wc_get_order( $order_id );
+            $current_user_id = get_current_user_id();
+
+            $error_message = __( 'We were unable to process your order.', 'woocommerce-gateway-gocardless' );
+
+            // Only include the "Cancel order" URL for users that own the order.
+            if ( $current_user_id && $current_user_id === $order->get_customer_id() ) {
+                /* translators: Link to retry cancel order */
+                $error_message = sprintf( __( 'We were unable to process your order, <a href="%s">click here to try again</a>.', 'woocommerce-gateway-gocardless' ), $order->get_cancel_order_url() );
+            }
+
+            $error_message = sprintf(
+                '%1$s %2$s<br><br>%3$s',
+                $error_message,
+                __( 'If the problem still persists please contact us with the details below.', 'woocommerce-gateway-gocardless' ),
+                $e->getMessage()
+            );
+
+            wc_add_notice( $error_message, 'error' );
+
+            wp_safe_redirect( wc_get_page_permalink( 'checkout' ) );
         }
     }
@@ -1620 +1631 @@
             }
 
+            wc_gocardless()->log( sprintf( '%s - Handling webhook. Payload: %s', __METHOD__, print_r( $payload, true ) ) );
+
             $args = array( $payload );
 
             // Process the webhook payload asynchronously.
-            WC()->queue()->schedule_single(
+            $action_id = WC()->queue()->schedule_single(
                 WC()->call_function( 'time' ) + 1,
                 'woocommerce_gocardless_process_webhook_payload_async',
@@ -1630 +1643 @@
             );
 
+            // If the action is not scheduled, return error to GoCardless, to get a retry.
+            if ( empty( $action_id ) ) {
+                wc_gocardless()->log( sprintf( '%s - Failed to schedule action to process webhook.', __METHOD__ ) );
+                header( 'HTTP/1.1 500 Internal Server Error' );
+                throw new Exception( esc_html__( 'Failed to schedule action to process webhook.', 'woocommerce-gateway-gocardless' ) );
+            }
+
+            wc_gocardless()->log( sprintf( '%s - Action scheduled with ID %d, to process webhook.', __METHOD__, $action_id ) );
         } catch ( Exception $e ) {
+            wc_gocardless()->log( sprintf( '%s - Error when handling webhook: %s', __METHOD__, $e->getMessage() ) );
             wp_send_json_error( array( 'message' => $e->getMessage() ) );
         }
@@ -2563 +2585 @@
      * @since 2.4.0
      *
-     * @param array            $item          Item of payment method.
-     * @param WC_Payment_Token $payment_token The payment token associated with
-     *                                        this method entry.
+     * @param array                                    $item          Item of payment method.
+     * @param WC_GoCardless_Payment_Token_Direct_Debit $payment_token The payment token associated with this method entry.
      *
      * @return array Filtered item for direct debit.
@@ -2656 +2677 @@
             );
         }
-    }
-
-    /**
-     * Enqueue scripts on order page for payment dropin.
-     *
-     * @return void
-     */
-    public function enqueue_scripts() {
-        // Only load scripts on checkout page, if access token is available and gateway is enabled.
-        if ( ! is_checkout() || ! $this->access_token || 'yes' !== $this->enabled ) {
-            return;
-        }
-
-        $asset_path   = wc_gocardless()->plugin_path . '/build/wc-gocardless-checkout.asset.php';
-        $version      = wc_gocardless()->version;
-        $dependencies = array();
-        if ( file_exists( $asset_path ) ) {
-            $asset        = require $asset_path;
-            $version      = is_array( $asset ) && isset( $asset['version'] )
-                ? $asset['version']
-                : $version;
-            $dependencies = is_array( $asset ) && isset( $asset['dependencies'] )
-                ? $asset['dependencies']
-                : $dependencies;
-        }
-
-        wp_enqueue_script(
-            'gocardless-dropin',
-            'https://pay.gocardless.com/billing/static/dropin/v2/initialise.js',
-            array(),
-            $version,
-            true
-        );
-
-        wp_enqueue_script(
-            'wc-gocardless-checkout-js',
-            wc_gocardless()->plugin_url . '/build/wc-gocardless-checkout.js',
-            $dependencies,
-            $version,
-            true
-        );
-
-        wp_localize_script(
-            'wc-gocardless-checkout-js',
-            'wc_gocardless_checkout_params',
-            array(
-                'is_test'                        => $this->testmode,
-                'ajax_url'                       => WC_AJAX::get_endpoint( '%%endpoint%%' ),
-                'create_billing_request_nonce'   => wp_create_nonce( 'wc_gocardless_create_billing_request_flow' ),
-                'complete_billing_request_nonce' => wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' ),
-                'is_order_pay_page'              => is_checkout() && is_wc_endpoint_url( 'order-pay' ),
-                'order_id'                       => absint( get_query_var( 'order-pay' ) ),
-                'generic_error'                  => __( 'An error occurred while processing the payment.', 'woocommerce-gateway-gocardless' ),
-            )
-        );
     }
 

woocommerce-gateway-gocardless/tags/2.9.6/readme.txt

@@ -3 +3 @@
 Tags:         gocardless, woocommerce, direct debit, instant bank pay
 Tested up to: 6.8
-Stable tag:   2.9.5
+Stable tag:   2.9.6
 License:      GPL-3.0-or-later
 License URI:  https://spdx.org/licenses/GPL-3.0-or-later.html
@@ -140 +140 @@
 
 == Changelog ==
+
+= 2.9.6 - 2025-07-02 =
+* Add - Respond with an error to the GoCardless webhook call if the scheduling action fails.
+* Add - A notice indicating that GoCardless is connected in sandbox mode if the merchant is connected to a sandbox account.
+* Update - Replaced JavaScript Drop-in with the redirect-to-GoCardless approach for the transaction/direct debit setup.
+* Dev - Bump WooCommerce "tested up to" version 10.0.
+* Dev - Bump WooCommerce minimum supported version to 9.8.
 
 = 2.9.5 - 2025-05-15 =
@@ -236 +243 @@
 * Tweak - Update the payment method title to "Pay by bank" and change the logo to the GoCardless logo.
 
-= 2.6.4 - 2024-04-01 =
-* Dev - Bump WooCommerce "tested up to" version 8.7.
-* Dev - Bump WooCommerce minimum supported version to 8.4.
-* Dev - Bump WordPress "tested up to" version 6.5.
-
-= 2.6.3 - 2024-02-05 =
-* Fix - Allow customers to update subscription payment methods via Woo Subscriptions.
-* Dev - Bump WooCommerce "tested up to" version 8.5.
-* Dev - Bump WooCommerce minimum supported version to 8.3.
-* Dev - Bump WordPress minimum supported version to 6.3.
-
-= 2.6.2 - 2024-01-08 =
-* Tweak - Bump PHP "tested up to" version 8.3.
-* Dev - Declare compatibility with Product Editor.
-* Dev - Bump WooCommerce "tested up to" version 8.4.
-* Dev - Bump WooCommerce minimum supported version to 8.2.
-* Dev - Bump PHP minimum supported version to 7.4.
-
 [See changelog details prior to 2024 here](https://github.com/gocardless/woocommerce-gateway-gocardless/blob/trunk/changelog.txt).

woocommerce-gateway-gocardless/tags/2.9.6/woocommerce-gateway-gocardless.php

@@ -4 +4 @@
  * Plugin URI:           https://www.woocommerce.com/products/gocardless/
  * Description:          Extends both WooCommerce and WooCommerce Subscriptions with the GoCardless Payment Gateway. A GoCardless merchant account is required.
- * Version:              2.9.5
+ * Version:              2.9.6
  * Requires at least:    6.6
  * Requires PHP:         7.4
@@ -13 +13 @@
  * License URI:          https://spdx.org/licenses/GPL-3.0-or-later.html
  * Requires Plugins:     woocommerce
- * WC requires at least: 9.6
- * WC tested up to:      9.8
+ * WC requires at least: 9.8
+ * WC tested up to:      10.0
  *
  * Copyright: © 2023-2025 WooCommerce
@@ -39 +39 @@
      * @var string
      */
-    public $version = '2.9.5'; // WRCS: DEFINED_VERSION.
+    public $version = '2.9.6'; // WRCS: DEFINED_VERSION.
 
     /**

woocommerce-gateway-gocardless/trunk/assets/css/admin.css

@@ -40 +40 @@
     margin-top: 6px;
 }
+
+.wcgc-sandbox-mode-notice {
+    margin-top: 12px;
+    align-items: center;
+    background-color: #fff2d7;
+    color: #4d3716;
+    display: flex;
+    font-size: 13px;
+    padding: 12px;
+    width: max-content;
+}

woocommerce-gateway-gocardless/trunk/build/index.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '494e4afed799f2cde0fa');
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-html-entities', 'wp-i18n'), 'version' => '70c5c2023330429d40bb');

woocommerce-gateway-gocardless/trunk/build/index.js

@@ -1 @@
-(()=>{"use strict";var e={20:(e,t,o)=>{var s=o(609),r=Symbol.for("react.element"),n=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),i=s.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,a={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,o){var s,l={},c=null,d=null;for(s in void 0!==o&&(c=""+o),void 0!==t.key&&(c=""+t.key),void 0!==t.ref&&(d=t.ref),t)n.call(t,s)&&!a.hasOwnProperty(s)&&(l[s]=t[s]);if(e&&e.defaultProps)for(s in t=e.defaultProps)void 0===l[s]&&(l[s]=t[s]);return{$$typeof:r,type:e,key:c,ref:d,props:l,_owner:i.current}}},848:(e,t,o)=>{e.exports=o(20)},609:e=>{e.exports=window.React}},t={};const o=window.wp.htmlEntities,s=window.wp.i18n,r=window.wc.wcBlocksRegistry,n=window.wp.element,i=window.wc.wcSettings,a=()=>{const e=(0,i.getSetting)("gocardless_data",null);if(!e)throw new Error((0,s.__)("GoCardless initialization data is not available","woocommerce-gateway-gocardless"));return e};var l,c,d,u=function o(s){var r=t[s];if(void 0!==r)return r.exports;var n=t[s]={exports:{}};return e[s](n,n.exports,o),n.exports}(848);const{description:p,logo_url:w,title:g,isTest:m,billingRequestNonce:_}=a(),f=e=>{const{eventRegistration:t,emitResponse:r,shouldSavePayment:i}=e,{onCheckoutSuccess:l}=t;return(0,n.useEffect)((()=>l((e=>{let t;return new Promise(((o,n)=>{const l={type:"error",messageContext:r.noticeContexts.PAYMENTS},{GoCardlessDropin:c}=window;if(!c)return void o({...l,message:(0,s.__)("GoCardless Drop-in is not available","woocommerce-gateway-gocardless")});const d=e?.processingResponse?.paymentDetails?.billing_request_flow_id,u=e?.processingResponse?.paymentDetails?.billing_request_nonce||_;if(!d)return void o({...l,message:(0,s.__)("Invalid billing request flow ID","woocommerce-gateway-gocardless")});const p={billingRequestFlowID:d,environment:m?"sandbox":"live",onSuccess:(t,r)=>{w(),t&&["fulfilling","fulfilled"].includes(t.status)?(e=>{const{wcAjaxUrl:t}=a(),o=new FormData;for(const t in e)o.append(t,e[t]);const s=t.replace("%%endpoint%%","gocardless_complete_billing_request_flow");return fetch(s,{method:"POST",body:o}).then((e=>e.json()))})({security:u,order_id:e.orderId,billing_request_id:t.id,save_customer_token:i?"yes":"no"}).then((e=>{e&&e.success?o({type:"success",redirectUrl:e.data.redirect_url}):o({...l,message:e.data?.message})})).catch((e=>{o({...l,message:e.message})})):o({...l,message:(0,s.__)("Billing request is not fulfulling or fulfilled yet, please try again later.","woocommerce-gateway-gocardless")})},onExit:(t,o)=>{t&&console.error(t),window.location.href=e.redirectUrl}};t=c.create(p),t.open();const w=()=>{t?.exit()}}))}))),[l,i,r.noticeContexts.PAYMENTS]),(0,o.decodeEntities)(p||"")},y=()=>(0,u.jsx)("img",{src:w,alt:(0,o.decodeEntities)(g),style:{marginRight:"12px",marginBottom:"4px"}}),v=e=>{const{PaymentMethodLabel:t}=e.components;return(0,u.jsx)(t,{text:(0,o.decodeEntities)(g),icon:(0,u.jsx)(y,{})})};(0,r.registerPaymentMethod)({name:"gocardless",label:(0,u.jsx)(v,{}),ariaLabel:(0,s.__)("GoCardless payment method","woocommerce-gateway-gocardless"),canMakePayment:({billingData:e,cartTotals:t})=>{const o=t?.currency_code,s=a()?.supportedCountries||[],r=a()?.supportedCurrencies||[];return s.includes(e?.country)&&r.includes(o)},content:(0,u.jsx)(f,{}),edit:(0,u.jsx)(f,{}),supports:{showSavedCards:null!==(l=a().showSavedCards)&&void 0!==l&&l,showSaveOption:null!==(c=a().showSaveOption)&&void 0!==c&&c,features:null!==(d=a()?.supports)&&void 0!==d?d:[]}})})();
+(()=>{"use strict";var e={20:(e,t,o)=>{var r=o(609),n=Symbol.for("react.element"),s=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),a=r.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,o){var r,c={},l=null,d=null;for(r in void 0!==o&&(l=""+o),void 0!==t.key&&(l=""+t.key),void 0!==t.ref&&(d=t.ref),t)s.call(t,r)&&!i.hasOwnProperty(r)&&(c[r]=t[r]);if(e&&e.defaultProps)for(r in t=e.defaultProps)void 0===c[r]&&(c[r]=t[r]);return{$$typeof:n,type:e,key:l,ref:d,props:c,_owner:a.current}}},848:(e,t,o)=>{e.exports=o(20)},609:e=>{e.exports=window.React}},t={};const o=window.wp.htmlEntities,r=window.wp.i18n,n=window.wc.wcBlocksRegistry,s=window.wc.wcSettings,a=()=>{const e=(0,s.getSetting)("gocardless_data",null);if(!e)throw new Error((0,r.__)("GoCardless initialization data is not available","woocommerce-gateway-gocardless"));return e};var i,c,l,d=function o(r){var n=t[r];if(void 0!==n)return n.exports;var s=t[r]={exports:{}};return e[r](s,s.exports,o),s.exports}(848);const{description:p,logo_url:u,title:w}=a(),_=e=>(0,o.decodeEntities)(p||""),y=()=>(0,d.jsx)("img",{src:u,alt:(0,o.decodeEntities)(w),style:{marginRight:"12px",marginBottom:"4px"}}),m=e=>{const{PaymentMethodLabel:t}=e.components;return(0,d.jsx)(t,{text:(0,o.decodeEntities)(w),icon:(0,d.jsx)(y,{})})};(0,n.registerPaymentMethod)({name:"gocardless",label:(0,d.jsx)(m,{}),ariaLabel:(0,r.__)("GoCardless payment method","woocommerce-gateway-gocardless"),canMakePayment:({billingData:e,cartTotals:t})=>{const o=t?.currency_code,r=a()?.supportedCountries||[],n=a()?.supportedCurrencies||[];return r.includes(e?.country)&&n.includes(o)},content:(0,d.jsx)(_,{}),edit:(0,d.jsx)(_,{}),supports:{showSavedCards:null!==(i=a().showSavedCards)&&void 0!==i&&i,showSaveOption:null!==(c=a().showSaveOption)&&void 0!==c&&c,features:null!==(l=a()?.supports)&&void 0!==l?l:[]}})})();

woocommerce-gateway-gocardless/trunk/changelog.txt

@@ -1 +1 @@
 *** GoCardless for WooCommerce Changelog ***
+
+2025-07-02 - version 2.9.6
+* Add - Respond with an error to the GoCardless webhook call if the scheduling action fails.
+* Add - A notice indicating that GoCardless is connected in sandbox mode if the merchant is connected to a sandbox account.
+* Update - Replaced JavaScript Drop-in with the redirect-to-GoCardless approach for the transaction/direct debit setup.
+* Dev - Bump WooCommerce "tested up to" version 10.0.
+* Dev - Bump WooCommerce minimum supported version to 9.8.
 
 2025-05-15 - version 2.9.5

woocommerce-gateway-gocardless/trunk/client/blocks/gocardless-utils.js

@@ -20 +20 @@
     return goCardlessServerData;
 };
-
-/**
- * Call the server to complete a billing request flow.
- *
- * @param {Object} data Data to send to the server.
- * @return {Promise<Object>} Response from the server.
- */
-export const completeBillingRequestFlow = (data) => {
-    const { wcAjaxUrl } = getGoCardlessServerData();
-    const formData = new FormData();
-    for (const key in data) {
-        formData.append(key, data[key]);
-    }
-    const ajaxUrl = wcAjaxUrl.replace(
-        '%%endpoint%%',
-        'gocardless_complete_billing_request_flow'
-    );
-
-    return fetch(ajaxUrl, {
-        method: 'POST',
-        body: formData,
-    }).then((response) => response.json());
-};

woocommerce-gateway-gocardless/trunk/client/blocks/index.js

@@ -5 +5 @@
 import { __ } from '@wordpress/i18n';
 import { registerPaymentMethod } from '@woocommerce/blocks-registry';
-import { useEffect } from '@wordpress/element';
 
 /**
@@ -11 +10 @@
  */
 import { PAYMENT_METHOD_NAME } from './constants';
-import {
-    completeBillingRequestFlow,
-    getGoCardlessServerData,
-} from './gocardless-utils';
+import { getGoCardlessServerData } from './gocardless-utils';
 
 const {
@@ -20 +16 @@
     logo_url: logoUrl,
     title,
-    isTest,
-    billingRequestNonce,
 } = getGoCardlessServerData();
 
 const Content = (props) => {
-    const { eventRegistration, emitResponse, shouldSavePayment } = props;
-    const { onCheckoutSuccess } = eventRegistration;
-
-    // Handle the checkout success event.
-    useEffect(() => {
-        const unsubscribe = onCheckoutSuccess((data) => {
-            let handler;
-            // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-            return new Promise((resolve, reject) => {
-                const errorOptions = {
-                    type: 'error',
-                    messageContext: emitResponse.noticeContexts.PAYMENTS,
-                };
-
-                const { GoCardlessDropin } = window;
-                if (!GoCardlessDropin) {
-                    resolve({
-                        ...errorOptions,
-                        message: __(
-                            'GoCardless Drop-in is not available',
-                            'woocommerce-gateway-gocardless'
-                        ),
-                    });
-                    return;
-                }
-
-                const billingRequestFlowId =
-                    data?.processingResponse?.paymentDetails
-                        ?.billing_request_flow_id;
-                const securityNonce = data?.processingResponse?.paymentDetails?.billing_request_nonce || billingRequestNonce;
-                if (!billingRequestFlowId) {
-                    resolve({
-                        ...errorOptions,
-                        message: __(
-                            'Invalid billing request flow ID',
-                            'woocommerce-gateway-gocardless'
-                        ),
-                    });
-                    return;
-                }
-
-                const options = {
-                    billingRequestFlowID: billingRequestFlowId,
-                    environment: isTest ? 'sandbox' : 'live',
-                    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-                    onSuccess: (billingRequest, billingRequestFlow) => {
-                        closeDropIn();
-                        if (
-                            billingRequest &&
-                            ['fulfilling', 'fulfilled'].includes(
-                                billingRequest.status
-                            )
-                        ) {
-                            const params = {
-                                security: securityNonce,
-                                order_id: data.orderId,
-                                billing_request_id: billingRequest.id,
-                                save_customer_token: shouldSavePayment
-                                    ? 'yes'
-                                    : 'no',
-                            };
-
-                            completeBillingRequestFlow(params)
-                                .then((res) => {
-                                    if (res && res.success) {
-                                        resolve({
-                                            type: 'success',
-                                            redirectUrl: res.data.redirect_url,
-                                        });
-                                    } else {
-                                        resolve({
-                                            ...errorOptions,
-                                            message: res.data?.message,
-                                        });
-                                    }
-                                })
-                                .catch((error) => {
-                                    resolve({
-                                        ...errorOptions,
-                                        message: error.message,
-                                    });
-                                });
-                        } else {
-                            resolve({
-                                ...errorOptions,
-                                message: __(
-                                    'Billing request is not fulfulling or fulfilled yet, please try again later.',
-                                    'woocommerce-gateway-gocardless'
-                                ),
-                            });
-                        }
-                    },
-                    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-                    onExit: (error, metadata) => {
-                        if (error) {
-                            console.error(error); // eslint-disable-line no-console
-                        }
-                        window.location.href = data.redirectUrl;
-                    },
-                };
-                handler = GoCardlessDropin.create(options);
-                handler.open();
-                const closeDropIn = () => {
-                    handler?.exit();
-                };
-            });
-        });
-        return unsubscribe;
-    }, [
-        onCheckoutSuccess,
-        shouldSavePayment,
-        emitResponse.noticeContexts.PAYMENTS,
-    ]);
-
     return decodeEntities(description || '');
 };

woocommerce-gateway-gocardless/trunk/includes/class-wc-gocardless-ajax.php

@@ -32 +32 @@
      */
     public function init() {
-        // Ajax handler for billing request flow.
-        add_action( 'wc_ajax_gocardless_create_billing_request_flow', array( $this, 'ajax_create_billing_request_flow' ) );
-        add_action( 'wc_ajax_gocardless_complete_billing_request_flow', array( $this, 'ajax_complete_billing_request_flow' ) );
         add_action( 'wc_ajax_gocardless_regenerate_webhook_secret', array( $this, 'ajax_regenerate_webhook_secret' ) );
     }
@@ -51 +48 @@
 
         return $this->gateway;
-    }
-
-
-    /**
-     * Create a billing request and billing request flow to process the payment.
-     *
-     * This method creates a billing request and billing request flow to process the payment.
-     *
-     * @see https://developer.gocardless.com/api-reference/#billing-requests-billing-requests
-     * @see https://developer.gocardless.com/api-reference/#billing-requests-billing-request-flows
-     *
-     * @since 2.7.0
-     */
-    public function ajax_create_billing_request_flow() {
-        check_ajax_referer( 'wc_gocardless_create_billing_request_flow', 'security' );
-
-        $order_id = isset( $_POST['order_id'] ) ? absint( $_POST['order_id'] ) : 0;
-
-        $order = wc_get_order( $order_id );
-        if ( ! $order ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Invalid order.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        $gateway              = $this->get_gateway();
-        $billing_request_flow = $gateway->create_billing_request_flow( $order );
-        if ( 'success' === $billing_request_flow['result'] ) {
-            $billing_request_flow_id = $billing_request_flow['billing_request_flow_id'];
-            wp_send_json_success( array( 'billing_request_flow_id' => $billing_request_flow_id ) );
-        } else {
-            $message = $billing_request_flow['message'] ?? esc_html__( 'Failed to create billing request flow.', 'woocommerce-gateway-gocardless' );
-            wp_send_json_error( array( 'message' => $message ) );
-        }
-    }
-
-    /**
-     * Complete the billing request flow.
-     *
-     * @since 2.7.0
-     */
-    public function ajax_complete_billing_request_flow() {
-        check_ajax_referer( 'wc_gocardless_complete_billing_request_flow', 'security' );
-        $order_id           = isset( $_POST['order_id'] ) ? absint( $_POST['order_id'] ) : 0;
-        $billing_request_id = isset( $_POST['billing_request_id'] ) ? wc_clean( wp_unslash( $_POST['billing_request_id'] ) ) : '';
-
-        // Maybe save customer token.
-        $gateway             = $this->get_gateway();
-        $save_bank_accounts  = 'yes' === $gateway->get_option( 'saved_bank_accounts', 'yes' );
-        $save_customer_token = (
-            ! empty( $_POST['save_customer_token'] ) &&
-            'yes' === wc_clean( wp_unslash( $_POST['save_customer_token'] ) ) &&
-            get_current_user_id() &&
-            $save_bank_accounts
-        );
-
-        if ( ! $order_id || ! $billing_request_id ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Invalid request.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        $order = wc_get_order( $order_id );
-        if ( ! $order ) {
-            wp_send_json_error( array( 'message' => esc_html__( 'Order not found.', 'woocommerce-gateway-gocardless' ) ) );
-        }
-
-        wc_gocardless()->log( sprintf( '%s - GoCardless billing request fulfilled ajax call: "%s" and order ID %s', __METHOD__, $billing_request_id, $order_id ) );
-
-        $response = $gateway->handle_billing_request_complete( $order, $billing_request_id, $save_customer_token );
-        if ( 'success' === $response['result'] ) {
-            wp_send_json_success( array( 'redirect_url' => $response['redirect'] ) );
-        } else {
-            $message = ! empty( $response['message'] ) ? $response['message'] : esc_html__( 'Failed to process billing request.', 'woocommerce-gateway-gocardless' );
-            wp_send_json_error( array( 'message' => $message ) );
-        }
     }
 

woocommerce-gateway-gocardless/trunk/includes/class-wc-gocardless-gateway-blocks-support.php

@@ -61 +61 @@
         }
 
-        // Register GoCardless Drop-in script.
-        wp_register_script(
-            'gocardless-dropin',
-            'https://pay.gocardless.com/billing/static/dropin/v2/initialise.js',
-            array(),
-            $version,
-            true
-        );
-
         wp_register_script(
             'wc-gocardless-blocks-integration',
@@ -82 +73 @@
         );
 
-        return array( 'gocardless-dropin', 'wc-gocardless-blocks-integration' );
+        return array( 'wc-gocardless-blocks-integration' );
     }
 
@@ -100 +91 @@
             'supportedCountries'  => WC_GoCardless_API::get_supported_countries(),
             'supportedCurrencies' => WC_GoCardless_API::get_supported_currencies(),
-            'isTest'              => 'yes' === $this->settings['testmode'],
-            'wcAjaxUrl'           => WC_AJAX::get_endpoint( '%%endpoint%%' ),
-            'billingRequestNonce' => wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' ),
         );
     }

woocommerce-gateway-gocardless/trunk/includes/class-wc-gocardless-gateway.php

@@ -116 +116 @@
         add_filter( 'woocommerce_payment_methods_list_item', array( $this, 'saved_payment_methods_list_item' ), 99, 2 );
         add_action( 'woocommerce_account_payment_methods_column_method', array( $this, 'saved_payment_methods_column_method' ) );
-
-        // Order Pay (Receipt) page handling for complete billing request flow.
-        add_filter( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-
-        // Update the logged_in cookie in current request, after a guest user is created to avoid nonce inconsistencies.
-        add_action( 'set_logged_in_cookie', array( $this, 'set_cookie_on_current_request' ) );
     }
 
@@ -231 +225 @@
                 <?php if ( ! empty( $access_token ) ) : ?>
                     <span class="gocardless-connected"><span style="color: #00a32a">&#9679;</span>&nbsp;<?php esc_html_e( 'Connected', 'woocommerce-gateway-gocardless' ); ?></span>
+
+                    <?php if ( $this->testmode ) : ?>
+                        <div class="wcgc-sandbox-mode-notice">
+                            <span>
+                                <?php
+                                printf(
+                                    '<strong>%1$s</strong> %2$s',
+                                    esc_html__( 'GoCardless is connected in sandbox mode.', 'woocommerce-gateway-gocardless' ),
+                                    esc_html__( 'You need to connect a live GoCardless account before you can accept real bank payments.', 'woocommerce-gateway-gocardless' )
+                                );
+                                ?>
+                            </span>
+                        </div>
+                    <?php endif; ?>
                 <?php endif; ?>
 
@@ -702 +710 @@
             $this->save_payment_method_checkbox();
         }
-        if ( is_wc_endpoint_url( 'order-pay' ) ) {
-            ?>
-            <div id="wc-gocardless-hidden-fields">
-                <input name="wc-gocardless-billing-request-id" type="hidden" value="" />
-            </div>
-            <?php
-        }
-        ?>
-        <noscript>
-            <?php esc_html_e( 'Since your browser does not support or has disabled JavaScript, you will not be able to use the GoCardless payment method. To proceed with your payment, please enable JavaScript in your current browser or switch to a browser that supports JavaScript.', 'woocommerce-gateway-gocardless' ); ?>
-        </noscript>
-        <?php
     }
 
@@ -931 +927 @@
             ),
             'links'              => array( 'billing_request' => $billing_request_id ),
+            'redirect_uri'       => $this->get_success_redirect_url( $order ),
+            'exit_uri'           => $order->get_checkout_payment_url(),
         );
 
@@ -951 +949 @@
             );
         }
-        if ( empty( $billing_request_flow['billing_request_flows']['id'] ) ) {
+        if ( empty( $billing_request_flow['billing_request_flows']['id'] ) || empty( $billing_request_flow['billing_request_flows']['authorisation_url'] ) ) {
             return array(
                 'result'  => 'failure',
@@ -962 +960 @@
 
         $response = array(
-            'result'                  => 'success',
-            'redirect'                => $order->get_checkout_payment_url(),
-            'billing_request_flow_id' => $billing_request_flow['billing_request_flows']['id'],
+            'result'   => 'success',
+            'redirect' => esc_url_raw( $billing_request_flow['billing_request_flows']['authorisation_url'] ),
         );
 
-        // Update nonce if the customer is created.
-        if ( did_action( 'woocommerce_created_customer' ) > 0 ) {
-            $response['billing_request_nonce'] = wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' );
-        }
-
-        return $response;
-    }
-
-    /**
-     * Process payment for pay page.
-     *
-     * @param WC_Order $order Order object.
-     * @return array Returns array with redirect url succeed, otherwise array with error message is returned.
-     */
-    public function process_payment_for_pay_page( WC_Order $order ) {
-        $billing_request_id = isset( $_POST['wc-gocardless-billing-request-id'] ) ? sanitize_text_field( wp_unslash( $_POST['wc-gocardless-billing-request-id'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification is already handled on the WooCommerce side.
-        if ( empty( $billing_request_id ) ) {
-            wc_add_notice( esc_html__( 'Billing request ID is required.', 'woocommerce-gateway-gocardless' ), 'error' );
-            return array(
-                'result'  => 'failure',
-                'message' => esc_html__( 'Billing request ID is required.', 'woocommerce-gateway-gocardless' ),
-            );
-        }
-
-        $save_token = (
-            ! empty( $_POST['wc-gocardless-new-payment-method'] ) //phpcs:ignore WordPress.Security.NonceVerification -- Nonce verification is already handled on the WooCommerce side.
-            && $this->saved_bank_accounts
-            && get_current_user_id()
-        );
-
-        $response = $this->handle_billing_request_complete( $order, $billing_request_id, $save_token );
-        if ( 'failure' === $response['result'] ) {
-            wc_add_notice( $response['message'], 'error' );
-        }
         return $response;
     }
@@ -1130 +1093 @@
 
     /**
-     * Set logged_in cookie with current request using new login session (to ensure consistent nonce).
-     * Only apply during the checkout process with the account creation.
-     *
-     * @param string $cookie Cookie value.
-     */
-    public function set_cookie_on_current_request( $cookie ) {
-        if ( defined( 'WOOCOMMERCE_CHECKOUT' ) && WOOCOMMERCE_CHECKOUT && did_action( 'woocommerce_created_customer' ) > 0 ) {
-            if ( ! defined( 'LOGGED_IN_COOKIE' ) ) {
-                return;
-            }
-
-            $_COOKIE[ LOGGED_IN_COOKIE ] = $cookie;
-        }
-    }
-
-    /**
      * Process the payment and return the result
      *
@@ -1157 +1104 @@
         if ( $this->_is_processing_payment_with_saved_token() ) {
             return $this->_process_payment_with_saved_token( $order );
-        }
-
-        if ( isset( $_GET['pay_for_order'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce verification is already handled on the WooCommerce side.
-            // Pay for order page.
-            return $this->process_payment_for_pay_page( $order );
         }
 
@@ -1250 +1192 @@
     /**
      * Get success redirect URL.
-     *
-     * @since 2.4.0
-     * @deprecated 2.7.0
+     * URL to redirect after successfull GoCardless transcation.
+     *
+     * @since 2.4.0
      *
      * @param WC_Order|int $order Order object or ID.
@@ -1259 +1201 @@
      */
     public function get_success_redirect_url( $order ) {
-        wc_deprecated_function( __METHOD__, '2.7.0' );
-
-        $order    = wc_get_order( $order );
-        $order_id = wc_gocardless_get_order_prop( $order, 'id' );
-        $params   = array(
-            'request'  => 'redirect_flow',
-            'order_id' => $order_id,
+        $order              = wc_get_order( $order );
+        $order_id           = wc_gocardless_get_order_prop( $order, 'id' );
+        $billing_request_id = $this->get_order_resource( $order_id, 'billing_request', 'id' );
+        $params             = array(
+            'request'            => 'billing_request_flow',
+            'order_id'           => $order_id,
+            'billing_request_id' => $billing_request_id,
         );
 
@@ -1275 +1217 @@
 
         if ( $save_token ) {
-            $params['save_customer_token'] = 'true';
-        }
-
-        $url = add_query_arg( $params, WC()->api_request_url( __CLASS__, true ) );
+            $params['save_customer_token'] = 'yes';
+        }
+
+        $url = add_query_arg( $params, WC()->api_request_url( 'WC_Gateway_GoCardless', true ) );
 
         return $url;
@@ -1317 +1259 @@
 
             switch ( $_GET['request'] ) { //phpcs:ignore WordPress.Security.NonceVerification
+                case 'billing_request_flow':
+                    $this->handle_billing_request_flow();
+                    break;
                 case 'webhook':
                     $this->_handle_webhook();
@@ -1327 +1272 @@
             header( 'HTTP/1.1 400 Bad request' );
             wp_send_json_error( array( 'message' => $e->getMessage() ) );
+        }
+    }
+
+    /**
+     * Handle redirect back from GoCardless for billing request flow.
+     *
+     * @since 2.9.6
+     *
+     * @return void
+     */
+    protected function handle_billing_request_flow() {
+        try {
+            if ( empty( $_GET['billing_request_id'] ) || empty( $_GET['order_id'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification
+                throw new Exception( esc_html__( 'Invalid billing request flow request.', 'woocommerce-gateway-gocardless' ) );
+            }
+            $order_id           = absint( $_GET['order_id'] ); //phpcs:ignore WordPress.Security.NonceVerification
+            $billing_request_id = sanitize_text_field( wp_unslash( $_GET['billing_request_id'] ) ); //phpcs:ignore WordPress.Security.NonceVerification
+            $order              = wc_get_order( $order_id );
+
+            if ( ! $order ) {
+                throw new Exception( esc_html__( 'Order not found.', 'woocommerce-gateway-gocardless' ) );
+            }
+
+            wc_gocardless()->log( sprintf( '%s - Maybe redirected from GoCardless with billing_request_id "%s" and order ID %s', __METHOD__, $billing_request_id, $order_id ) );
+
+            $save_bank_accounts  = 'yes' === $this->get_option( 'saved_bank_accounts', 'no' );
+            $save_customer_token = (
+                ! empty( $_GET['save_customer_token'] ) && //phpcs:ignore WordPress.Security.NonceVerification
+                'yes' === wc_clean( wp_unslash( $_GET['save_customer_token'] ) ) && //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                get_current_user_id() &&
+                $save_bank_accounts
+            );
+
+            $response = $this->handle_billing_request_complete( $order, $billing_request_id, $save_customer_token );
+            if ( 'success' === $response['result'] ) {
+                wp_safe_redirect( $response['redirect'] );
+                exit;
+            } else {
+                wc_add_notice( $response['message'], 'error' );
+                wp_safe_redirect( wc_get_page_permalink( 'checkout' ) );
+                exit;
+            }
+        } catch ( Exception $e ) {
+            wc_gocardless()->log( sprintf( '%s - Error when handling billing request flow request: %s', __METHOD__, $e->getMessage() ) );
+
+            $order           = wc_get_order( $order_id );
+            $current_user_id = get_current_user_id();
+
+            $error_message = __( 'We were unable to process your order.', 'woocommerce-gateway-gocardless' );
+
+            // Only include the "Cancel order" URL for users that own the order.
+            if ( $current_user_id && $current_user_id === $order->get_customer_id() ) {
+                /* translators: Link to retry cancel order */
+                $error_message = sprintf( __( 'We were unable to process your order, <a href="%s">click here to try again</a>.', 'woocommerce-gateway-gocardless' ), $order->get_cancel_order_url() );
+            }
+
+            $error_message = sprintf(
+                '%1$s %2$s<br><br>%3$s',
+                $error_message,
+                __( 'If the problem still persists please contact us with the details below.', 'woocommerce-gateway-gocardless' ),
+                $e->getMessage()
+            );
+
+            wc_add_notice( $error_message, 'error' );
+
+            wp_safe_redirect( wc_get_page_permalink( 'checkout' ) );
         }
     }
@@ -1620 +1631 @@
             }
 
+            wc_gocardless()->log( sprintf( '%s - Handling webhook. Payload: %s', __METHOD__, print_r( $payload, true ) ) );
+
             $args = array( $payload );
 
             // Process the webhook payload asynchronously.
-            WC()->queue()->schedule_single(
+            $action_id = WC()->queue()->schedule_single(
                 WC()->call_function( 'time' ) + 1,
                 'woocommerce_gocardless_process_webhook_payload_async',
@@ -1630 +1643 @@
             );
 
+            // If the action is not scheduled, return error to GoCardless, to get a retry.
+            if ( empty( $action_id ) ) {
+                wc_gocardless()->log( sprintf( '%s - Failed to schedule action to process webhook.', __METHOD__ ) );
+                header( 'HTTP/1.1 500 Internal Server Error' );
+                throw new Exception( esc_html__( 'Failed to schedule action to process webhook.', 'woocommerce-gateway-gocardless' ) );
+            }
+
+            wc_gocardless()->log( sprintf( '%s - Action scheduled with ID %d, to process webhook.', __METHOD__, $action_id ) );
         } catch ( Exception $e ) {
+            wc_gocardless()->log( sprintf( '%s - Error when handling webhook: %s', __METHOD__, $e->getMessage() ) );
             wp_send_json_error( array( 'message' => $e->getMessage() ) );
         }
@@ -2563 +2585 @@
      * @since 2.4.0
      *
-     * @param array            $item          Item of payment method.
-     * @param WC_Payment_Token $payment_token The payment token associated with
-     *                                        this method entry.
+     * @param array                                    $item          Item of payment method.
+     * @param WC_GoCardless_Payment_Token_Direct_Debit $payment_token The payment token associated with this method entry.
      *
      * @return array Filtered item for direct debit.
@@ -2656 +2677 @@
             );
         }
-    }
-
-    /**
-     * Enqueue scripts on order page for payment dropin.
-     *
-     * @return void
-     */
-    public function enqueue_scripts() {
-        // Only load scripts on checkout page, if access token is available and gateway is enabled.
-        if ( ! is_checkout() || ! $this->access_token || 'yes' !== $this->enabled ) {
-            return;
-        }
-
-        $asset_path   = wc_gocardless()->plugin_path . '/build/wc-gocardless-checkout.asset.php';
-        $version      = wc_gocardless()->version;
-        $dependencies = array();
-        if ( file_exists( $asset_path ) ) {
-            $asset        = require $asset_path;
-            $version      = is_array( $asset ) && isset( $asset['version'] )
-                ? $asset['version']
-                : $version;
-            $dependencies = is_array( $asset ) && isset( $asset['dependencies'] )
-                ? $asset['dependencies']
-                : $dependencies;
-        }
-
-        wp_enqueue_script(
-            'gocardless-dropin',
-            'https://pay.gocardless.com/billing/static/dropin/v2/initialise.js',
-            array(),
-            $version,
-            true
-        );
-
-        wp_enqueue_script(
-            'wc-gocardless-checkout-js',
-            wc_gocardless()->plugin_url . '/build/wc-gocardless-checkout.js',
-            $dependencies,
-            $version,
-            true
-        );
-
-        wp_localize_script(
-            'wc-gocardless-checkout-js',
-            'wc_gocardless_checkout_params',
-            array(
-                'is_test'                        => $this->testmode,
-                'ajax_url'                       => WC_AJAX::get_endpoint( '%%endpoint%%' ),
-                'create_billing_request_nonce'   => wp_create_nonce( 'wc_gocardless_create_billing_request_flow' ),
-                'complete_billing_request_nonce' => wp_create_nonce( 'wc_gocardless_complete_billing_request_flow' ),
-                'is_order_pay_page'              => is_checkout() && is_wc_endpoint_url( 'order-pay' ),
-                'order_id'                       => absint( get_query_var( 'order-pay' ) ),
-                'generic_error'                  => __( 'An error occurred while processing the payment.', 'woocommerce-gateway-gocardless' ),
-            )
-        );
     }
 

woocommerce-gateway-gocardless/trunk/readme.txt

@@ -3 +3 @@
 Tags:         gocardless, woocommerce, direct debit, instant bank pay
 Tested up to: 6.8
-Stable tag:   2.9.5
+Stable tag:   2.9.6
 License:      GPL-3.0-or-later
 License URI:  https://spdx.org/licenses/GPL-3.0-or-later.html
@@ -140 +140 @@
 
 == Changelog ==
+
+= 2.9.6 - 2025-07-02 =
+* Add - Respond with an error to the GoCardless webhook call if the scheduling action fails.
+* Add - A notice indicating that GoCardless is connected in sandbox mode if the merchant is connected to a sandbox account.
+* Update - Replaced JavaScript Drop-in with the redirect-to-GoCardless approach for the transaction/direct debit setup.
+* Dev - Bump WooCommerce "tested up to" version 10.0.
+* Dev - Bump WooCommerce minimum supported version to 9.8.
 
 = 2.9.5 - 2025-05-15 =
@@ -236 +243 @@
 * Tweak - Update the payment method title to "Pay by bank" and change the logo to the GoCardless logo.
 
-= 2.6.4 - 2024-04-01 =
-* Dev - Bump WooCommerce "tested up to" version 8.7.
-* Dev - Bump WooCommerce minimum supported version to 8.4.
-* Dev - Bump WordPress "tested up to" version 6.5.
-
-= 2.6.3 - 2024-02-05 =
-* Fix - Allow customers to update subscription payment methods via Woo Subscriptions.
-* Dev - Bump WooCommerce "tested up to" version 8.5.
-* Dev - Bump WooCommerce minimum supported version to 8.3.
-* Dev - Bump WordPress minimum supported version to 6.3.
-
-= 2.6.2 - 2024-01-08 =
-* Tweak - Bump PHP "tested up to" version 8.3.
-* Dev - Declare compatibility with Product Editor.
-* Dev - Bump WooCommerce "tested up to" version 8.4.
-* Dev - Bump WooCommerce minimum supported version to 8.2.
-* Dev - Bump PHP minimum supported version to 7.4.
-
 [See changelog details prior to 2024 here](https://github.com/gocardless/woocommerce-gateway-gocardless/blob/trunk/changelog.txt).

woocommerce-gateway-gocardless/trunk/woocommerce-gateway-gocardless.php

@@ -4 +4 @@
  * Plugin URI:           https://www.woocommerce.com/products/gocardless/
  * Description:          Extends both WooCommerce and WooCommerce Subscriptions with the GoCardless Payment Gateway. A GoCardless merchant account is required.
- * Version:              2.9.5
+ * Version:              2.9.6
  * Requires at least:    6.6
  * Requires PHP:         7.4
@@ -13 +13 @@
  * License URI:          https://spdx.org/licenses/GPL-3.0-or-later.html
  * Requires Plugins:     woocommerce
- * WC requires at least: 9.6
- * WC tested up to:      9.8
+ * WC requires at least: 9.8
+ * WC tested up to:      10.0
  *
  * Copyright: © 2023-2025 WooCommerce
@@ -39 +39 @@
      * @var string
      */
-    public $version = '2.9.5'; // WRCS: DEFINED_VERSION.
+    public $version = '2.9.6'; // WRCS: DEFINED_VERSION.
 
     /**