Merge branch 'release/v9.05'

rowers/braintreestuff.py

@@ -1,6 +1,7 @@
 import braintree
 from django.utils import timezone
 import datetime
+from django.conf import settings
 import sys
 import django_rq
 queue = django_rq.get_queue('default')
@@ -18,18 +19,29 @@ from rowers.tasks import (
 import pandas as pd
 
 from rowsandall_app.settings import (
-    BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY
+    BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY,
+    BRAINTREE_SANDBOX_MERCHANT_ID,BRAINTREE_SANDBOX_PUBLIC_KEY,
+    BRAINTREE_SANDBOX_PRIVATE_KEY
     )
 
-gateway = braintree.BraintreeGateway(
-    braintree.Configuration(
-#        braintree.Environment.Sandbox,
-        braintree.Environment.Production,
-        merchant_id=BRAINTREE_MERCHANT_ID,
-        public_key=BRAINTREE_PUBLIC_KEY,
-        private_key=BRAINTREE_PRIVATE_KEY,
+if settings.DEBUG  or 'dev' in settings.SITE_URL:
+    gateway = braintree.BraintreeGateway(
+        braintree.Configuration(
+            braintree.Environment.Sandbox,
+            merchant_id=BRAINTREE_SANDBOX_MERCHANT_ID,
+            public_key=BRAINTREE_SANDBOX_PUBLIC_KEY,
+            private_key=BRAINTREE_SANDBOX_PRIVATE_KEY,
+        )
+    )
+else:
+    gateway = braintree.BraintreeGateway(
+        braintree.Configuration(
+            braintree.Environment.Production,
+            merchant_id=BRAINTREE_MERCHANT_ID,
+            public_key=BRAINTREE_PUBLIC_KEY,
+            private_key=BRAINTREE_PRIVATE_KEY,
+        )
     )
-)
 
 from rowers.models import Rower,PaidPlan
 from rowers.utils import ProcessorCustomerError

rowsandall_app/settings.py

@@ -441,6 +441,21 @@ try:
 except KeyError:
     BRAINTREE_PRIVATE_KEY = ''
 
+try:
+    BRAINTREE_SANDBOX_MERCHANT_ID = CFG['braintree_sandbox_merchant_id']
+except KeyError:
+    BRAINTREE_SANDBOX_MERCHANT_ID = ''
+
+try:
+    BRAINTREE_SANDBOX_PUBLIC_KEY = CFG['braintree_sandbox_public_key']
+except KeyError:
+    BRAINTREE_SANDBOX_PUBLIC_KEY = ''
+
+try:
+    BRAINTREE_SANDBOX_PRIVATE_KEY = CFG['braintree_sandbox_private_key']
+except KeyError:
+    BRAINTREE_SANDBOX_PRIVATE_KEY = ''
+
 try:
     PAYMENT_PROCESSING_ON = CFG['payment_processing_on']
 except KeyError: