From 5a10d381b534e320d87f8302886c0d13cd0c8d79 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 27 Nov 2018 12:44:09 +0100
Subject: [PATCH] warning message

---
 rowers/middleware.py   |  4 +---
 templates/newbase.html | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rowers/middleware.py b/rowers/middleware.py
index 72c1ed7e..95cb5583 100644
--- a/rowers/middleware.py
+++ b/rowers/middleware.py
@@ -120,6 +120,4 @@ class RowerPlanMiddleWare(object):
                                   r.user.first_name,
                                   r.user.last_name,
                                   str(r.planexpires))
-                elif request.user.rower.planexpires-datetime.timedelta(days=5)<timezone.now().date():
-                    messg = 'Your paid plan will expire soon. Your account will be reset to basic on %d' % request.user.rower.planexpires
-                    messages.info(request,messg)
+
diff --git a/templates/newbase.html b/templates/newbase.html
index e62b0448..16d00c75 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -225,6 +225,16 @@
             </p>
           </li>
           {% endif %}
+          {% if user.rower.planexpires and user.rower.rowerplan != 'basic' %}
+            {% if user.rower.planexpires|is_future_date %}
+             {% if user.rower.planexpires|date_dif|ddays < 4 %}
+             <li class="grid_4">
+               <p class="successmessage">
+                 You have {{ user.rower.planexpires|date_dif|ddays }} days left of your one year subscription. Please renew on or before {{ user.rower.planexpires }} or your plan will be reset to Basic. Click <a href="/rowers/promembership">here</a> to renew your membership.</p>
+             </li>                                               
+             {% endif %}                                              
+            {% endif %}
+          {% endif %}
           {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %}
           {% if user.rower.plantrialexpires and user.rower.rowerplan != 'plan' %}
           <li class="grid_4">