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

Merge remote-tracking branch 'remotes/flaviabastos/187_unify_canceled_spelling'

Browse Source
This commit is contained in:
Raphael Michel
2016-09-21 18:57:35 +02:00
parent 1faf33d61f 8ef6439c44
commit 84fd7cb166
26 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/models/invoices.py
View File

@@ -29,7 +29,7 @@ class Invoice(models.Model):
:type invoice_no: int
:param is_cancellation: Whether or not this is a cancellation instead of an invoice
:type is_cancellation: bool
:param refers: A link to another invoice this invoice refers to, e.g. the cancelled invoice in a cancellation
:param refers: A link to another invoice this invoice refers to, e.g. the canceled invoice in a cancellation
:type refers: Invoice
:param invoice_from: The sender address
:type invoice_from: str

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

@@ -107,7 +107,7 @@ class Item(LoggedModel):
:type require_voucher: bool
:param hide_without_voucher: If set to ``True``, this item is only visible and available when a voucher is used.
:type hide_without_voucher: bool
:param allow_cancel: If set to ``False``, an order with this product can not be cancelled by the user.
:param allow_cancel: If set to ``False``, an order with this product can not be canceled by the user.
:type allow_cancel: bool
"""
@@ -192,10 +192,10 @@ class Item(LoggedModel):
'code that is specifically tied to this product (and not via a quota).')
)
allow_cancel = models.BooleanField(
verbose_name=_('Allow product to be cancelled'),
verbose_name=_('Allow product to be canceled'),
default=True,
help_text=_('If you deactivate this, an order including this product might not be cancelled by the user. '
'It may still be cancelled by you.')
help_text=_('If you deactivate this, an order including this product might not be canceled by the user. '
'It may still be canceled by you.')
)
class Meta:

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

@@ -30,7 +30,7 @@ class Order(LoggedModel):
An order is created when a user clicks 'buy' on his cart. It holds
several OrderPositions and is connected to a user. It has an
expiration date: If items run out of capacity, orders which are over
their expiration date might be cancelled.
their expiration date might be canceled.
An order -- like all objects -- has an ID, which is globally unique,
but also a code, which is shorter and easier to memorize, but only
@@ -45,7 +45,7 @@ class Order(LoggedModel):
* ``STATUS_PENDING``
* ``STATUS_PAID``
* ``STATUS_EXPIRED``
* ``STATUS_CANCELLED``
* ``STATUS_CANCELED``
* ``STATUS_REFUNDED``
:param event: The event this order belongs to
@@ -81,13 +81,13 @@ class Order(LoggedModel):
STATUS_PENDING = "n"
STATUS_PAID = "p"
STATUS_EXPIRED = "e"
STATUS_CANCELLED = "c"
STATUS_CANCELED = "c"
STATUS_REFUNDED = "r"
STATUS_CHOICE = (
(STATUS_PENDING, _("pending")),
(STATUS_PAID, _("paid")),
(STATUS_EXPIRED, _("expired")),
(STATUS_CANCELLED, _("cancelled")),
(STATUS_CANCELED, _("canceled")),
(STATUS_REFUNDED, _("refunded"))
)