oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Take redirect url from env file

This commit is contained in:
Oliver Marks 2017-04-20 20:33:28 +01:00
parent a6e0bccb25
commit 42f09e376f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/settings/common.py
View File

@ -278,6 +278,7 @@ ADMIN_URL = '^trustee/'
PAYMENT_PROVIDERS = { PAYMENT_PROVIDERS = {
'braintree': { 'braintree': {
'mode': env('PAYMENT_ENVIRONMENT'), 'mode': env('PAYMENT_ENVIRONMENT'),
'redirect_url': env('PAYMENT_REDIRECT_URL'),
'credentials': { 'credentials': {
'merchant_id': env('BRAINTREE_MERCHANT_ID'), 'merchant_id': env('BRAINTREE_MERCHANT_ID'),
'public_key': env('BRAINTREE_PUBLIC_KEY'), 'public_key': env('BRAINTREE_PUBLIC_KEY'),
@ -286,6 +287,7 @@ PAYMENT_PROVIDERS = {
}, },
'paypal': { 'paypal': {
"mode": env('PAYMENT_ENVIRONMENT'), # sandbox or live "mode": env('PAYMENT_ENVIRONMENT'), # sandbox or live
'redirect_url': env('PAYMENT_REDIRECT_URL'),
'credentials': { 'credentials': {
"mode": "sandbox", # sandbox or live "mode": "sandbox", # sandbox or live
"client_id": env('PAYPAL_CLIENT_ID'), "client_id": env('PAYPAL_CLIENT_ID'),
@ -293,13 +295,13 @@ PAYMENT_PROVIDERS = {
}, },
'gocardless': { 'gocardless': {
'environment': env('PAYMENT_ENVIRONMENT'), 'environment': env('PAYMENT_ENVIRONMENT'),
'redirect_url': env('PAYMENT_REDIRECT_URL'),
'credentials': { 'credentials': {
'app_id': env('GOCARDLESS_APP_ID'), 'app_id': env('GOCARDLESS_APP_ID'),
'app_secret': env('GOCARDLESS_APP_SECRET'), 'app_secret': env('GOCARDLESS_APP_SECRET'),
'access_token': env('GOCARDLESS_ACCESS_TOKEN'), 'access_token': env('GOCARDLESS_ACCESS_TOKEN'),
'merchant_id': env('GOCARDLESS_MERCHANT_ID'), 'merchant_id': env('GOCARDLESS_MERCHANT_ID'),
}, },
'redirect_url': env('PAYMENT_REDIRECT_URL')
} }
} }

2
mhackspace/subscriptions/payments.py
View File

@ -87,7 +87,7 @@ class gocardless_provider:
for paying_member in self.client.subscriptions(): for paying_member in self.client.subscriptions():
user=paying_member.user() user=paying_member.user()
#gocardless does not have a reference so we use the id instead # gocardless does not have a reference so we use the id instead
yield { yield {
'status': paying_member.status, 'status': paying_member.status,
'email': user.email, 'email': user.email,

1
mhackspace/subscriptions/views.py
View File

@ -57,6 +57,7 @@ class MembershipJoinView(LoginRequiredMixin, UpdateView):
app_domain = 'http://test.maidstone-hackspace.org.uk' app_domain = 'http://test.maidstone-hackspace.org.uk'
payment_provider = 'gocardless' payment_provider = 'gocardless'
provider = select_provider(payment_provider) provider = select_provider(payment_provider)
app_domain = provider.get_redirect_url()
user_code = str(self.request.user.id).zfill(5) user_code = str(self.request.user.id).zfill(5)
# settings.PAYMENT_PROVIDERS[payment_provider]['redirect_url'] # settings.PAYMENT_PROVIDERS[payment_provider]['redirect_url']