Simpler API for cart removal

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -45,19 +45,10 @@
                 <form action="{% eventurl event "presale:event.cart.remove" %}"
                         method="post" data-asynctask>
                     {% csrf_token %}
-
-                    {% if line.variation %}
-                        <input type="hidden" name="variation_{{ line.item.id }}_{{ line.variation.id }}"
-                                value="1" />
-                        <input type="hidden" name="price_{{ line.item.id }}_{{ line.variation.id }}"
-                                value="{{ line.price }}" />
-                    {% else %}
-                        <input type="hidden" name="item_{{ line.item.id }}"
-                                value="1" />
-                        <input type="hidden" name="price_{{ line.item.id }}"
-                                value="{{ line.price }}" />
-                    {% endif %}
-                    <button class="btn btn-mini btn-link"><i class="fa fa-minus"></i></button>
+                    <input type="hidden" name="id" value="{{ line.id }}" />
+                    <button class="btn btn-mini btn-link">
+                        <i class="fa fa-minus"></i>
+                    </button>
                 </form>
                 {% endif %}
                 {{ line.count }}

src/pretix/presale/templates/pretixpresale/event/index.html

@@ -26,17 +26,8 @@
                 </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" %}" >
+                        <form method="post" data-asynctask action="{% eventurl request.event "presale:event.cart.clear" %}">
                             {% csrf_token %}
-                            {% for line in cart.positions %}
-                                {% if line.variation %}
-                                    <input type="hidden" name="variation_{{ line.item.id }}_{{ line.variation.id }}" value="{{ line.count }}" />
-                                    <input type="hidden" name="price_{{ line.item.id }}_{{ line.variation.id }}" value="{{ line.price }}" />
-                                {% else %}
-                                    <input type="hidden" name="item_{{ line.item.id }}" value="{{ line.count }}" />
-                                    <input type="hidden" name="price_{{ line.item.id }}" value="{{ line.price }}" />
-                                {% endif %}
-                            {% endfor %}
                             <button class="btn btn-block btn-default btn-lg" type="submit"><i class="fa fa-close"></i> {% trans "Empty cart" %}</button>
                         </form>
                     </div>

src/pretix/presale/urls.py

@@ -15,6 +15,7 @@ import pretix.presale.views.waiting
 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/clear$', pretix.presale.views.cart.CartClear.as_view(), name='event.cart.clear'),
     url(r'^waitinglist', pretix.presale.views.waiting.WaitingView.as_view(), name='event.waitinglist'),
     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(),

src/pretix/presale/views/cart.py

@@ -10,7 +10,7 @@ from django.views.generic import TemplateView, View
 from pretix.base.decimal import round_decimal
 from pretix.base.models import CartPosition, Quota, Voucher
 from pretix.base.services.cart import (
-    CartError, add_items_to_cart, remove_items_from_cart,
+    CartError, add_items_to_cart, clear_cart, remove_cart_position,
 )
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.views import EventViewMixin
@@ -105,19 +105,18 @@ class CartActionMixin:
 
 
 class CartRemove(EventViewMixin, CartActionMixin, AsyncAction, View):
-    task = remove_items_from_cart
+    task = remove_cart_position
     known_errortypes = ['CartError']
 
     def get_success_message(self, value):
         if CartPosition.objects.filter(cart_id=self.request.session.session_key).exists():
             return _('Your cart has been updated.')
         else:
-            return _('Your cart is empty.')
+            return _('Your cart is now empty.')
 
     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, translation.get_language())
+        if 'id' in request.POST:
+            return self.do(self.request.event.id, request.POST.get('id'), self.request.session.session_key, translation.get_language())
         else:
             if 'ajax' in self.request.GET or 'ajax' in self.request.POST:
                 return JsonResponse({
@@ -127,6 +126,17 @@ class CartRemove(EventViewMixin, CartActionMixin, AsyncAction, View):
                 return redirect(self.get_error_url())
 
 
+class CartClear(EventViewMixin, CartActionMixin, AsyncAction, View):
+    task = clear_cart
+    known_errortypes = ['CartError']
+
+    def get_success_message(self, value):
+        return _('Your cart is now empty.')
+
+    def post(self, request, *args, **kwargs):
+        return self.do(self.request.event.id, self.request.session.session_key, translation.get_language())
+
+
 class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View):
     task = add_items_to_cart
     known_errortypes = ['CartError']