From 83e1de9866afaafda2282cd9ef30bebf84399b8b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 9 Nov 2021 22:22:42 +0100
Subject: [PATCH] working

---
 rowers/braintreestuff.py              |  2 +-
 rowers/tasks.py                       | 12 +++++++-----
 rowers/templates/instantplansold.html |  4 ++--
 rowers/views/paymentviews.py          |  9 +++++++++
 rowers/views/statements.py            |  1 +
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py
index f5969316..1c47d79b 100644
--- a/rowers/braintreestuff.py
+++ b/rowers/braintreestuff.py
@@ -24,7 +24,7 @@ from rowers.tasks import (
     handle_send_email_subscription_update,
     handle_send_email_subscription_create,
     handle_send_email_failed_cancel,
-    handle_send_email_transaction_notification,
+    #handle_send_email_transaction_notification,
     )
 
 import pandas as pd
diff --git a/rowers/tasks.py b/rowers/tasks.py
index 90634228..4f496d26 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1343,15 +1343,15 @@ def handle_send_email_transaction(
     return 1
 
 @app.task
-def handle_send_email_transaction_notification(
-        username, useremail, amount, additional_text, **kwargs):
+def handle_send_email_instantplan_notification(
+        username, useremail, amount, planname,startdate, enddate, **kwargs):
 
     if 'debug' in kwargs: # pragma: no cover
         debug = kwargs['debug']
     else:
         debug = True
 
-    subject = "Rowsandall Payment Confirmation"
+    subject = "Rowsandall Instant Plan Notification"
 
     from_email = 'Rowsandall <admin@rowsandall.com>'
 
@@ -1359,10 +1359,12 @@ def handle_send_email_transaction_notification(
         'name': username,
         'siteurl': siteurl,
         'amount': amount,
-        'reason':additional_text,
+        'planname': planname,
+        'startdate':startdate,
+        'enddate':enddate,
         }
 
-    res = send_template_email(from_email,['support@rowsandall.com'],
+    res = send_template_email(from_email,['roosendaalsander@gmail.com'],
                               subject,
                               'instantplansold.html',
                               d, **kwargs)
diff --git a/rowers/templates/instantplansold.html b/rowers/templates/instantplansold.html
index 4a6935f5..28d6548f 100644
--- a/rowers/templates/instantplansold.html
+++ b/rowers/templates/instantplansold.html
@@ -4,11 +4,11 @@
 <p>User  <strong>{{ name }}</strong> made a payment.</p>
 
 <p>
-  {{ additional_text }}
+  Plan: {{ planname }}, starting on {{ startdate }} and ending on {{ enddate }}
 </p>
 
 <p>
-  Price: &euro;{{ price }}.
+  Price: &euro;{{ amount }}.
 </p>
 
 <p>
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 694bb567..8c71af15 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -243,6 +243,15 @@ def purchase_checkouts_view(request):
             p.rowers.add(r)
 
             create_sessions_from_json(plansteps,r,startdate,r.user)
+            print('aap')
+            job = myqueue(queuehigh,handle_send_email_instantplan_notification,
+                          r.user.username,
+                          r.user.email,
+                          plan.price,
+                          plan.name,
+                          startdate,
+                          enddate)
+            print(job,'noot')
 
             url = reverse('plannedsessions_view')
             timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 13434a98..98ace3a6 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -221,6 +221,7 @@ from rowers.tasks import (
     handle_sendemail_optout,
     handle_sendemail_ical,
     handle_c2_async_workout,
+    handle_send_email_instantplan_notification,
     )
 
 from scipy.signal import savgol_filter