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

use the datetime parameter for the comparison time so that the simulator works too

Browse Source
This commit is contained in:
Maximilian Richt
2026-05-13 12:53:36 +02:00
parent ca4e6ab07a
commit 0256d92fb1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/api/views/checkin.py
View File

@@ -709,12 +709,11 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
# it could in theory also happen with two add-ons being on the same check-in list but without overlapping # it could in theory also happen with two add-ons being on the same check-in list but without overlapping
# validity. It makes sense to filter this "after" the previous checks since it is not "intentional" filtering # validity. It makes sense to filter this "after" the previous checks since it is not "intentional" filtering
# configured by the admin but "accidental" filtering that depends on the time of execution. # configured by the admin but "accidental" filtering that depends on the time of execution.
now_dt = now()
op_candidates_filtered = [ op_candidates_filtered = [
op for op in op_candidates_filtered op for op in op_candidates_filtered
if ( if (
(not op.valid_from or op.valid_from <= now_dt) and (not op.valid_from or op.valid_from <= datetime) and
(not op.valid_until or op.valid_until > now_dt) (not op.valid_until or op.valid_until > datetime)
) )
] ]
@@ -722,11 +721,10 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
# None of the ops is valid today or has the correct product, too bad! We could just error out here, but # None of the ops is valid today or has the correct product, too bad! We could just error out here, but
# instead we just continue with *any* product and have it rejected by the check in perform_checkin. # instead we just continue with *any* product and have it rejected by the check in perform_checkin.
# To improve the error message, we select the op that will "work next" or - if none matches - "worked last". # To improve the error message, we select the op that will "work next" or - if none matches - "worked last".
now_dt = now()
op_candidate = None op_candidate = None
for op in op_candidates: for op in op_candidates:
if ( if (
op.valid_from and op.valid_from > now_dt and op.valid_from and op.valid_from > datetime and
(not op_candidate or op.valid_from < op_candidate.valid_from) (not op_candidate or op.valid_from < op_candidate.valid_from)
): ):
op_candidate = op op_candidate = op
@@ -735,7 +733,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
# no candidate in the future, get closest in the past # no candidate in the future, get closest in the past
for op in op_candidates: for op in op_candidates:
if ( if (
op.valid_until and op.valid_until < now_dt and op.valid_until and op.valid_until < datetime and
(not op_candidate or op.valid_until > op_candidate.valid_until) (not op_candidate or op.valid_until > op_candidate.valid_until)
): ):
op_candidate = op op_candidate = op