commonknowledge · conatus · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026
diff --git a/packages/join-block/join.php b/packages/join-block/join.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:     Common Knowledge Join Flow
  * Description:     Common Knowledge join flow plugin.
- * Version:         1.3.19
+ * Version:         1.4.0
  * Author:          Common Knowledge <hello@commonknowledge.coop>
  * Text Domain:     common-knowledge-join-flow
  * License: GPLv2 or later
@@ -499,7 +499,14 @@
                 StripeService::initialise();
                 [$customer, $newCustomer] = StripeService::upsertCustomer($email);
 
-                $subscription = StripeService::createSubscription($customer, $plan, $data["customMembershipAmount"] ?? null);
+                $subscription = StripeService::createSubscription(
+                    $customer,
+                    $plan,
+                    $data["customMembershipAmount"] ?? null,
+                    $data["donationAmount"] ?? null,
+                    $data["recurDonation"] ?? false,
+                    !empty($data["donationSupporterMode"])
+                );
 
                 return $subscription;
             } catch (\Exception $e) {
@@ -512,6 +519,49 @@
         }
     ));
 
+    register_rest_route('join/v1', '/stripe/create-payment-intent', array(
+        'methods' => 'POST',
+        'permission_callback' => function ($req) {
+            return true;
+        },
+        'callback' => function (WP_REST_Request $request) {
+            global $joinBlockLog;
+
+            $email = "";
+            try {
+                $data = json_decode($request->get_body(), true);
+                $email = $data['email'];
+
+                $joinBlockLog->info("Received /stripe/create-payment-intent request for $email");
+
+                $plan = Settings::getMembershipPlan($data['membership'] ?? '');
+                if (!$plan) {
+                    return new WP_REST_Response(['error' => 'Invalid membership plan'], 400);
+                }
+
+                $amount = $data['donationAmount'] ?? 0;
+                $currency = $plan['currency'] ?? 'GBP';
+
+                StripeService::initialise();
+                [$customer] = StripeService::upsertCustomer($email);
+
+                $paymentIntent = StripeService::createPaymentIntent($customer, $amount, $currency);
+
+                return new WP_REST_Response([
+                    'id'            => $paymentIntent->id,
+                    'client_secret' => $paymentIntent->client_secret,
+                    'customer'      => $customer->id,
+                ], 200);
+            } catch (\Exception $e) {
+                $joinBlockLog->error(
+                    'Failed to create Stripe PaymentIntent for user ' . $email . ': ' . $e->getMessage(),
+                    ['error' => $e]
+                );
+                throw $e;
+            }
+        }
+    ));
+
     register_rest_route('join/v1', '/stripe/create-confirm-subscription', array(
         'methods' => 'POST',
         'permission_callback' => function ($req) {
@@ -541,7 +591,14 @@
             StripeService::initialise();
             [$customer, $newCustomer] = StripeService::upsertCustomer($email);
 
-            $subscription = StripeService::createSubscription($customer, $plan);
+            $subscription = StripeService::createSubscription(
+                $customer,
+                $plan,
+                $data["customMembershipAmount"] ?? null,
+                $data["donationAmount"] ?? null,
+                $data["recurDonation"] ?? false,
+                !empty($data["donationSupporterMode"])
+            );
 
             $confirmedPaymentIntent = StripeService::confirmSubscriptionPaymentIntent($subscription, $data['confirmationTokenId']);
 

diff --git a/packages/join-block/readme.txt b/packages/join-block/readme.txt
@@ -4,7 +4,7 @@ Tags: membership, subscription, join
 Contributors: commonknowledgecoop
 Requires at least: 5.4
 Tested up to: 6.8
-Stable tag: 1.3.19
+Stable tag: 1.4.0
 Requires PHP: 8.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -107,6 +107,12 @@ Need help? Contact us at [hello@commonknowledge.coop](mailto:hello@commonknowled
 
 == Changelog ==
 
+= 1.4.0 =
+* Add Donation Supporter Mode: a new block setting that puts donation first, before personal details and payment, skipping the membership plan step entirely
+* Supporter mode: donation frequency (monthly/one-off) and tier selection driven by block-level membership plans
+* Supporter mode: one-off donations processed via Stripe invoice item; recurring donations added as a second subscription item
+* Supporter mode: GoCardless recurring donations added to the Direct Debit subscription total; one-off toggle disabled with explanation when Stripe is unavailable
+* Supporter mode: donation amount and frequency submitted as correct native types to the payment backend
 = 1.3.19 =
 * Sync membership tier tag changes to Zetkin and Mailchimp when a member upgrades or downgrades their Stripe subscription plan.
 * Tags shared across tiers (e.g. `member`) are preserved during a tier change and never incorrectly removed.
@@ -118,7 +124,6 @@ Need help? Contact us at [hello@commonknowledge.coop](mailto:hello@commonknowled
 * Added `ck_join_flow_should_unlapse_member` filter to control whether an unlapse should proceed.
 * Added `ck_join_flow_member_lapsed` action fired after a member is successfully lapsed.
 * Added `ck_join_flow_member_unlapsed` action fired after a member is successfully unlapsed.
-
 = 1.3.18 =
 * Make Zetkin errors non-fatal so a Zetkin failure does not block a successful join.
 * Improve Zetkin 403 error message to indicate expired JWT credentials and remediation steps.

diff --git a/packages/join-block/src/Blocks.php b/packages/join-block/src/Blocks.php
@@ -176,7 +176,15 @@ private static function registerJoinFormBlock()
                 Field::make('checkbox', 'hide_address')
                     ->set_help_text('Check to completely hide the address section from the form.'),
                 Field::make('checkbox', 'require_phone_number')->set_default_value(true),
-                Field::make('checkbox', 'ask_for_additional_donation'),
+                Field::make('checkbox', 'ask_for_additional_donation')
+                    ->set_help_text('Has no effect when Donation Supporter Mode is enabled.'),
+                Field::make('checkbox', 'donation_supporter_mode')
+                    ->set_help_text(
+                        'Enable Supporter Mode: shows donation frequency and amount first, ' .
+                        'before personal details and payment. Skips the membership plan step. ' .
+                        'Requires block-level membership plans to be configured (used as donation tiers). ' .
+                        'One-off donations require Stripe. They are not available with Direct Debit only.'
+                    ),
                 Field::make('checkbox', 'hide_home_address_copy')
                     ->set_help_text('Check to hide the copy that explains why the address is collected.'),
                 Field::make('checkbox', 'include_skip_payment_button')
@@ -327,7 +335,8 @@ private static function echoEnvironment($fields, $block_mode)
         }
 
         $membership_plans = $fields['custom_membership_plans'] ?? [];
-        if (!$membership_plans) {
+        $is_supporter_mode = !empty($fields['donation_supporter_mode']);
+        if (!$membership_plans && !$is_supporter_mode) {
             $membership_plans = Settings::get("MEMBERSHIP_PLANS") ?? [];
         }
 
@@ -414,6 +423,7 @@ function ($o) {
             'ABOUT_YOU_COPY' => wpautop(Settings::get("ABOUT_YOU_COPY")),
             'ABOUT_YOU_HEADING' => Settings::get("ABOUT_YOU_HEADING"),
             "ASK_FOR_ADDITIONAL_DONATION" => $fields['ask_for_additional_donation'] ?? false,
+            "DONATION_SUPPORTER_MODE" => $fields['donation_supporter_mode'] ?? false,
             'CHARGEBEE_SITE_NAME' => Settings::get('CHARGEBEE_SITE_NAME'),
             "CHARGEBEE_API_PUBLISHABLE_KEY" => Settings::get('CHARGEBEE_API_PUBLISHABLE_KEY'),
             "COLLECT_COUNTY" => Settings::get("COLLECT_COUNTY"),

diff --git a/packages/join-block/src/Services/GocardlessService.php b/packages/join-block/src/Services/GocardlessService.php
@@ -104,6 +104,12 @@ public static function createCustomerSubscription($data)
         }
         $amountInPence = round(((float) $data['membershipPlan']['amount']) * 100);
 
+        // Add recurring donation to subscription amount.
+        $donationAmount = (float) ($data['donationAmount'] ?? 0);
+        if ($donationAmount > 0 && !empty($data['recurDonation'])) {
+            $amountInPence += round($donationAmount * 100);
+        }
+
         $subscriptions = $client->subscriptions()->list([
             "params" => ["mandate" => $mandate->id]
         ]);

diff --git a/packages/join-block/src/Services/JoinService.php b/packages/join-block/src/Services/JoinService.php
@@ -189,7 +189,9 @@ private static function tryHandleJoin($data)
         $data['gocardlessMandate'] = $subscription ? $subscription->links->mandate : null;
         $data['gocardlessCustomer'] = $subscription ? $subscription->links->customer : null;
 
-        if (Settings::get("USE_STRIPE")) {
+        $isOneOffSupporterDonation = !empty($data["donationSupporterMode"]) && empty($data["recurDonation"]);
+
+        if (Settings::get("USE_STRIPE") && !$isOneOffSupporterDonation) {
             StripeService::initialise();
             $subscriptionInfo = StripeService::removeExistingSubscriptions($data["email"], $data["stripeCustomerId"] ?? null, $data["stripeSubscriptionId"] ?? null);
             if ($subscriptionInfo["amount"] !== $membershipAmount) {
@@ -230,8 +232,9 @@ private static function tryHandleJoin($data)
                 MailchimpService::signup($data);
                 $joinBlockLog->info("Completed Mailchimp signup request for $email");
             } catch (\Exception $exception) {
+                // A Mailchimp failure should not block a successful join.
+                // The member record can be retro-added to Mailchimp once the underlying issue is resolved.
                 $joinBlockLog->error("Mailchimp error for email $email: " . $exception->getMessage());
-                throw $exception;
             }
         }
 
@@ -398,7 +401,6 @@ public static function toggleMemberLapsed($email, $lapsed = true, $paymentDate =
                 $joinBlockLog->info("$done member $email as lapsed in Mailchimp");
             } catch (\Exception $exception) {
                 $joinBlockLog->error("Mailchimp error for email $email: " . $exception->getMessage());
-                throw $exception;
             }
         }