From 01ebc0c202592ab332abcb822c23abf4a602969b Mon Sep 17 00:00:00 2001
From: Jaimyn Mayer <hello@jaimyn.com.au>
Date: Thu, 5 Oct 2023 14:58:48 +1000
Subject: [PATCH] handle returning member notification better

---
 memberportal/api_billing/views.py | 18 +++++++++++++-----
 package-lock.json                 |  4 ++--
 src-frontend/package-lock.json    |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/memberportal/api_billing/views.py b/memberportal/api_billing/views.py
index 09dfc2ca..5ccb67a8 100644
--- a/memberportal/api_billing/views.py
+++ b/memberportal/api_billing/views.py
@@ -614,9 +614,9 @@ def post(self, request):
                 subject = "Your payment was successful."
                 message = (
                     "Thanks for making a membership payment using our online payment system. "
-                    "You haven't yet met all of the requirements for activating your site access. Once this "
-                    "happens, you'll receive an email confirmation that your access card was activated. "
-                    "If you are unsure how to proceed, or this email is unexpected, please contact us."
+                    "You haven't yet met all of the requirements for automatically activating your site access. "
+                    "You'll receive confirmation that your site access is enabled soon, or we'll be in touch. "
+                    "If you don't hear from us soon or require assistance, please contact us."
                 )
                 member_profile.user.email_notification(subject, message)
 
@@ -625,8 +625,16 @@ def post(self, request):
 
                 # if this is a returning member then send the exec an email (new members have
                 # already had this sent)
-                if member_profile.state != "noob":
-                    member_profile.user.email_membership_application()
+                if member.state != "noob":
+                    subject = "Action Required: Verify returning member"
+                    title = subject
+                    message = (
+                        "An existing member (or someone who clicked 'skip signup I just want an account') "
+                        "has setup a membership subscription. You must now decide whether to enable their site access."
+                    )
+                    send_email_to_admin(
+                        subject, title, message, reply_to=member.user.email
+                    )
 
             # in all other instances, we don't care about a paid invoice and can ignore it
 
diff --git a/package-lock.json b/package-lock.json
index ab328666..bc72371a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "membermatters",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "membermatters",
-      "version": "3.3.0",
+      "version": "3.4.1",
       "devDependencies": {
         "eslint-webpack-plugin": "^3.1.1",
         "husky": "^6.0.0",
diff --git a/src-frontend/package-lock.json b/src-frontend/package-lock.json
index 5f126a4c..224b6016 100644
--- a/src-frontend/package-lock.json
+++ b/src-frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "frontend",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "frontend",
-      "version": "3.4.0",
+      "version": "3.4.1",
       "dependencies": {
         "@capacitor/core": "^3.5.0",
         "@capacitor/splash-screen": "^1.2.2",