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

Fix handling of cancellation requests with free and unpaid orders

Browse Source
This commit is contained in:
Raphael Michel
2021-06-22 09:41:18 +02:00
parent eaf663794e
commit d6849c45fe
3 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/templates/pretixpresale/event/order.html
+8 -8
View File
@@ -112,15 +112,15 @@
</div>
{% endif %}
{% eventsignal event "pretix.presale.signals.order_info_top" order=order request=request %}
{% if order.cancellation_requests.exists %}
<div class="alert alert-info">
{% blocktrans trimmed %}
We've received your request to cancel this order. Please stay patient while the event organizer
decides on the cancellation.
{% endblocktrans %}
</div>
{% endif %}
{% if order.status == "p" or order.status == "c" %}
{% if order.cancellation_requests.exists %}
<div class="alert alert-info">
{% blocktrans trimmed %}
We've received your request to cancel this order. Please stay patient while the event organizer
decides on the cancellation.
{% endblocktrans %}
</div>
{% endif %}
{% if refunds %}
<div class="panel panel-primary">
<div class="panel-heading">
src/pretix/presale/views/order.py
+6 -2
View File
@@ -872,8 +872,12 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
messages.error(request, _('You cannot cancel this order.'))
return redirect(self.get_order_url())
fee = None
require_approval = False
auto_refund = not self.request.event.settings.cancel_allow_user_paid_require_approval
if self.order.status == Order.STATUS_PAID and self.order.total != Decimal('0.00'):
require_approval = self.request.event.settings.cancel_allow_user_paid_require_approval
fee = self.order.user_cancel_fee
auto_refund = True
if 'cancel_fee' in request.POST and self.request.event.settings.cancel_allow_user_paid_adjust_fees:
fee = fee or Decimal('0.00')
fee_in = re.sub('[^0-9.,]', '', request.POST.get('cancel_fee'))
@@ -901,7 +905,7 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
self.request.POST.get('giftcard') == 'true'
)
)
if self.request.event.settings.cancel_allow_user_paid_require_approval:
if require_approval:
self.order.cancellation_requests.create(
cancellation_fee=fee or Decimal('0.00'),
refund_as_giftcard=giftcard,
@@ -910,7 +914,7 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
return self.success(None)
else:
comment = gettext('Canceled by customer')
return self.do(self.order.pk, cancellation_fee=fee, try_auto_refund=True, refund_as_giftcard=giftcard,
return self.do(self.order.pk, cancellation_fee=fee, try_auto_refund=auto_refund, refund_as_giftcard=giftcard,
comment=comment)
def get_context_data(self, **kwargs):
src/tests/presale/test_orders.py
+51
View File
@@ -460,6 +460,57 @@ class OrdersTest(BaseOrdersTest):
r = self.order.cancellation_requests.get()
assert r.cancellation_fee == Decimal('3.00')
def test_orders_cancel_unpaid_no_request(self):
self.order.status = Order.STATUS_PENDING
self.order.save()
with scopes_disabled():
self.order.payments.create(provider='testdummy_partialrefund', amount=self.order.total, state=OrderPayment.PAYMENT_STATE_CONFIRMED)
self.event.settings.cancel_allow_user_paid = True
self.event.settings.cancel_allow_user_paid_keep = Decimal('3.00')
self.event.settings.cancel_allow_user_paid_require_approval = True
response = self.client.get(
'/%s/%s/order/%s/%s/cancel' % (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/cancel/do' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
}, 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)
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_CANCELED
with scopes_disabled():
assert not self.order.refunds.exists()
assert not self.order.cancellation_requests.exists()
def test_orders_cancel_free_no_request(self):
self.order.status = Order.STATUS_PAID
self.order.total = Decimal('0.00')
self.order.save()
with scopes_disabled():
self.order.payments.create(provider='testdummy_partialrefund', amount=self.order.total, state=OrderPayment.PAYMENT_STATE_CONFIRMED)
self.event.settings.cancel_allow_user_paid = True
self.event.settings.cancel_allow_user_paid_keep = Decimal('3.00')
self.event.settings.cancel_allow_user_paid_require_approval = True
response = self.client.get(
'/%s/%s/order/%s/%s/cancel' % (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/cancel/do' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
}, 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)
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_CANCELED
with scopes_disabled():
assert not self.order.refunds.exists()
assert not self.order.cancellation_requests.exists()
def test_orders_cancel_paid_fee_autorefund_gift_card_optional(self):
self.order.status = Order.STATUS_PAID
self.order.save()