CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add empty cart button #161

Browse Source 
add failing test for variation item with voucher
This commit is contained in:
FlaviaBastos
2016-11-21 15:31:09 -07:00
committed by Raphael Michel
parent a0ce81a538
commit bf7db945b0
4 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/templates/pretixpresale/event/index.html
View File

@@ -26,7 +26,7 @@
</em>
<div class="row checkout-button-row">
<div class="col-md-4 col-xs-12">
<form method="post" data-asynctask action="{% eventurl request.event "presale:event.cart.remove.all" %}" >
<form method="post" data-asynctask action="{% eventurl request.event "presale:event.cart.remove" %}" >
{% csrf_token %}
{% for line in cart.positions %}
{% if line.variation %}

1
src/pretix/presale/urls.py
View File

@@ -14,7 +14,6 @@ import pretix.presale.views.user
event_patterns = [
url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'),
url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'),
url(r'^cart/removeall$', pretix.presale.views.cart.CartRemoveAll.as_view(), name='event.cart.remove.all'),
url(r'^checkout/start$', pretix.presale.views.checkout.CheckoutView.as_view(), name='event.checkout.start'),
url(r'^redeem$', pretix.presale.views.cart.RedeemView.as_view(),
name='event.redeem'),

31
src/pretix/presale/views/cart.py
View File

@@ -6,7 +6,7 @@ from django.utils.timezone import now
from django.utils.translation import ugettext as _
from django.views.generic import TemplateView, View
from pretix.base.models import Quota, Voucher
from pretix.base.models import CartPosition, Quota, Voucher
from pretix.base.services.cart import (
CartError, add_items_to_cart, remove_items_from_cart,
)
@@ -104,33 +104,10 @@ class CartRemove(EventViewMixin, CartActionMixin, AsyncAction, View):
task = remove_items_from_cart
def get_success_message(self, value):
return _('Your cart has been updated.')
def get_error_message(self, exception):
if isinstance(exception, dict) and exception['exc_type'] == 'CartError':
return exception['exc_message']
elif isinstance(exception, CartError):
return str(exception)
return super().get_error_message(exception)
def post(self, request, *args, **kwargs):
items = self._items_from_post_data()
if items:
return self.do(self.request.event.id, items, self.request.session.session_key)
if CartPosition.objects.filter(cart_id=self.request.session.session_key).exists():
return _('Your cart has been updated.')
else:
if 'ajax' in self.request.GET or 'ajax' in self.request.POST:
return JsonResponse({
'redirect': self.get_error_url()
})
else:
return redirect(self.get_error_url())
class CartRemoveAll(EventViewMixin, CartActionMixin, AsyncAction, View):
task = remove_items_from_cart
def get_success_message(self, value):
return _('Your cart is empty.')
return _('Your cart is empty.')
def get_error_message(self, exception):
if isinstance(exception, dict) and exception['exc_type'] == 'CartError':