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

Correcly cancel payments when starting a new one

Browse Source
This commit is contained in:
Raphael Michel
2019-03-26 09:41:03 +01:00
parent 45af18a23d
commit d4795868d6
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1470,7 +1470,7 @@ def cancel_order(self, order: int, user: int=None, send_mail: bool=True, api_tok
raise OrderError(error_messages['busy'])
def change_payment_provider(order: Order, payment_provider, amount=None):
def change_payment_provider(order: Order, payment_provider, amount=None, new_payment=None):
e = OrderPayment.objects.filter(fee=OuterRef('pk'), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED,
OrderPayment.PAYMENT_STATE_REFUNDED))
open_fees = list(
@@ -1502,7 +1502,10 @@ def change_payment_provider(order: Order, payment_provider, amount=None):
fee = None
open_payment = None
lp = order.payments.exclude(provider=payment_provider.identifier).last()
if new_payment:
lp = order.payments.exclude(pk=new_payment.pk).last()
else:
lp = order.payments.last()
if lp and lp.state not in (OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED):
open_payment = lp

2
src/pretix/plugins/banktransfer/tasks.py
View File

@@ -109,7 +109,7 @@ def _handle_transaction(trans: BankTransaction, code: str, event: Event=None, or
if created:
# We're perform a payment method switchign on-demand here
old_fee, new_fee, fee = change_payment_provider(trans.order, p.payment_provider, p.amount) # noqa
old_fee, new_fee, fee = change_payment_provider(trans.order, p.payment_provider, p.amount, new_payment=p) # noqa
if fee:
p.fee = fee
p.save(update_fields=['fee'])