Merge pull request #146 from gaiaresources/2756-amend-renew-status

Changes to licence status for when it's renewed/amended.
dbca-wa · Feb 28, 2017 · edd7b4e · edd7b4e
2 parents 373c67e + d81bc63
commit edd7b4e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/wildlifelicensing/apps/dashboard/views/customer.py b/wildlifelicensing/apps/dashboard/views/customer.py
@@ -311,10 +311,11 @@ def _render_status(instance):
             application = Application.objects.get(licence=instance)
             replacing_application = Application.objects.get(previous_application=application)
 
-            if replacing_application.is_licence_amendment:
-                return 'Amended'
-            else:
-                return 'Renewed'
+            if replacing_application.licence is not None:
+                if replacing_application.is_licence_amendment:
+                    return 'Amended'
+                else:
+                    return 'Renewed'
         except Application.DoesNotExist:
             pass
 
@@ -330,7 +331,13 @@ def _render_status(instance):
     def _render_action(instance):
         try:
             application = Application.objects.get(licence=instance)
-            if Application.objects.filter(previous_application=application).exists():
+            replacing_application = Application.objects.get(previous_application=application)
+            if replacing_application.licence is None:
+                if replacing_application.is_licence_amendment:
+                    return 'Amendment Pending'
+                else:
+                    return 'Renewal Pending'
+            else:
                 return 'N/A'
         except Application.DoesNotExist:
             pass