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

Fix replacement error

This commit is contained in:
Oliver Marks 2017-10-01 14:12:41 +01:00
parent e75fc35db1
commit 2e9a428761
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mhackspace/subscriptions/payments.py
View File

@ -36,8 +36,8 @@ class gocardless_provider:
environment=payment_providers['gocardless']['environment']) environment=payment_providers['gocardless']['environment'])
# def subscribe_confirm(self, args): # def subscribe_confirm(self, args):
# response = gocardless_proclient.confirm_resource(args) # response = gocardless_pro.client.confirm_resource(args)
# subscription = gocardless_proclient.subscription(args.get('resource_id')) # subscription = gocardless_pro.client.subscription(args.get('resource_id'))
# return { # return {
# 'amount': subscription.amount, # 'amount': subscription.amount,
# 'start_date': subscription.created_at, # 'start_date': subscription.created_at,
@ -82,9 +82,9 @@ class gocardless_provider:
def cancel_subscription(self, reference): def cancel_subscription(self, reference):
try: try:
subscription = gocardless_proclient.subscription(reference) subscription = gocardless_pro.client.subscription(reference)
response = subscription.cancel() response = subscription.cancel()
except gocardless_proexceptions.ClientError: except gocardless_pro.exceptions.ClientError:
return { return {
'success': False 'success': False
} }
@ -120,8 +120,8 @@ class gocardless_provider:
response = self.client.redirect_flows.get(r) response = self.client.redirect_flows.get(r)
# response = self.client.redirect_flows.get(provider_response.get('redirect_flow_id')) # response = self.client.redirect_flows.get(provider_response.get('redirect_flow_id'))
# response = gocardless_proclient.confirm_resource(provider_response) # response = gocardless_pro.client.confirm_resource(provider_response)
# subscription = gocardless_proclient.subscription(provider_response.get('resource_id')) # subscription = gocardless_pro.client.subscription(provider_response.get('resource_id'))
user_id = response.links.customer user_id = response.links.customer
mandate_id = response.links.mandate mandate_id = response.links.mandate
# user = subscription.user() # user = subscription.user()
@ -180,8 +180,8 @@ class braintree_provider:
def confirm_subscription(self, args): def confirm_subscription(self, args):
if self.provider == 'gocardless': if self.provider == 'gocardless':
response = gocardless_proclient.confirm_resource(args) response = gocardless_pro.client.confirm_resource(args)
subscription = gocardless_proclient.subscription(args.get('resource_id')) subscription = gocardless_pro.client.subscription(args.get('resource_id'))
return { return {
'amount': subscription.amount, 'amount': subscription.amount,
'start_date': subscription.created_at, 'start_date': subscription.created_at,

2
mhackspace/subscriptions/views.py
View File

@ -68,7 +68,7 @@ class MembershipJoinView(LoginRequiredMixin, UpdateView):
result = { result = {
'email': self.request.user.email, 'email': self.request.user.email,
'reference': user_code, 'reference': user_code,
'amount': form_subscription.cleaned_data.get('amount', 20.00) * 0.01, 'amount': form_subscription.cleaned_data.get('amount', 20.00),
'start_date': timezone.now() 'start_date': timezone.now()
} }