Merge branch 'release/v16.6.17'

rowers/braintreestuff.py

@@ -189,6 +189,12 @@ def make_payment(rower,data):
     amount = data['amount']
     amount = '{amount}'.format(amount=amount)
 
+    if 'plan' in data:
+        theplan = data['plan']
+        additional_text = 'Rowsandall Purchase Plan nr {theplan}'.format(theplan=theplan)
+    else:
+        additional_text = 'Rowsandall Purchase'
+
     result = gateway.transaction.sale({
         "amount": amount,
         "payment_method_nonce": nonce_from_the_client,
@@ -208,7 +214,7 @@ def make_payment(rower,data):
         if not fakturoid_contact_id:
             fakturoid_contact_id = fakturoid.create_contact(rower)
         id = fakturoid.create_invoice(rower,amount,transaction.id,dosend=True,contact_id=fakturoid_contact_id,
-                                      name='Rowsandall Purchase')
+                                      name=additional_text)
 
         try:
             job = myqueue(queuehigh,handle_send_email_transaction,

rowers/tasks.py

@@ -1331,7 +1331,7 @@ def handle_send_email_transaction(
     d = {
         'name': username,
         'siteurl': siteurl,
-        'amount': amount
+        'amount': amount,
         }
 
     res = send_template_email(from_email,[useremail],