Merge branch 'enext' into 1079_unify_event_page

Author: mariobehling

app/Dockerfile.prod

@@ -62,7 +62,7 @@ RUN mkdir $APP_HOME/static
 WORKDIR $APP_HOME
 
 # install dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends netcat-traditional nodejs
+RUN apt-get update && apt-get install -y --no-install-recommends netcat-traditional nodejs gettext
 
 # copy entrypoint.prod.sh
 COPY ./entrypoint.prod.sh .

app/entrypoint.prod.sh

@@ -8,6 +8,8 @@ done
 
 echo "PostgreSQL started"
 
+echo "============== compiling translation messages ================"
+python manage.py compilemessages
 echo "============== running collectstatic ================"
 python manage.py collectstatic --noinput
 echo "============== running compress ====================="

app/eventyay/api/serializers/waitinglist.py

@@ -15,7 +15,7 @@ class Meta:
             'email',
             'phone',
             'voucher',
-            'item',
+            'product',
             'variation',
             'locale',
             'subevent',
@@ -32,19 +32,19 @@ def validate(self, data):
 
         WaitingListEntry.clean_duplicate(
             full_data.get('email'),
-            full_data.get('item'),
+            full_data.get('product'),
             full_data.get('variation'),
             full_data.get('subevent'),
             self.instance.pk if self.instance else None,
         )
-        WaitingListEntry.clean_itemvar(event, full_data.get('item'), full_data.get('variation'))
+        WaitingListEntry.clean_productvar(event, full_data.get('product'), full_data.get('variation'))
         WaitingListEntry.clean_subevent(event, full_data.get('subevent'))
 
-        if 'item' in data or 'variation' in data:
+        if 'product' in data or 'variation' in data:
             availability = (
                 full_data.get('variation').check_quotas(count_waitinglist=True, subevent=full_data.get('subevent'))
                 if full_data.get('variation')
-                else full_data.get('item').check_quotas(count_waitinglist=True, subevent=full_data.get('subevent'))
+                else full_data.get('product').check_quotas(count_waitinglist=True, subevent=full_data.get('subevent'))
             )
             if availability[0] == 100:
                 raise ValidationError('This product is currently available.')

app/eventyay/base/models/__init__.py

@@ -161,13 +161,13 @@
     "InvoiceAddress",
     "InvoiceLine",
     "InvoiceVoucher",
-    "Item",
-    "ItemAddOn",
-    "ItemBundle",
-    "ItemCategory",
-    "ItemMetaProperty",
-    "ItemMetaValue",
-    "ItemVariation",
+    "Product",
+    "ProductAddOn",
+    "ProductBundle",
+    "ProductCategory",
+    "ProductMetaProperty",
+    "ProductMetaValue",
+    "ProductVariation",
     "JanusServer",
     "LogEntry",
     "LogMixin",
@@ -220,8 +220,8 @@
     "SpeakerProfile",
     "StreamingServer",
     "SubEvent",
-    "SubEventItem",
-    "SubEventItemVariation",
+    "SubEventProduct",
+    "SubEventProductVariation",
     "SubEventMetaValue",
     "Submission",
     "SubmissionComment",

app/eventyay/base/models/product.py

