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 tests and remove redundant checks

Browse Source
This commit is contained in:
Raphael Michel
2017-02-17 16:19:03 +01:00
parent d94c67bc7a
commit 7e135be012
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/models/orders.py
View File

@@ -282,11 +282,11 @@ class Order(LoggedModel):
if self.event.settings.get('payment_term_last'):
if now() > self.event.payment_term_last:
return error_messages['late_lastdate']
if self.status == self.STATUS_PENDING:
return True
if not self.event.settings.get('payment_term_accept_late'):
return error_messages['late']
if self.status == self.STATUS_PENDING:
return True
return self._is_still_available()
def _is_still_available(self, now_dt: datetime=None) -> Union[bool, str]:

11
src/pretix/base/services/cart.py
View File

@@ -115,8 +115,9 @@ def _add_new_items(event: Event, items: List[dict],
if i.get('voucher'):
try:
voucher = Voucher.objects.get(code=i.get('voucher').strip(), event=event)
if voucher.redeemed >= voucher.max_usages:
return error_messages['voucher_redeemed']
except Voucher.DoesNotExist:
return error_messages['voucher_invalid']
else:
if voucher.valid_until is not None and voucher.valid_until < now_dt:
return error_messages['voucher_expired']
if not voucher.applies_to(item, variation):
@@ -135,15 +136,9 @@ def _add_new_items(event: Event, items: List[dict],
if i['count'] > v_avail:
return error_messages['voucher_redeemed_partial'] % v_avail
except Voucher.DoesNotExist:
return error_messages['voucher_invalid']
# Fetch all quotas. If there are no quotas, this item is not allowed to be sold.
quotas = list(item.quotas.all()) if variation is None else list(variation.quotas.all())
if voucher and voucher.quota and voucher.quota.pk not in [q.pk for q in quotas]:
return error_messages['voucher_invalid_item']
if item.require_voucher and voucher is None:
return error_messages['voucher_required']