From bb85b778418c348c0ef939928416af8a0cc08f53 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 29 May 2016 13:00:00 +0200 Subject: [PATCH] define coinify cancel url in the api call, rename cancel url method on Order --- shop/models.py | 3 +-- shop/views.py | 18 ++++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/shop/models.py b/shop/models.py index 619ebda5..927c858e 100644 --- a/shop/models.py +++ b/shop/models.py @@ -101,7 +101,7 @@ class Order(CreatedUpdatedModel): def get_epay_accept_url(self, request): 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})) def get_epay_callback_url(self, request): @@ -129,7 +129,6 @@ class Order(CreatedUpdatedModel): self.save() - class ProductCategory(CreatedUpdatedModel, UUIDModel): class Meta: verbose_name = 'Product category' diff --git a/shop/views.py b/shop/views.py index 736b3461..e643771e 100644 --- a/shop/views.py +++ b/shop/views.py @@ -243,22 +243,15 @@ class EpayFormView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrd def get_context_data(self, **kwargs): 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['merchant_number'] = settings.EPAY_MERCHANT_NUMBER context['description'] = order.description - context['amount'] = amount + context['amount'] = order.total * 100 context['order_id'] = order.pk - context['accept_url'] = accept_url - context['cancel_url'] = cancel_url - context['callback_url'] = callback_url - context['epay_hash'] = epay_hash + context['accept_url'] = order.get_epay_accept_url(self.request) + context['cancel_url'] = order.get_cancel_url(self.request) + context['callback_url'] = order.get_epay_callback_url(self.request) + context['epay_hash'] = calculate_epay_hash(order, self.request) return context @@ -339,6 +332,7 @@ class CoinifyRedirectView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUn description='BornHack 2016 order id #%s' % order.id, callback_url=order.get_coinify_callback_url(request), return_url=order.get_coinify_thanks_url(request), + cancel_url=order.get_coinify_cancel_url(request), ) # Parse response