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

fix customer comment error when changing payment method for an order with empty comment

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2017-03-26 10:15:54 +02:00
parent 25aba076fb
commit 850de5554f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shop/views.py
View file

@ -277,13 +277,7 @@ class OrderListView(LoginRequiredMixin, ListView):
return queryset.filter(user=self.request.user).not_cancelled() return queryset.filter(user=self.request.user).not_cancelled()
class OrderDetailView( class OrderDetailView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureOrderHasProductsMixin, EnsureOrderIsNotCancelledMixin, DetailView):
LoginRequiredMixin,
EnsureUserOwnsOrderMixin,
EnsureOrderHasProductsMixin,
EnsureOrderIsNotCancelledMixin,
DetailView
):
model = Order model = Order
template_name = 'order_detail.html' template_name = 'order_detail.html'
context_object_name = 'order' context_object_name = 'order'
@ -300,7 +294,7 @@ class OrderDetailView(
# Set payment method and mark the order as closed # Set payment method and mark the order as closed
order.payment_method = payment_method order.payment_method = payment_method
order.open = None order.open = None
order.customer_comment = request.POST.get('customer_comment') order.customer_comment = request.POST.get('customer_comment') or ''
order.save() order.save()
reverses = { reverses = {
@ -331,7 +325,7 @@ class OrderDetailView(
new_quantity = int(request.POST.get(order_product_id)) new_quantity = int(request.POST.get(order_product_id))
order_product.quantity = new_quantity order_product.quantity = new_quantity
order_product.save() order_product.save()
order.customer_comment = request.POST.get('customer_comment') order.customer_comment = request.POST.get('customer_comment') or ''
order.save() order.save()
product_remove = request.POST.get('remove_product') product_remove = request.POST.get('remove_product')