Use 'open' instead of 'finalized'
This commit is contained in:
parent
c45a3aa8c9
commit
5ed1d3075b
|
@ -72,7 +72,6 @@ class OrderDetailView(LoginRequiredMixin, DetailView):
|
||||||
return super(OrderDetailView, self).get(request, *args, **kwargs)
|
return super(OrderDetailView, self).get(request, *args, **kwargs)
|
||||||
|
|
||||||
def post(self, request, *args, **kwargs):
|
def post(self, request, *args, **kwargs):
|
||||||
# mark order as finalized and redirect user to payment
|
|
||||||
order = self.get_object()
|
order = self.get_object()
|
||||||
payment_method = request.POST.get('payment_method')
|
payment_method = request.POST.get('payment_method')
|
||||||
|
|
||||||
|
@ -86,7 +85,8 @@ class OrderDetailView(LoginRequiredMixin, DetailView):
|
||||||
kwargs={'orderid': self.get_object.id}
|
kwargs={'orderid': self.get_object.id}
|
||||||
)
|
)
|
||||||
|
|
||||||
order.finalized = True
|
# Mark the order as closed
|
||||||
|
order.open = None
|
||||||
|
|
||||||
reverses = {
|
reverses = {
|
||||||
Order.CREDIT_CARD: reverse_lazy(
|
Order.CREDIT_CARD: reverse_lazy(
|
||||||
|
@ -120,7 +120,7 @@ class ProductDetailView(LoginRequiredMixin, FormView, DetailView):
|
||||||
try:
|
try:
|
||||||
order = Order.objects.get(
|
order = Order.objects.get(
|
||||||
user=self.request.user,
|
user=self.request.user,
|
||||||
finalized=False
|
open__isnull=False
|
||||||
)
|
)
|
||||||
except Order.DoesNotExist:
|
except Order.DoesNotExist:
|
||||||
# no open order - open a new one
|
# no open order - open a new one
|
||||||
|
@ -164,7 +164,7 @@ class CoinifyRedirectView(TemplateView):
|
||||||
if self.order.user != request.user:
|
if self.order.user != request.user:
|
||||||
raise Http404("Order not found")
|
raise Http404("Order not found")
|
||||||
|
|
||||||
if not self.order.finalized:
|
if self.order.open is None:
|
||||||
messages.error(request, 'This order is still open!')
|
messages.error(request, 'This order is still open!')
|
||||||
return HttpResponseRedirect('shop:order_detail')
|
return HttpResponseRedirect('shop:order_detail')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue