fix: #65 and #66

community/lms/doctype/invite_request/invite_request.py

@@ -46,14 +46,18 @@ class InviteRequest(Document):
 
 @frappe.whitelist(allow_guest=True)
 def create_invite_request(invite_email):
-    try:
-        frappe.get_doc({
+
+    if frappe.db.exists("User", invite_email):
+        return "user"
+
+    if frappe.db.exists("Invite Request", {"invite_email": invite_email}):
+        return "invite"
+
+    frappe.get_doc({
             "doctype": "Invite Request",
             "invite_email": invite_email
         }).save(ignore_permissions=True)
-        return "OK"
-    except frappe.UniqueValidationError:
-        frappe.throw(_("Email {0} has already been used to request an invite").format(invite_email))
+    return "OK"
 
 @frappe.whitelist(allow_guest=True)
 def update_invite(data):

community/lms/widgets/RequestInvite.html

@@ -4,22 +4,37 @@
 </form>
 <script>
   frappe.ready(() => {
-  $("#submit-invite-request").click(function () {
-    frappe.call({
-      method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
-      args: {
-        invite_email: $("#invite_email").val()
-      },
-      callback: (data) => {
-        if (data.message == "OK") {
+    $("#submit-invite-request").click(function () {
+      var invite_email = $("#invite_email").val()
+      frappe.call({
+        method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
+        args: {
+          invite_email: invite_email
+        },
+        callback: (data) => {
           $("#invite-request-form").hide();
-          var message = `<div>
-          <p class="lead">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
-          </div>`;
+
+          if (data.message == "OK") {
+            var message = `<div>
+              <p class="lead">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
+            </div>`;
+          }
+
+          else if (data.message == "invite") {
+            var message = `<div>
+              <p class="lead">Email ${invite_email} has already been used to request an invitation.</p>
+            </div>`;
+          }
+
+          else if (data.message == "user") {
+            var message = `<div>
+              <p class="lead">Looks like there is already an account with email ${invite_email}. Would you like to <a href="/login">login</a>.</p>
+            </div>`;
+          }
+
           $(".jumbotron").append(message);
         }
-      }
+      })
     })
   })
-})
 </script>