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

Fixed a logic bug

Browse Source
This commit is contained in:
Raphael Michel
2015-06-29 14:21:49 +02:00
parent 765076540a
commit 44beb8e84a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/services/orders.py
View File

@@ -106,7 +106,7 @@ def check_positions(event, dt, positions, quotas_locked):
err = err or error_messages['unavailable'] err = err or error_messages['unavailable']
quota_ok = False quota_ok = False
break break
if quota_ok and not event.presale_end or now() < event.presale_end: if quota_ok and (not event.presale_end or now() < event.presale_end):
cp = cp.clone() cp = cp.clone()
positions[i] = cp positions[i] = cp
cp.expires = now() + timedelta( cp.expires = now() + timedelta(

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

@@ -107,6 +107,7 @@ class CartAdd(EventViewMixin, CartActionMixin, View):
return redirect(self.get_failure_url()) return redirect(self.get_failure_url())
self.items = self._items_from_post_data() self.items = self._items_from_post_data()
self._expired = self._re_add_expired_positions()
if not self.items: if not self.items:
return redirect(self.get_failure_url()) return redirect(self.get_failure_url())
@@ -167,8 +168,6 @@ class CartAdd(EventViewMixin, CartActionMixin, View):
expiry = now() + timedelta(minutes=self.request.event.settings.get('reservation_time', as_type=int)) expiry = now() + timedelta(minutes=self.request.event.settings.get('reservation_time', as_type=int))
self._extend_existing(expiry) self._extend_existing(expiry)
_expired = self._re_add_expired_positions()
# Fetch items from the database # Fetch items from the database
items_cache = { items_cache = {
i.identity: i for i i.identity: i for i
@@ -253,7 +252,7 @@ class CartAdd(EventViewMixin, CartActionMixin, View):
for quota in quotas: for quota in quotas:
quota.release() quota.release()
self._delete_expired(_expired) self._delete_expired(self._expired)
if not self.msg_some_unavailable: if not self.msg_some_unavailable:
messages.success(self.request, _('The products have been successfully added to your cart.')) messages.success(self.request, _('The products have been successfully added to your cart.'))