Merge pull request #98 from erpnext/leave_reason

[new] On Chapter Leave member details not erased

foundation/www/join_chapter.py

@@ -4,14 +4,14 @@ def get_context(context):
 	context.no_cache = True
 	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
 	if frappe.session.user!='Guest':
-		if frappe.session.user in [d.user for d in chapter.members]:
+		if frappe.session.user in [d.user for d in chapter.members if d.enabled == 1]:
 			context.already_member = True
 		else:
 			if frappe.request.method=='GET':
 				pass
 			elif frappe.request.method=='POST':
 				chapter.append('members', dict(
-					user=frappe.session.user, 
+					user=frappe.session.user,
 					introduction=frappe.form_dict.introduction,
 					website_url=frappe.form_dict.website_url,
 					enabled=1

foundation/www/leave-chapter.html

@@ -1,16 +1,42 @@
 {% extends "templates/web.html" %}
-<!-- 
-{% macro chapter_button() %}
-	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>
-		Go to Chapter Page</a></p>
-{% endmacro %}
- -->
 {% block page_content %}
 
 	{% if member_deleted %}
 		<p>You are not a member of {{ chapter.title }}!</p>
+		<div>
+			<form>
+				<div class="form-group">
+					<label for="leave">Why do you want to leave this chapter</label>
+					<input type="text" name="leave" class="form-control" id="leave">
+				</div>
+				<button type="button" class="btn btn-default btn-leave" data-title= "{{ chapter.title }}" id="btn-leave">Submit
+				</button>
+			</form>
+		</div>
 		<p>Please signup and login to join this chapter</p>
 
 		<p><a href="/join-chapter?name={{ chapter.name }}" class='btn btn-primary'>Become Member agian</a></p>
 	{% endif %}
+	<script>
+		frappe.ready(function() {
+			$(".btn-leave").on("click", function() {
+				var leave =  $("#leave").val();
+				var user_id = frappe.session.user;
+				var title =  $(this).attr("data-title");
+				frappe.call({
+						method: 'foundation.erpnext_foundation.doctype.chapter.chapter.leave',
+						args: {
+							leave_reason: leave,
+							user_id: user_id,
+							title: title
+						},
+						callback: function(r) {
+							if(r.message) {
+								frappe.msgprint(r.message)
+							}
+						}
+				})
+			});
+		})
+	</script>
 {% endblock %}

foundation/www/leave_chapter.py

@@ -3,13 +3,5 @@ import frappe
 def get_context(context):
 	context.no_cache = True
 	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
-	# if frappe.session.user!='Guest':
-	if frappe.session.user in [d.user for d in chapter.members]:
-		user = frappe.session.user
-		parent = frappe.form_dict.name
-		frappe.db.sql("""delete from `tabChapter Member` where parent = %s and user = %s """, (parent, user))
-		frappe.db.commit()
-
 	context.member_deleted = True
-
 	context.chapter = chapter