Merge pull request #178 from rixx/order_fixes

Add comment field to Orders
This commit is contained in:
Raphael Michel
2016-08-13 21:01:05 +02:00
committed by GitHub
9 changed files with 84 additions and 1 deletions

View File

@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.8 on 2016-08-12 08:21
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('pretixbase', '0025_auto_20160802_2202'),
]
operations = [
migrations.AddField(
model_name='order',
name='comment',
field=models.TextField(blank=True, help_text='The text entered in this field will not be visible to the user and is available for your convenience.', verbose_name='Comment'),
),
]

View File

@@ -74,6 +74,8 @@ class Order(LoggedModel):
:type payment_info: str
:param total: The total amount of the order, including the payment fee
:type total: decimal.Decimal
:param comment: An internal comment that will only be visible to staff, and never displayed to the user
:type comment: str
"""
STATUS_PENDING = "n"
@@ -153,6 +155,11 @@ class Order(LoggedModel):
decimal_places=2, max_digits=10,
verbose_name=_("Total amount")
)
comment = models.TextField(
blank=True, verbose_name=_("Comment"),
help_text=_("The text entered in this field will not be visible to the user and is available for your "
"convenience.")
)
class Meta:
verbose_name = _("Order")

View File

@@ -43,6 +43,8 @@ class Voucher(LoggedModel):
:type variation: ItemVariation
:param quota: If set, the quota to choose an item from
:type quota: Quota
:param comment: An internal comment that will only be visible to staff, and never displayed to the user
:type comment: str
Various constraints apply: