From ac441534a3d2c038d1123b9b572e1ad990567a3e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 9 Aug 2019 15:12:26 +0200
Subject: [PATCH] small changes

---
 rowers/braintreestuff.py             | 5 +++--
 rowers/templates/upgradeconfirm.html | 2 +-
 rowers/views/paymentviews.py         | 1 -
 rowsandall_app/settings.py           | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py
index e06adba4..a3885a49 100644
--- a/rowers/braintreestuff.py
+++ b/rowers/braintreestuff.py
@@ -26,7 +26,7 @@ import pandas as pd
 from rowsandall_app.settings import (
     BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY,
     BRAINTREE_SANDBOX_MERCHANT_ID,BRAINTREE_SANDBOX_PUBLIC_KEY,
-    BRAINTREE_SANDBOX_PRIVATE_KEY
+    BRAINTREE_SANDBOX_PRIVATE_KEY, BRAINTREE_MERCHANT_ACCOUNT_ID
     )
 
 if settings.DEBUG  or 'dev' in settings.SITE_URL:
@@ -264,7 +264,8 @@ def create_subscription(rower,data):
 
     result = gateway.subscription.create({
         "payment_method_token": payment_method_token,
-        "plan_id": plan.external_id
+        "plan_id": plan.external_id,
+        "merchant_account_id": BRAINTREE_MERCHANT_ACCOUNT_ID,
         })
 
 
diff --git a/rowers/templates/upgradeconfirm.html b/rowers/templates/upgradeconfirm.html
index 107b117f..c775e2b5 100644
--- a/rowers/templates/upgradeconfirm.html
+++ b/rowers/templates/upgradeconfirm.html
@@ -95,7 +95,7 @@
       </section>
       <div id="paymenterror2">      </div>
       <input type="hidden" id="nonce" name="payment_method_nonce" />
-      <input type="hidden" id="paymenttype" name="payment_type" />
+      <input type="hidden" id="paymenttype" name="paymenttype" />
       <input type="hidden" id="plan" name="plan" value="{{ plan.id }}">
       <p>
         <input id="tac" type="checkbox" name="tac" value="tac">I have taken note of the
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 79c52ca1..34a1f133 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -390,7 +390,6 @@ def upgrade_checkouts_view(request):
             url = reverse('billing_view')
             return HttpResponseRedirect(url)
     else:
-        print('noot',form)
         messages.error(request,"There was an error in the payment form")
         url = reverse(upgrade_view)
         return HttpResponseRedirect(url)
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 3a9a537c..02616365 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -447,6 +447,11 @@ try:
 except KeyError:
     BRAINTREE_MERCHANT_ID = ''
 
+try:
+    BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id']
+except KeyError:
+    BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR'
+    
 try:
     BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key']
 except KeyError: