CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix voucher validation in CartManager

Browse Source
This commit is contained in:
Raphael Michel
2019-07-08 17:50:22 +02:00
parent 08bfe13dc3
commit 2352f3b811
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,10 @@ class CartManager:
def _check_item_constraints(self, op): def _check_item_constraints(self, op):
if isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation): if isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation):
if (op.item.require_voucher or op.item.hide_without_voucher) and (op.voucher is None or not op.voucher.show_hidden_items): if op.item.require_voucher and op.voucher is None:
raise CartError(error_messages['voucher_required'])
if op.item.hide_without_voucher and (op.voucher is None or not op.voucher.show_hidden_items):
raise CartError(error_messages['voucher_required']) raise CartError(error_messages['voucher_required'])
if not op.item.is_available() or (op.variation and not op.variation.active): if not op.item.is_available() or (op.variation and not op.variation.active):

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

@@ -56,7 +56,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</h2> </h2>
{% if order.status == "n" and not order.require_approval %} {% if order.status == "n" and not order.require_approval %}
<div class="panel panel-danger"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
{% trans "Payment" %} {% trans "Payment" %}