diff --git a/config/settings/common.py b/config/settings/common.py index dd0e0da..3b54bda 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -277,7 +277,7 @@ ADMIN_URL = '^trustee/' PAYMENT_PROVIDERS = { 'braintree': { - 'mode': 'sandbox', + 'mode': env('PAYMENT_ENVIRONMENT'), 'credentials': { 'merchant_id': env('BRAINTREE_MERCHANT_ID'), 'public_key': env('BRAINTREE_PUBLIC_KEY'), @@ -285,21 +285,21 @@ PAYMENT_PROVIDERS = { } }, 'paypal': { - "mode": "sandbox", # sandbox or live + "mode": env('PAYMENT_ENVIRONMENT'), # sandbox or live 'credentials': { "mode": "sandbox", # sandbox or live "client_id": env('PAYPAL_CLIENT_ID'), "client_secret": env('PAYPAL_CLIENT_SECRET')} }, 'gocardless': { - 'environment': 'sandbox', + 'environment': env('PAYMENT_ENVIRONMENT'), 'credentials': { 'app_id': env('GOCARDLESS_APP_ID'), 'app_secret': env('GOCARDLESS_APP_SECRET'), 'access_token': env('GOCARDLESS_ACCESS_TOKEN'), 'merchant_id': env('GOCARDLESS_MERCHANT_ID'), }, - 'redirect_url': 'https://test.maidstone-hackspace.org.uk' + 'redirect_url': env('PAYMENT_REDIRECT_URL') } } diff --git a/config/settings/production.py b/config/settings/production.py index 662ad78..6522b43 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -213,3 +213,6 @@ ADMIN_URL = env('DJANGO_ADMIN_URL', default='trustee') # Your production stuff: Below this line define 3rd party library settings # ------------------------------------------------------------------------------ + +PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'https://maidstone-hackspace.org.uk' + diff --git a/env.example b/env.example index db57760..b194a95 100644 --- a/env.example +++ b/env.example @@ -30,6 +30,7 @@ COMPRESS_ENABLED= PAYMENT_ENVIRONMENT=sandbox +PAYMENT_REDIRECT_URL=http://127.0.0.1:8180 BRAINTREE_MERCHANT_ID=demo BRAINTREE_PUBLIC_KEY=demo diff --git a/mhackspace/subscriptions/views.py b/mhackspace/subscriptions/views.py index 09fba98..d7bfd0d 100644 --- a/mhackspace/subscriptions/views.py +++ b/mhackspace/subscriptions/views.py @@ -58,6 +58,7 @@ class MembershipJoinView(LoginRequiredMixin, UpdateView): payment_provider = 'gocardless' provider = select_provider(payment_provider) user_code = str(self.request.user.id).zfill(5) + # settings.PAYMENT_PROVIDERS[payment_provider]['redirect_url'] form_subscription = MembershipJoinForm(data=self.request.POST) form_subscription.is_valid()