@@ -170,7 +170,7 @@ def save(self, *args, **kwargs):
 
 def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     q = (
-        # IMPORTANT: If this is updated, also update the ItemVariation query
+        # IMPORTANT: If this is updated, also update the ProductVariation query
         # in models/event.py: EventMixin.annotated()
         Q(active=True)
         & Q(Q(available_from__isnull=True) | Q(available_from__lte=now()))

app/eventyay/base/pdf.py

@@ -76,11 +76,11 @@
             },
         ),
         (
-            'item',
+            'product',
             {
                 'label': _('Product name'),
                 'editor_sample': _('Sample product'),
-                'evaluate': lambda orderposition, order, event: str(orderposition.item.name),
+                'evaluate': lambda orderposition, order, event: str(orderposition.product.name),
             },
         ),
         (
@@ -92,44 +92,44 @@
             },
         ),
         (
-            'item_description',
+            'product_description',
             {
                 'label': _('Product description'),
                 'editor_sample': _('Sample product description'),
-                'evaluate': lambda orderposition, order, event: str(orderposition.item.description),
+                'evaluate': lambda orderposition, order, event: str(orderposition.product.description),
             },
         ),
         (
-            'itemvar',
+            'productvar',
             {
                 'label': _('Product name and variation'),
                 'editor_sample': _('Sample product – sample variation'),
                 'evaluate': lambda orderposition, order, event: (
-                    '{} - {}'.format(orderposition.item.name, orderposition.variation)
+                    '{} - {}'.format(orderposition.product.name, orderposition.variation)
                     if orderposition.variation
-                    else str(orderposition.item.name)
+                    else str(orderposition.product.name)
                 ),
             },
         ),
         (
-            'itemvar_description',
+            'productvar_description',
             {
                 'label': _('Product variation description'),
                 'editor_sample': _('Sample product variation description'),
                 'evaluate': lambda orderposition, order, event: (
                     str(orderposition.variation.description)
                     if orderposition.variation
-                    else str(orderposition.item.description)
+                    else str(orderposition.product.description)
                 ),
             },
         ),
         (
-            'item_category',
+            'product_category',
             {
                 'label': _('Product category'),
                 'editor_sample': _('Ticket category'),
                 'evaluate': lambda orderposition, order, event: (
-                    str(orderposition.item.category.name) if orderposition.item.category else ''
+                    str(orderposition.product.category.name) if orderposition.product.category else ''
                 ),
             },
         ),
