sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v9.05'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-02 18:01:34 +01:00
parent 4fd1023896 9394894812
commit 8e14c40d80
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rowers/braintreestuff.py
View File

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

15
rowsandall_app/settings.py
View File

@@ -441,6 +441,21 @@ try:
except KeyError: except KeyError:
BRAINTREE_PRIVATE_KEY = '' 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: try:
PAYMENT_PROCESSING_ON = CFG['payment_processing_on'] PAYMENT_PROCESSING_ON = CFG['payment_processing_on']
except KeyError: except KeyError: