Allow customers to change to a different product variation (#1719)

This commit is contained in:
Raphael Michel
2020-07-20 16:36:24 +02:00
committed by GitHub
parent c8ef825de5
commit e7b9c49620
17 changed files with 952 additions and 132 deletions

View File

@@ -1319,47 +1319,6 @@ class OrderTestCase(BaseQuotaTestCase):
assert self.order.user_cancel_deadline < now()
assert not self.order.user_cancel_allowed
@classscope(attr='o')
def test_user_cancel_absolute_deadline_paid_no_subevents(self):
self.order.status = Order.STATUS_PAID
self.order.save()
self.event.settings.cancel_allow_user_paid = True
assert self.order.user_cancel_deadline is None
self.event.settings.set('cancel_allow_user_paid_until', RelativeDateWrapper(
now() + timedelta(days=1)
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_allowed
assert self.order.user_cancel_deadline > now()
self.event.settings.set('cancel_allow_user_paid_until', RelativeDateWrapper(
now() - timedelta(days=1)
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_deadline < now()
assert not self.order.user_cancel_allowed
@classscope(attr='o')
def test_user_cancel_relative_deadline_paid_no_subevents(self):
self.order.status = Order.STATUS_PAID
self.order.save()
self.event.date_from = now() + timedelta(days=3)
self.event.save()
self.event.settings.cancel_allow_user_paid = True
assert self.order.user_cancel_deadline is None
self.event.settings.set('cancel_allow_user_paid_until', RelativeDateWrapper(
RelativeDate(days_before=2, time=datetime.time(14, 0, 0), base_date_name='date_from')
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_deadline > now()
assert self.order.user_cancel_allowed
self.event.settings.set('cancel_allow_user_paid_until', RelativeDateWrapper(
RelativeDate(days_before=4, time=datetime.time(14, 0, 0), base_date_name='date_from')
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_deadline < now()
assert not self.order.user_cancel_allowed
@classscope(attr='o')
def test_user_cancel_relative_deadline_to_subevents(self):
self.event.date_from = now() + timedelta(days=3)
@@ -1595,6 +1554,180 @@ class OrderTestCase(BaseQuotaTestCase):
p2: Decimal('10.00'),
}
@classscope(attr='o')
def test_can_change_order(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v = item1.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
assert not self.order.user_change_allowed
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed
@classscope(attr='o')
def test_can_change_order_with_giftcard(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True, issue_giftcard=True)
v = item1.variations.create(value="V")
p = OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
self.event.settings.change_allow_user_variation = True
self.event.organizer.issued_gift_cards.create(
currency="EUR", issued_in=p
)
assert not self.order.user_change_allowed
@classscope(attr='o')
def test_can_change_checked_in(self):
v = self.item1.variations.create(value="V")
self.order.positions.update(variation=v)
self.order.status = Order.STATUS_PAID
self.order.save()
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed
Checkin.objects.create(
position=self.order.positions.first(),
list=CheckinList.objects.create(event=self.event, name='Default')
)
assert not self.order.user_change_allowed
@classscope(attr='o')
def test_can_change_order_multiple(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v = item1.variations.create(value="V")
item2 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v2 = item2.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
OrderPosition.objects.create(order=self.order, item=item2,
variation=v2, price=23)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed
@classscope(attr='o')
def test_can_not_change_order(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=False)
v = item1.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed is False
@classscope(attr='o')
def test_require_any_variation(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
OrderPosition.objects.create(order=self.order, item=item1,
variation=None, price=23)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed is False
item2 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v2 = item2.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item2,
variation=v2, price=23)
assert self.order.user_change_allowed is True
@classscope(attr='o')
def test_can_not_change_order_multiple(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=False)
item2 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v = item1.variations.create(value="V")
v2 = item2.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
OrderPosition.objects.create(order=self.order, item=item2,
variation=v2, price=23)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed is False
@classscope(attr='o')
def test_can_not_change_order_multiple_mixed(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=False)
item2 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True)
v = item1.variations.create(value="V")
v2 = item2.variations.create(value="V")
OrderPosition.objects.create(order=self.order, item=item1,
variation=v, price=23)
OrderPosition.objects.create(order=self.order, item=item2,
variation=v2, price=23)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_allowed is False
@classscope(attr='o')
def test_user_change_absolute_deadline_unpaid_no_subevents(self):
v = self.item1.variations.create(value="V")
self.order.positions.update(variation=v)
self.event.settings.change_allow_user_variation = True
assert self.order.user_change_deadline is None
self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
now() + timedelta(days=1)
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline > now()
assert self.order.user_change_allowed
self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
now() - timedelta(days=1)
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline < now()
assert not self.order.user_change_allowed
@classscope(attr='o')
def test_user_change_relative_deadline_unpaid_no_subevents(self):
v = self.item1.variations.create(value="V")
self.order.positions.update(variation=v)
self.event.settings.change_allow_user_variation = True
self.event.date_from = now() + timedelta(days=3)
self.event.save()
assert self.order.user_change_deadline is None
self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
RelativeDate(days_before=2, time=datetime.time(14, 0, 0), base_date_name='date_from')
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline > now()
assert self.order.user_change_allowed
self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
RelativeDate(days_before=4, time=datetime.time(14, 0, 0), base_date_name='date_from')
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline < now()
assert not self.order.user_change_allowed
@classscope(attr='o')
def test_user_change_relative_deadline_to_subevents(self):
v = self.item1.variations.create(value="V")
self.order.positions.update(variation=v)
self.event.settings.change_allow_user_variation = True
self.event.date_from = now() + timedelta(days=3)
self.event.has_subevents = True
self.event.save()
se1 = self.event.subevents.create(name="SE1", date_from=now() + timedelta(days=10))
se2 = self.event.subevents.create(name="SE2", date_from=now() + timedelta(days=1))
self.op1.subevent = se1
self.op1.save()
self.op2.subevent = se2
self.op2.save()
self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
RelativeDate(days_before=2, time=datetime.time(14, 0, 0), base_date_name='date_from')
))
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline < now()
self.op2.subevent = se1
self.op2.save()
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_change_deadline > now()
class ItemCategoryTest(TestCase):
"""

View File

@@ -37,9 +37,9 @@ class BaseOrdersTest(TestCase):
self.shirt = Item.objects.create(event=self.event, name='T-Shirt', category=self.category, default_price=12)
self.quota_shirts.items.add(self.shirt)
self.shirt_red = ItemVariation.objects.create(item=self.shirt, default_price=14, value="Red")
var2 = ItemVariation.objects.create(item=self.shirt, value="Blue")
self.shirt_blue = ItemVariation.objects.create(item=self.shirt, value="Blue")
self.quota_shirts.variations.add(self.shirt_red)
self.quota_shirts.variations.add(var2)
self.quota_shirts.variations.add(self.shirt_blue)
self.quota_tickets = Quota.objects.create(event=self.event, name='Tickets', size=5)
self.ticket = Item.objects.create(event=self.event, name='Early-bird ticket',
category=self.category, default_price=23,
@@ -1290,3 +1290,214 @@ class OrdersTest(BaseOrdersTest):
self.order.secret, a.pk, match.group(1))
)
assert response.status_code == 404
def test_change_not_allowed(self):
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 302
def test_change_variation_paid(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_red,
price=Decimal("14"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_blue.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
self.assertRedirects(response,
'/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret),
target_status_code=200)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_blue
assert shirt_pos.price == Decimal('12.00')
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_PENDING
assert self.order.total == Decimal('35.00')
def test_change_variation_require_higher_price(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'gt'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_red,
price=Decimal("14"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_blue.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
assert response.status_code == 200
assert 'alert-danger' in response.rendered_content
shirt_pos.variation = self.shirt_blue
shirt_pos.price = Decimal('12.00')
shirt_pos.save()
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_red.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
},
follow=True
)
self.assertRedirects(response,
'/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret),
target_status_code=200)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_PENDING
assert self.order.total == Decimal('37.00')
def test_change_variation_require_equal_price(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'eq'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_red.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
assert response.status_code == 200
assert 'alert-danger' in response.rendered_content
def test_change_variation_require_same_product(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.ticket.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
assert response.status_code == 200
assert 'alert-danger' in response.rendered_content
def test_change_variation_require_quota(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
with scopes_disabled():
q = self.event.quotas.create(name="s2", size=0)
q.items.add(self.shirt)
q.variations.add(self.shirt_red)
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_red.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
assert response.status_code == 200
assert 'alert-danger' in response.rendered_content
q.variations.add(self.shirt_blue)
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_red.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
self.assertRedirects(response,
'/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret),
target_status_code=200)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
def test_change_paid_to_pending(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.order.status = Order.STATUS_PAID
self.order.save()
with scopes_disabled():
self.order.payments.create(provider="manual", amount=Decimal('35.00'), state=OrderPayment.PAYMENT_STATE_CONFIRMED)
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{
f'op-{shirt_pos.pk}-itemvar': f'{self.shirt.pk}-{self.shirt_red.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
},
follow=True
)
self.assertRedirects(response,
'/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret),
target_status_code=200)
assert 'The order has been changed. You can now proceed by paying the open amount of €2.00.' in response.rendered_content
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_PENDING
assert self.order.pending_sum == Decimal('2.00')