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

Marking orders as paid now ignores waiting list

Browse Source
This commit is contained in:
Raphael Michel
2017-10-24 12:45:24 +02:00
parent c33fc7630e
commit cb6f6247fd
6 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,7 +314,7 @@ class Order(LoggedModel):
), tz)
return term_last
def _can_be_paid(self) -> Union[bool, str]:
def _can_be_paid(self, count_waitinglist=True) -> Union[bool, str]:
error_messages = {
'late_lastdate': _("The payment can not be accepted as the last date of payments configured in the "
"payment settings is over."),
@@ -331,7 +331,7 @@ class Order(LoggedModel):
if not self.event.settings.get('payment_term_accept_late'):
return error_messages['late']
return self._is_still_available()
return self._is_still_available(count_waitinglist=count_waitinglist)
def _is_still_available(self, now_dt: datetime=None, count_waitinglist=True) -> Union[bool, str]:
error_messages = {

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

@@ -75,7 +75,8 @@ logger = logging.getLogger(__name__)
def mark_order_paid(order: Order, provider: str=None, info: str=None, date: datetime=None, manual: bool=None,
force: bool=False, send_mail: bool=True, user: User=None, mail_text='') -> Order:
force: bool=False, send_mail: bool=True, user: User=None, mail_text='',
count_waitinglist=True) -> Order:
"""
Marks an order as paid. This sets the payment provider, info and date and returns
the order object.
@@ -101,7 +102,7 @@ def mark_order_paid(order: Order, provider: str=None, info: str=None, date: date
return order
with order.event.lock() as now_dt:
can_be_paid = order._can_be_paid()
can_be_paid = order._can_be_paid(count_waitinglist=count_waitinglist)
if not force and can_be_paid is not True:
raise Quota.QuotaExceededException(can_be_paid)
order.payment_provider = provider or order.payment_provider
@@ -756,7 +757,7 @@ class OrderChangeManager:
def _check_paid_to_free(self):
if self.order.total == 0:
try:
mark_order_paid(self.order, 'free', send_mail=False)
mark_order_paid(self.order, 'free', send_mail=False, count_waitinglist=False)
except Quota.QuotaExceededException:
raise OrderError(self.error_messages['paid_to_free_exceeded'])