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

Refator payment provider, deal with cancellations

Browse Source
This commit is contained in:
Raphael Michel
2019-09-19 10:06:26 +02:00
parent 4aeada0bfb
commit e099fad0ca
2 changed files with 0 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1627,7 +1627,6 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
order.total = (order.positions.aggregate(sum=Sum('price'))['sum'] or 0) + (order.fees.aggregate(sum=Sum('value'))['sum'] or 0) order.total = (order.positions.aggregate(sum=Sum('price'))['sum'] or 0) + (order.fees.aggregate(sum=Sum('value'))['sum'] or 0)
order.save(update_fields=['total']) order.save(update_fields=['total'])
<<<<<<< HEAD
if not new_payment: if not new_payment:
new_payment = order.payments.create( new_payment = order.payments.create(
@@ -1655,8 +1654,6 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
generate_invoice(order) generate_invoice(order)
return old_fee, new_fee, fee, new_payment return old_fee, new_fee, fee, new_payment
=======
return old_fee, new_fee, fee
@receiver(order_paid, dispatch_uid="pretixbase_order_paid_giftcards") @receiver(order_paid, dispatch_uid="pretixbase_order_paid_giftcards")
@@ -1668,4 +1665,3 @@ def signal_listener_issue_giftcards(sender: Event, order: Order, **kwargs):
currency=sender.currency, issued_in=p currency=sender.currency, issued_in=p
) )
gc.transactions.create(value=p.price, order=order) gc.transactions.create(value=p.price, order=order)
>>>>>>> 1c09d226e... Actually issue giftcards

1667
src/pretix/base/services/orders.py___jb_tmp___
View File

File diff suppressed because it is too large Load Diff