From 919e7f331b9693d505c6c10eb2e05ad11de7ffbb Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 9 Nov 2021 19:14:00 +0100
Subject: [PATCH] fix

---
 rowers/braintreestuff.py              |  3 +++
 rowers/tasks.py                       | 27 +++++++++++++++++++++++++++
 rowers/templates/instantplansold.html | 17 +++++++++++++++++
 rowers/views/paymentviews.py          |  2 +-
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 rowers/templates/instantplansold.html

diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py
index 59ec9aaa..f5969316 100644
--- a/rowers/braintreestuff.py
+++ b/rowers/braintreestuff.py
@@ -24,6 +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,
     )
 
 import pandas as pd
@@ -219,6 +220,8 @@ def make_payment(rower,data):
         try:
             job = myqueue(queuehigh,handle_send_email_transaction,
                         name, rower.user.email, amount)
+            job = myqueue(queuehigh,handle_send_email_transation_notification,
+                          name.rower.user.email, amount, additional_text)
         except: # pragma: no cover
             pass
 
diff --git a/rowers/tasks.py b/rowers/tasks.py
index ec2b5cae..c8d53492 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1341,6 +1341,33 @@ def handle_send_email_transaction(
 
     return 1
 
+@app.task
+def handle_send_email_transaction_notification(
+        username, useremail, amount, additional_text, **kwargs):
+
+    if 'debug' in kwargs: # pragma: no cover
+        debug = kwargs['debug']
+    else:
+        debug = True
+
+    subject = "Rowsandall Payment Confirmation"
+
+    from_email = 'Rowsandall <admin@rowsandall.com>'
+
+    d = {
+        'name': username,
+        'siteurl': siteurl,
+        'amount': amount,
+        'reason':additional_text,
+        }
+
+    res = send_template_email(from_email,['support@rowsandall.com'],
+                              subject,
+                              'instantplansold.html',
+                              d, **kwargs)
+
+    return 1
+
 @app.task
 def handle_send_email_failed_cancel(
         name, email, username, id, **kwargs):
diff --git a/rowers/templates/instantplansold.html b/rowers/templates/instantplansold.html
new file mode 100644
index 00000000..4a6935f5
--- /dev/null
+++ b/rowers/templates/instantplansold.html
@@ -0,0 +1,17 @@
+{% extends "emailbase.html" %}
+
+{% block body %}
+<p>User  <strong>{{ name }}</strong> made a payment.</p>
+
+<p>
+  {{ additional_text }}
+</p>
+
+<p>
+  Price: &euro;{{ price }}.
+</p>
+
+<p>
+  Best Regards, the Rowsandall Team
+</p>
+{% endblock %}
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 6a7a7b0f..447e17ca 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -136,7 +136,7 @@ def buy_trainingplan_view(request,id=0):
             try:
                 targetid = cd['target']
                 target = TrainingTarget.objects.get(id=int(targetid))
-            except KeyError:
+            except (KeyError,ValueError):
                 try:
                     targetid = request.POST['target']