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

Memberships: Prefer valid_from over event date for .is_valid() (#4003)

Browse Source 
* Memberships: Prefer valid_from over event date for .is_valid()

* Fix tests

* Add parameter description

* Use reasonable default for requested_valid_from if membership starts in the future

* Set datetimepicker viewDate to closest allowed date

* Keep current value on going back to QuestionsStep

* Fix min_date/max_date in SplitDateTimePickerWidget

* Remove unused import

* Update src/pretix/base/models/memberships.py

Co-authored-by: Mira <weller@rami.io>

* Respect variations

---------

Co-authored-by: Mira Weller <weller@rami.io>
This commit is contained in:
Raphael Michel
2024-03-27 12:11:20 +01:00
committed by GitHub
parent 8cb187502d
commit f532853021
9 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tests/base/test_memberships.py
View File

@@ -180,6 +180,7 @@ def test_validate_membership_not_required(event, customer, membership, granting_
customer,
[
CartPosition(
event=event,
item=granting_ticket,
used_membership=membership,
)
@@ -198,6 +199,7 @@ def test_validate_membership_required(event, customer, membership, requiring_tic
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
)
],
@@ -237,6 +239,7 @@ def test_validate_membership_canceled(event, customer, membership, requiring_tic
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -258,6 +261,7 @@ def test_validate_membership_test_mode(event, customer, membership, requiring_ti
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -275,6 +279,7 @@ def test_validate_membership_test_mode(event, customer, membership, requiring_ti
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -295,6 +300,7 @@ def test_validate_membership_wrong_customer(event, customer, membership, requiri
customer2,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -316,6 +322,7 @@ def test_validate_membership_wrong_date(event, customer, membership, requiring_t
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -335,6 +342,7 @@ def test_validate_membership_wrong_type(event, customer, membership, requiring_t
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -373,6 +381,7 @@ def test_validate_membership_max_usages(event, customer, membership, requiring_t
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -388,6 +397,7 @@ def test_validate_membership_max_usages(event, customer, membership, requiring_t
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
)
@@ -402,10 +412,12 @@ def test_validate_membership_max_usages(event, customer, membership, requiring_t
customer,
[
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
),
CartPosition(
event=event,
item=requiring_ticket,
used_membership=membership
),
@@ -527,6 +539,8 @@ def test_validate_membership_parallel_validity_dynamic(event, customer, membersh
membership_type.allow_parallel_usage = False
membership_type.save()
membership.date_end = now() + timedelta(days=900)
membership.save()
o1 = Order.objects.create(
status=Order.STATUS_PENDING,
@@ -631,6 +645,8 @@ def test_validate_membership_parallel_validity_dynamic(event, customer, membersh
@pytest.mark.django_db
def test_validate_membership_parallel_validity_fixed(event, customer, membership, requiring_ticket, membership_type):
event.date_from = datetime(2021, 1, 1, 0, 0, 0, 0, tzinfo=TZ)
event.save()
requiring_ticket.validity_mode = Item.VALIDITY_MODE_FIXED
requiring_ticket.validity_fixed_from = now().replace(hour=2, minute=20, second=0)
requiring_ticket.validity_fixed_until = now().replace(hour=6, minute=20, second=0)
@@ -638,6 +654,8 @@ def test_validate_membership_parallel_validity_fixed(event, customer, membership
membership_type.allow_parallel_usage = False
membership_type.save()
membership.date_end = now() + timedelta(days=900)
membership.save()
o1 = Order.objects.create(
status=Order.STATUS_PENDING,