@@ -466,11 +466,11 @@
                 'editor_sample': _('Add-on 1\nAdd-on 2'),
                 'evaluate': lambda op, order, ev: '\n'.join(
                     [
-                        '{} - {}'.format(p.item, p.variation) if p.variation else str(p.item)
+                        '{} - {}'.format(p.product, p.variation) if p.variation else str(p.product)
                         for p in (
                             op.addons.all()
                             if 'addons' in getattr(op, '_prefetched_objects_cache', {})
-                            else op.addons.select_related('item', 'variation')
+                            else op.addons.select_related('product', 'variation')
                         )
                         if not p.canceled
                     ]
@@ -800,8 +800,8 @@ def _get_text_content(self, op: OrderPosition, order: Order, o: dict, inner=Fals
             return '(error)'
         if o['content'] == 'other':
             return o['text']
-        elif o['content'].startswith('itemmeta:'):
-            return op.item.meta_data.get(o['content'][9:]) or ''
+        elif o['content'].startswith('productmeta:'):
+            return op.product.meta_data.get(o['content'][12:]) or ''
         elif o['content'].startswith('meta:'):
             return ev.meta_data.get(o['content'][5:]) or ''
         elif o['content'] in self.variables:

app/eventyay/control/templates/pretixcontrol/base.html

@@ -91,17 +91,14 @@
             data-payment-weekdays-disabled="{{ js_payment_weekdays_disabled }}"
             {% if request.organizer %}data-organizer="{{ request.organizer.slug }}"{% endif %}
             {% if request.event %}data-event="{{ request.event.slug }}"{% endif %}
-            data-select2-locale="{{ select2locale }}" data-longdateformat="{{ js_long_date_format }}" class="nojs">
+            data-select2-locale="{{ select2locale }}" data-longdateformat="{{ js_long_date_format }}" class="nojs sidebar-minimized">
         <div id="wrapper">
             <nav class="navbar navbar-inverse navbar-static-top" role="navigation">
+                <button type="button" class="navbar-toggle-sidebar navbar-toggle" id="sidebar-toggle" data-toggle="sidebar">
+                    <span class="sr-only">{% trans "Toggle sidebar" %}</span>
+                    <i class="fa fa-bars fa-lg"></i>
+                </button>
                 <div class="navbar-header">
-                    <button type="button" class="navbar-toggle"
-                            data-toggle="collapse" data-target=".navbar-nav-collapse">
-                        <span class="sr-only">{% trans "Toggle navigation" %}</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
                     {% if request.event %}
                         {% if has_domain and not request.event.live %}
                             <form action="{% eventurl request.event "presale:event.auth" %}" method="post"

app/eventyay/control/templates/pretixcontrol/item/delete.html

@@ -7,7 +7,7 @@ <h1>{% trans "Delete product" %}</h1>
 	{% if not possible and not item.active %}
 		<p>{% blocktrans %}You cannot delete the product <strong>{{ item }}</strong> because it already has been ordered.{% endblocktrans %}</p>
         <div class="form-group submit-group">
-            <a href="{% url "control:event.items" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+            <a href="{% url "control:event.products" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
                 {% trans "Cancel" %}
             </a>
             <div class="clearfix"></div>
@@ -24,17 +24,17 @@ <h1>{% trans "Delete product" %}</h1>
                             {% plural %}
                             That will cause {{ count }} voucher to be unusable.
                         {% endblocktrans %}
-                        <a href="{% url "control:event.vouchers" organizer=request.organizer.slug event=request.event.slug %}?itemvar={{ item.pk }}"
+                        <a href="{% url "control:event.vouchers" organizer=request.organizer.slug event=request.event.slug %}?productvar={{ product.pk }}"
                            class="btn btn-default">
                             {% trans "Show affected vouchers" %}
                         </a>
                     </div>
                 {% endif %}
             {% else %}
-                <p>{% blocktrans %}You cannot delete the product <strong>{{ item }}</strong> because it already has been ordered, but you can deactivate it.{% endblocktrans %}</p>
+                <p>{% blocktrans %}You cannot delete the product <strong>{{ product }}</strong> because it already has been ordered, but you can deactivate it.{% endblocktrans %}</p>
             {% endif %}
             <div class="form-group submit-group">
-                <a href="{% url "control:event.items" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+                <a href="{% url "control:event.products" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
                     {% trans "Cancel" %}
                 </a>
                 <button type="submit" class="btn btn-delete btn-danger btn-save">

app/eventyay/control/templates/pretixcontrol/items/quota_delete.html

@@ -26,7 +26,7 @@ <h1>{% trans "Delete quota" %}</h1>
                     {% plural %}
                     That will cause {{ count }} voucher to be unusable.
                 {% endblocktrans %}
-                <a href="{% url "control:event.vouchers" organizer=request.organizer.slug event=request.event.slug %}?itemvar=q-{{ quota.pk }}"
+                <a href="{% url "control:event.vouchers" organizer=request.organizer.slug event=request.event.slug %}?productvar=q-{{ quota.pk }}"
                    class="btn btn-default">
                     {% trans "Show affected vouchers" %}
                 </a>

app/eventyay/control/templates/pretixcontrol/order/change.html

@@ -136,7 +136,7 @@ <h3 class="panel-title">
                                 {% endif %}
                             </div>
                             <div class="col-sm-4">
-                                {% bootstrap_field position.form.itemvar layout='inline' %}
+                                {% bootstrap_field position.form.productvar layout='inline' %}
                             </div>
                         </div>
 
@@ -224,7 +224,7 @@ <h3 class="panel-title">
                                         {{ add_form.custom_error }}
                                     </div>
                                 {% endif %}
-                                {% bootstrap_field add_form.itemvar layout="control" %}
+                                {% bootstrap_field add_form.productvar layout="control" %}
                                 {% bootstrap_field add_form.price addon_after=request.event.currency layout="control" %}
                                 {% if add_form.addon_to %}
                                     {% bootstrap_field add_form.addon_to layout="control" %}
@@ -256,7 +256,7 @@ <h3 class="panel-title">
                         </div>
                         <div class="panel-body">
                             <div class="form-horizontal">
-                                {% bootstrap_field add_formset.empty_form.itemvar layout="control" %}
+                                {% bootstrap_field add_formset.empty_form.productvar layout="control" %}
                                 {% bootstrap_field add_formset.empty_form.price addon_after=request.event.currency layout="control" %}
                                 {% if add_formset.empty_form.addon_to %}
                                     {% bootstrap_field add_formset.empty_form.addon_to layout="control" %}