Merge branch 'feature/flexdevpay' into develop
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user