reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

define coinify cancel url in the api call, rename cancel url method on Order

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2016-05-29 13:00:00 +02:00
parent 7476679c3f
commit bb85b77841
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shop/models.py
View file

@ -101,7 +101,7 @@ class Order(CreatedUpdatedModel):
def get_epay_accept_url(self, request): def get_epay_accept_url(self, request):
return 'https://' + request.get_host() + str(reverse_lazy('shop:epay_thanks', kwargs={'pk': self.pk})) return 'https://' + request.get_host() + str(reverse_lazy('shop:epay_thanks', kwargs={'pk': self.pk}))
def get_epay_cancel_url(self, request): def get_cancel_url(self, request):
return 'https://' + request.get_host() + str(reverse_lazy('shop:order_detail', kwargs={'pk': self.pk})) return 'https://' + request.get_host() + str(reverse_lazy('shop:order_detail', kwargs={'pk': self.pk}))
def get_epay_callback_url(self, request): def get_epay_callback_url(self, request):
@ -129,7 +129,6 @@ class Order(CreatedUpdatedModel):
self.save() self.save()
class ProductCategory(CreatedUpdatedModel, UUIDModel): class ProductCategory(CreatedUpdatedModel, UUIDModel):
class Meta: class Meta:
verbose_name = 'Product category' verbose_name = 'Product category'

18
shop/views.py
View file

@ -243,22 +243,15 @@ class EpayFormView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrd
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
order = self.get_object() order = self.get_object()
accept_url = order.get_epay_accept_url(self.request)
cancel_url = order.get_epay_cancel_url(self.request)
callback_url = order.get_epay_callback_url(self.request)
amount = order.total * 100
epay_hash = calculate_epay_hash(order, self.request)
context = super(EpayFormView, self).get_context_data(**kwargs) context = super(EpayFormView, self).get_context_data(**kwargs)
context['merchant_number'] = settings.EPAY_MERCHANT_NUMBER context['merchant_number'] = settings.EPAY_MERCHANT_NUMBER
context['description'] = order.description context['description'] = order.description
context['amount'] = amount context['amount'] = order.total * 100
context['order_id'] = order.pk context['order_id'] = order.pk
context['accept_url'] = accept_url context['accept_url'] = order.get_epay_accept_url(self.request)
context['cancel_url'] = cancel_url context['cancel_url'] = order.get_cancel_url(self.request)
context['callback_url'] = callback_url context['callback_url'] = order.get_epay_callback_url(self.request)
context['epay_hash'] = epay_hash context['epay_hash'] = calculate_epay_hash(order, self.request)
return context return context
@ -339,6 +332,7 @@ class CoinifyRedirectView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUn
description='BornHack 2016 order id #%s' % order.id, description='BornHack 2016 order id #%s' % order.id,
callback_url=order.get_coinify_callback_url(request), callback_url=order.get_coinify_callback_url(request),
return_url=order.get_coinify_thanks_url(request), return_url=order.get_coinify_thanks_url(request),
cancel_url=order.get_coinify_cancel_url(request),
) )
# Parse response # Parse response