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

Fix splitting free orders that require approval

Browse Source
This commit is contained in:
Raphael Michel
2024-03-15 11:37:27 +01:00
parent 721fd3b998
commit d9019ae735
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/services/orders.py
View File

@@ -220,7 +220,7 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
is_available = order._is_still_available(now(), count_waitinglist=False, check_voucher_usage=True,
check_memberships=True, lock=True, force=force)
if is_available is True:
if order.payment_refund_sum >= order.total:
if order.payment_refund_sum >= order.total and not order.require_approval:
order.status = Order.STATUS_PAID
else:
order.status = Order.STATUS_PENDING
@@ -2500,7 +2500,7 @@ class OrderChangeManager:
remaining_total = sum([p.price for p in self.order.positions.all()]) + sum([f.value for f in self.order.fees.all()])
offset_amount = min(max(0, self.completed_payment_sum - remaining_total), split_order.total)
if offset_amount >= split_order.total:
if offset_amount >= split_order.total and not split_order.require_approval:
split_order.status = Order.STATUS_PAID
else:
split_order.status = Order.STATUS_PENDING