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

Use "cancel" method instead of "refund" for free orders (#743)

Browse Source 
* Use "cancel" method instead of "refund" for free orders

* Adjust API
This commit is contained in:
Raphael Michel
2018-01-15 21:46:16 +01:00
committed by GitHub
parent db24bd4d78
commit f8cc332ed7
8 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/base/models/orders.py
View File

@@ -213,6 +213,12 @@ class Order(LoggedModel):
def net_total(self):
return self.total - self.tax_total
def cancel_allowed(self):
return (
self.status == Order.STATUS_PENDING
or (self.status == Order.STATUS_PAID and self.total == Decimal('0.00'))
)
@staticmethod
def normalize_code(code):
tr = str.maketrans({
@@ -272,7 +278,7 @@ class Order(LoggedModel):
"""
positions = self.positions.all().select_related('item')
cancelable = all([op.item.allow_cancel for op in positions])
return self.event.settings.cancel_allow_user and cancelable
return self.cancel_allowed() and self.event.settings.cancel_allow_user and cancelable
@property
def is_expired_by_time(self):