From c411f3c06cd92c379e611a330afe52a73ebff29c Mon Sep 17 00:00:00 2001
From: Shiv K Sah <shiv.sah@aricent.com>
Date: Mon, 5 Jun 2017 19:17:01 +0530
Subject: [PATCH 1/2] Show subscriber balance validity

---
 .../templates/dashboard/subscriber_detail/info.html       | 3 +++
 cloud/endagaweb/views/dashboard.py                        | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/cloud/endagaweb/templates/dashboard/subscriber_detail/info.html b/cloud/endagaweb/templates/dashboard/subscriber_detail/info.html
index c4bf8277..21ece791 100644
--- a/cloud/endagaweb/templates/dashboard/subscriber_detail/info.html
+++ b/cloud/endagaweb/templates/dashboard/subscriber_detail/info.html
@@ -57,6 +57,9 @@
       <p><strong>Last Active</strong>: {{ subscriber.last_active | naturaltime }}</p>
       <p><strong>Last Outbound Activity</strong>: {{ subscriber.last_outbound_activity | naturaltime }}</p>
       <p><strong>Registered</strong>: {{ created.date }} ({{ created | naturaltime }})</p>
+      {% if valid_through %}
+      <p><strong>Balance Validity</strong>: {{ valid_through.date }} ({{ valid_through | naturaltime }})</p>
+      {% endif %}
       <p>
         <strong>Activity</strong>:
         <ul>
diff --git a/cloud/endagaweb/views/dashboard.py b/cloud/endagaweb/views/dashboard.py
index fad4b84e..d6e853bd 100644
--- a/cloud/endagaweb/views/dashboard.py
+++ b/cloud/endagaweb/views/dashboard.py
@@ -286,6 +286,14 @@ def get(self, request, imsi=None):
                 'date')[0].date
         except IndexError:
             context['created'] = None
+        try:
+            # Get balance expire date for subscriber's first number.
+            number_details = Number.objects.filter(
+                subscriber__imsi=imsi,
+                subscriber__network=network)[0:1].get()
+            context['valid_through'] = number_details.valid_through
+        except Number.DoesNotExist:
+            context['valid_through'] = None
         # Set usage info (SMS sent, total call duration, data usage).
         sms_kinds = ['free_sms', 'outside_sms', 'incoming_sms', 'local_sms',
                      'local_recv_sms', 'error_sms']

From 62e328db029c5dd045566a75b012918ca278eff1 Mon Sep 17 00:00:00 2001
From: Shiv K Sah <shiv.sah@aricent.com>
Date: Wed, 7 Jun 2017 13:34:32 +0530
Subject: [PATCH 2/2] code review incorporated - Show subscriber validity

---
 cloud/endagaweb/views/dashboard.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/cloud/endagaweb/views/dashboard.py b/cloud/endagaweb/views/dashboard.py
index d6e853bd..0cefeba2 100644
--- a/cloud/endagaweb/views/dashboard.py
+++ b/cloud/endagaweb/views/dashboard.py
@@ -280,20 +280,13 @@ def get(self, request, imsi=None):
             'currency': CURRENCIES[network.subscriber_currency],
             'user_profile': user_profile,
             'subscriber': subscriber,
+            'valid_through': subscriber.valid_through
         }
         try:
             context['created'] = subscriber.usageevent_set.order_by(
                 'date')[0].date
         except IndexError:
             context['created'] = None
-        try:
-            # Get balance expire date for subscriber's first number.
-            number_details = Number.objects.filter(
-                subscriber__imsi=imsi,
-                subscriber__network=network)[0:1].get()
-            context['valid_through'] = number_details.valid_through
-        except Number.DoesNotExist:
-            context['valid_through'] = None
         # Set usage info (SMS sent, total call duration, data usage).
         sms_kinds = ['free_sms', 'outside_sms', 'incoming_sms', 'local_sms',
                      'local_recv_sms', 'error_sms']