Fix #473 -- Internal name for categories and products (#900)

* Fix #473 -- Internal name for categories and products

* fix pdf renderer

src/pretix/base/exporters/json.py

@@ -24,13 +24,15 @@ class JSONExporter(BaseExporter):
                 'categories': [
                     {
                         'id': category.id,
-                        'name': str(category.name)
+                        'name': str(category.name),
+                        'internal_name': category.internal_name
                     } for category in self.event.categories.all()
                 ],
                 'items': [
                     {
                         'id': item.id,
                         'name': str(item.name),
+                        'internal_name': str(item.internal_name),
                         'category': item.category_id,
                         'price': item.default_price,
                         'tax_rate': item.tax_rule.rate if item.tax_rule else Decimal('0.00'),

src/pretix/base/migrations/0090_auto_20180509_0917.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-05-09 09:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0089_auto_20180315_1322'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='item',
+            name='internal_name',
+            field=models.CharField(blank=True,
+                                   help_text='If you set this, this will be used instead of the public name in the '
+                                             'backend.',
+                                   max_length=255, null=True, verbose_name='Internal name'),
+        ),
+        migrations.AddField(
+            model_name='itemcategory',
+            name='internal_name',
+            field=models.CharField(blank=True,
+                                   help_text='If you set this, this will be used instead of the public name in the backend.',
+                                   max_length=255, null=True, verbose_name='Internal name'),
+        ),
+    ]

src/pretix/base/models/items.py

@@ -43,6 +43,11 @@ class ItemCategory(LoggedModel):
         max_length=255,
         verbose_name=_("Category name"),
     )
+    internal_name = models.CharField(
+        verbose_name=_("Internal name"),
+        help_text=_("If you set this, this will be used instead of the public name in the backend."),
+        blank=True, null=True, max_length=255
+    )
     description = I18nTextField(
         blank=True, verbose_name=_("Category description")
     )
@@ -63,9 +68,10 @@ class ItemCategory(LoggedModel):
         ordering = ('position', 'id')
 
     def __str__(self):
+        name = self.internal_name or self.name
         if self.is_addon:
-            return _('{category} (Add-On products)').format(category=str(self.name))
-        return str(self.name)
+            return _('{category} (Add-On products)').format(category=str(name))
+        return str(name)
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -205,6 +211,11 @@ class Item(LoggedModel):
         max_length=255,
         verbose_name=_("Item name"),
     )
+    internal_name = models.CharField(
+        verbose_name=_("Internal name"),
+        help_text=_("If you set this, this will be used instead of the public name in the backend."),
+        blank=True, null=True, max_length=255
+    )
     active = models.BooleanField(
         default=True,
         verbose_name=_("Active"),
@@ -309,7 +320,7 @@ class Item(LoggedModel):
         ordering = ("category__position", "category", "position")
 
     def __str__(self):
-        return str(self.name)
+        return str(self.internal_name or self.name)
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)

src/pretix/base/pdf.py

@@ -46,7 +46,7 @@ DEFAULT_VARIABLES = OrderedDict((
     ("item", {
         "label": _("Product name"),
         "editor_sample": _("Sample product"),
-        "evaluate": lambda orderposition, order, event: str(orderposition.item)
+        "evaluate": lambda orderposition, order, event: str(orderposition.item.name)
     }),
     ("variation", {
         "label": _("Variation name"),
@@ -62,8 +62,8 @@ DEFAULT_VARIABLES = OrderedDict((
         "label": _("Product name and variation"),
         "editor_sample": _("Sample product – sample variation"),
         "evaluate": lambda orderposition, order, event: (
-            '{} - {}'.format(orderposition.item, orderposition.variation)
-            if orderposition.variation else str(orderposition.item)
+            '{} - {}'.format(orderposition.item.name, orderposition.variation)
+            if orderposition.variation else str(orderposition.item.name)
         )
     }),
     ("item_category", {

src/pretix/base/services/stats.py

@@ -10,10 +10,6 @@ from pretix.base.models.orders import OrderFee
 from pretix.base.signals import order_fee_type_name
 
 
-class DummyObject:
-    pass
-
-
 class Dontsum:
     def __init__(self, value: Any):
         self.value = value
@@ -158,8 +154,7 @@ def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[It
         c[0].num_paid = tuplesum(item.num_paid for item in c[1])
 
     # Payment fees
-    payment_cat_obj = DummyObject()
-    payment_cat_obj.name = _('Fees')
+    payment_cat_obj = _('Fees')
     payment_items = []
 
     if not subevent:
@@ -198,9 +193,8 @@ def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[It
         names = dict(OrderFee.FEE_TYPES)
 
         for pprov, total in sorted(num_total.items(), key=lambda i: i[0]):
-            ppobj = DummyObject()
             if pprov[0] == OrderFee.FEE_TYPE_PAYMENT:
-                ppobj.name = '{} - {}'.format(names[pprov[0]], provider_names.get(pprov[1], pprov[1]))
+                ppobj = '{} - {}'.format(names[pprov[0]], provider_names.get(pprov[1], pprov[1]))
             else:
                 name = pprov[1]
                 for r, resp in order_fee_type_name.send(sender=event, fee_type=pprov[0], internal_type=pprov[1]):
@@ -208,7 +202,7 @@ def order_overview(event: Event, subevent: SubEvent=None) -> Tuple[List[Tuple[It
                         name = resp
                         break
 
-                ppobj.name = '{} - {}'.format(names[pprov[0]], name)
+                ppobj = '{} - {}'.format(names[pprov[0]], name)
             ppobj.provider = pprov[1]
             ppobj.has_variations = False
             ppobj.num_total = total