Merge pull request #7 from commonknowledge/feature/join-132-update-manchester-restriction-copy

JOIN-132 Update Manchester restriction copy

Author: conatus

.github/workflows/tests.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
 
 jobs:
   test:

docker-compose.yml

@@ -29,11 +29,12 @@ services:
   mailpit:
     image: axllent/mailpit
     ports:
-      - "8025:8025"
+      - "8025:8026"
       - "1025:1025"
 
   wpcli:
     image: wordpress:cli
+    user: "33:33"
     depends_on:
       - db
       - wordpress

join-gmtu.php

@@ -61,8 +61,8 @@
 // Configuration
 $config = [
 // Error messages for out-of-area postcodes
-    'outOfAreaLookupMessage' => "<p>Sorry, this postcode is outside of Greater Manchester, which the union covers. You won't be able to join the union.</p>",
-    'outOfAreaSubmissionMessage' => '<h3>Sorry</h3><p>We\'re only able to support tenants living in the Greater Manchester area.</p><p>If you\'re based elsewhere in the UK, there are other local tenant unions that may be able to help, and for urgent housing issues you can also contact <a href="https://www.shelter.org.uk/Shelter">Shelter</a> or <a href="https://www.crisis.org.uk/">Crisis</a>.</p><p>We\'re sorry we can\'t assist directly, but we hope you can get the support you need quickly.</p>',
+    'outOfAreaLookupMessage' => '<p>Membership is only available for people living within the Greater Manchester area. You can still support the union by becoming <a href="https://tenantsunion.org.uk/donate/">a regular donor or by making a one-off donation.</a></p>',
+    'outOfAreaSubmissionMessage' => '<h3>Sorry</h3><p>Membership is only available for people living within the Greater Manchester area.</p><p>You can still support the union by becoming <a href="https://tenantsunion.org.uk/donate/">a regular donor or by making a one-off donation</a>.</p><p>If you\'re based elsewhere in the UK, there are other local tenant unions that may be able to help, and for urgent housing issues you can also contact <a href="https://www.shelter.org.uk/Shelter">Shelter</a> or <a href="https://www.crisis.org.uk/">Crisis</a>.</p>',
 
 // Success notification settings
     'successNotificationEmails' => ['alex@commonknowledge.coop', 'membership@tenantsunion.org.uk'],

src/Member.php

@@ -90,11 +90,6 @@ function get_member_details($data) {
 
         log_info("Payment level calculated: $paymentLevel");
     } else {
-        // Fallback: try to show planId or membership
-        $fallbackPlan = $data['planId'] ?? $data['membership'] ?? null;
-        if ($fallbackPlan) {
-            $paymentLevel = 'Plan: ' . $fallbackPlan;
-        }
         log_warning("No membershipPlan found in data, using fallback: $paymentLevel");
     }