From 42f09e376fb0e049b779a93c19147f901c280b31 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Thu, 20 Apr 2017 20:33:28 +0100
Subject: [PATCH] Take redirect url from env file

---
 config/settings/common.py            | 4 +++-
 mhackspace/subscriptions/payments.py | 2 +-
 mhackspace/subscriptions/views.py    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/settings/common.py b/config/settings/common.py
index 3b54bda..cdf63f2 100644
--- a/config/settings/common.py
+++ b/config/settings/common.py
@@ -278,6 +278,7 @@ ADMIN_URL = '^trustee/'
 PAYMENT_PROVIDERS = {
     'braintree': {
         'mode': env('PAYMENT_ENVIRONMENT'),
+        'redirect_url': env('PAYMENT_REDIRECT_URL'),
         'credentials': {
             'merchant_id': env('BRAINTREE_MERCHANT_ID'),
             'public_key': env('BRAINTREE_PUBLIC_KEY'),
@@ -286,6 +287,7 @@ PAYMENT_PROVIDERS = {
     },
     'paypal': {
         "mode": env('PAYMENT_ENVIRONMENT'),  # sandbox or live
+        'redirect_url': env('PAYMENT_REDIRECT_URL'),
         'credentials': {
             "mode": "sandbox",  # sandbox or live
             "client_id": env('PAYPAL_CLIENT_ID'),
@@ -293,13 +295,13 @@ PAYMENT_PROVIDERS = {
         },
     'gocardless': {
         'environment': env('PAYMENT_ENVIRONMENT'),
+        'redirect_url': env('PAYMENT_REDIRECT_URL'),
         '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': env('PAYMENT_REDIRECT_URL')
     }
 }
 
diff --git a/mhackspace/subscriptions/payments.py b/mhackspace/subscriptions/payments.py
index 46e1844..723f29a 100644
--- a/mhackspace/subscriptions/payments.py
+++ b/mhackspace/subscriptions/payments.py
@@ -87,7 +87,7 @@ class gocardless_provider:
         for paying_member in self.client.subscriptions():
             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 {
                 'status': paying_member.status,
                 'email': user.email,
diff --git a/mhackspace/subscriptions/views.py b/mhackspace/subscriptions/views.py
index d7bfd0d..aca1504 100644
--- a/mhackspace/subscriptions/views.py
+++ b/mhackspace/subscriptions/views.py
@@ -57,6 +57,7 @@ class MembershipJoinView(LoginRequiredMixin, UpdateView):
         app_domain = 'http://test.maidstone-hackspace.org.uk'
         payment_provider = 'gocardless'
         provider = select_provider(payment_provider)
+        app_domain = provider.get_redirect_url()
         user_code = str(self.request.user.id).zfill(5)
         # settings.PAYMENT_PROVIDERS[payment_provider]['redirect_url']