CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-09-14 16:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into self-service-storno

Browse Source
This commit is contained in:
Lukas Bockstaller
2026-08-31 15:09:47 +02:00
parent 622858314a e6572344ca
commit f5ad09233c
105 changed files with 20860 additions and 7265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/base/services/orders.py
+12 -7
View File
@@ -3474,7 +3474,7 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
}
)
new_invoice_created = False
new_invoice = None
if recreate_invoices:
# Lock to prevent duplicate invoice creation
order = Order.objects.select_for_update(of=OF_SELF).get(pk=order.pk)
@@ -3485,13 +3485,16 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
if has_active_invoice and order.total != oldtotal:
try:
generate_cancellation(i)
generate_invoice(order)
new_invoice = generate_invoice(order)
except Exception as e:
logger.exception("Could not generate invoice.")
order.log_action("pretix.event.order.invoice.failed", data={
"exception": str(e)
})
new_invoice_created = True
else:
order.log_action('pretix.event.order.invoice.generated', data={
'invoice': new_invoice.pk
})
elif (not has_active_invoice or order.invoice_dirty) and invoice_qualified(order):
if order.event.settings.get('invoice_generate') == 'True' or (
@@ -3501,10 +3504,9 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
try:
if has_active_invoice:
generate_cancellation(i)
i = generate_invoice(order)
new_invoice_created = True
new_invoice = generate_invoice(order)
order.log_action('pretix.event.order.invoice.generated', data={
'invoice': i.pk
'invoice': new_invoice.pk
})
except Exception as e:
logger.exception("Could not generate invoice.")
@@ -3512,8 +3514,11 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
"exception": str(e)
})
if new_invoice and invoice_transmission_separately(new_invoice):
transmit_invoice.apply_async(args=(order.event_id, new_invoice.pk, False))
order.create_transactions()
return old_fee, new_fee, fee, new_payment, new_invoice_created
return old_fee, new_fee, fee, new_payment, bool(new_invoice)
@receiver(order_paid, dispatch_uid="pretixbase_order_paid_giftcards")