From d47b4ab6445fdc8c913b08a12edc54d83d69a39b Mon Sep 17 00:00:00 2001
From: Basawaraj <asbasawaraj@gmail.com>
Date: Sat, 12 May 2018 21:59:36 +0530
Subject: [PATCH] membership history display

---
 foundation/__init__.py              | 17 +++++++++++---
 foundation/www/members/details.html | 35 ++++++++++++++++++++++++++---
 foundation/www/members/details.py   |  1 +
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/foundation/__init__.py b/foundation/__init__.py
index 631ab748..8ab8337c 100644
--- a/foundation/__init__.py
+++ b/foundation/__init__.py
@@ -8,14 +8,25 @@ import frappe
 
 def get_last_membership():
 	'''Returns last membership if exists'''
-	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
-		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
+	member_id = frappe.db.get_value("Member", {'email': frappe.session.user}, "name")
+	if member_id:
+		last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
+			dict(member=member_id, paid=1), order_by='to_date desc', limit=1)
 
 	return last_membership and last_membership[0]
 
+def get_all_memberships_of_one_member():
+	'''Returns all memberships'''
+	member_id = frappe.db.get_value("Member", {'email': frappe.session.user}, "name")
+	if member_id:
+		all_memberships = frappe.get_all('Membership', 'name,from_date,to_date,membership_type,amount,currency',
+			dict(member=member_id, paid=1), order_by='to_date desc')
+
+	return all_memberships
+
 def is_member():
 	'''Returns true if the user is still a member'''
 	last_membership = get_last_membership()
 	if last_membership and getdate(last_membership.to_date) > getdate():
 		return True
-	return False
\ No newline at end of file
+	return False
diff --git a/foundation/www/members/details.html b/foundation/www/members/details.html
index b5ca028f..c0f40a3d 100644
--- a/foundation/www/members/details.html
+++ b/foundation/www/members/details.html
@@ -18,17 +18,46 @@
 {% elif frappe.utils.getdate(last_membership.to_date) < frappe.utils.getdate(frappe.utils.nowdate()) %}
 	<p>Your Membership has expired, Click the button below to start a new membership</p>
 	<p><a href="/members/setup_payment" class='btn btn-primary'>Renew</a></p>
-	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
 
 {% elif frappe.utils.getdate(frappe.utils.add_days(last_membership.to_date, -30)) < frappe.utils.getdate(frappe.utils.nowdate())%}
 	<p>Your Membership is due to expire soon. Click on the button below to renew</p>
 	<p><a href="/members/setup_payment" class='btn btn-primary'>Renew</a></p>
-	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
 
 {% else %}
 	<p>Welcome back <b>{{ last_membership.membership_type }} Member!</b></p>
 	<p>Your membership is due to expire on {{ frappe.format_date(last_membership.to_date) }}.
-	<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
+
+{% endif %}
+
+{% if last_membership %}
+
+	<br>
+	<div class="table-responsive">
+    <table class="table table-bordered table-hover">
+      <thead>
+        <tr class="active">
+          <th style="width: 200px">Membership Number</th>
+          <th style="width: 150px">Membership Type</th>
+          <th style="width: 150px">From</th>
+          <th style="width: 150px">To</th>
+          <th style="width: 100px">Amount</th>
+        </tr>
+      </thead>
+      <tbody>
+				{% for membership in all_memberships %}
+
+          <tr>
+            <td>{{ membership.name }}</td>
+            <td>{{ membership.membership_type }}</td>
+            <td>{{ frappe.format_date(membership.from_date) }}</td>
+            <td>{{ frappe.format_date(membership.to_date) }}</td>
+            <td>{{ frappe.utils.fmt_money(membership.amount,currency=frappe.db.get_value("Currency",membership.currency,"symbol")) }}</td>
+          </tr>
+					{% endfor %}
+      </tbody>
+    </table>
+</div>
+
 {% endif %}
 
 {% endif %}
diff --git a/foundation/www/members/details.py b/foundation/www/members/details.py
index b4cb862f..64aaf84e 100644
--- a/foundation/www/members/details.py
+++ b/foundation/www/members/details.py
@@ -7,3 +7,4 @@ def get_context(context):
 	if frappe.session.user != 'Guest':
 		context.show_sidebar = True
 		context.last_membership = foundation.get_last_membership()
+		context.all_memberships = foundation.get_all_memberships_of_one_member()