Only display tax rates with non-zero gross amount

doc/api/resources/items.rst

@@ -69,10 +69,6 @@ hidden_if_available                     integer                    **DEPRECATED*
 hidden_if_item_available                integer                    The internal ID of a different item, or ``null``. If
                                                                    set, this item won't be shown publicly as long as this
                                                                    other item is available.
-hidden_if_item_available_mode           string                     If ``hide`` (the default), this item is hidden in the shop
-                                                                   if unavailable due to the ``hidden_if_item_available`` setting.
-                                                                   If ``info``, the item is visible, but can't be purchased,
-                                                                   and a note explaining the unavailability is displayed.
 require_voucher                         boolean                    If ``true``, this item can only be bought using a
                                                                    voucher that is specifically assigned to this item.
 hide_without_voucher                    boolean                    If ``true``, this item is only shown during the voucher
@@ -243,10 +239,6 @@ meta_data                               object                     Values set fo
    The ``hidden_if_item_available`` attributes has been added, the ``hidden_if_available`` attribute has been
    deprecated.
 
-.. versionchanged:: 2025.01
-
-   The ``hidden_if_item_available_mode`` attributes has been added.
-
 Notes
 -----
 
@@ -316,7 +308,6 @@ Endpoints
             "available_until_mode": "hide",
             "hidden_if_available": null,
             "hidden_if_item_available": null,
-            "hidden_if_item_available_mode": "hide",
             "require_voucher": false,
             "hide_without_voucher": false,
             "allow_cancel": true,
@@ -468,7 +459,6 @@ Endpoints
         "available_until_mode": "hide",
         "hidden_if_available": null,
         "hidden_if_item_available": null,
-        "hidden_if_item_available_mode": "hide",
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
@@ -599,7 +589,6 @@ Endpoints
         "available_until_mode": "hide",
         "hidden_if_available": null,
         "hidden_if_item_available": null,
-        "hidden_if_item_available_mode": "hide",
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
@@ -716,7 +705,6 @@ Endpoints
         "available_until_mode": "hide",
         "hidden_if_available": null,
         "hidden_if_item_available": null,
-        "hidden_if_item_available_mode": "hide",
         "require_voucher": false,
         "hide_without_voucher": false,
         "allow_cancel": true,
@@ -867,7 +855,6 @@ Endpoints
         "available_until_mode": "hide",
         "hidden_if_available": null,
         "hidden_if_item_available": null,
-        "hidden_if_item_available_mode": "hide",
         "require_voucher": false,
         "hide_without_voucher": false,
         "generate_tickets": null,

pyproject.toml

@@ -100,7 +100,7 @@ dependencies = [
   "ua-parser==1.0.*",
   "vat_moss_forked==2020.3.20.0.11.0",
   "vobject==0.9.*",
-  "webauthn==2.5.*",
+  "webauthn==2.4.*",
   "zeep==4.3.*"
 ]
 

src/pretix/_base_settings.py

@@ -163,12 +163,6 @@ EXTRA_LANG_INFO = {
         'name': 'Portuguese',
         'name_local': 'Português',
     },
-    'nb-no': {
-        'bidi': False,
-        'code': 'nb-no',
-        'name': 'Norwegian Bokmal',
-        'name_local': 'norsk (bokmål)',
-    },
 }
 
 django.conf.locale.LANG_INFO.update(EXTRA_LANG_INFO)

src/pretix/api/serializers/item.py

@@ -272,7 +272,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
                   'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
                   'min_per_order', 'max_per_order', 'checkin_attention', 'checkin_text', 'has_variations', 'variations',
                   'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
-                  'show_quota_left', 'hidden_if_available', 'hidden_if_item_available', 'hidden_if_item_available_mode', 'allow_waitinglist',
+                  'show_quota_left', 'hidden_if_available', 'hidden_if_item_available', 'allow_waitinglist',
                   'issue_giftcard', 'meta_data',
                   'require_membership', 'require_membership_types', 'require_membership_hidden', 'grant_membership_type',
                   'grant_membership_duration_like_event', 'grant_membership_duration_days',

src/pretix/base/invoice.py

@@ -388,15 +388,6 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             except:
                 logger.exception("Can not resize image")
                 pass
-            try:
-                # Valid ZUGFeRD invoices must be compliant with PDF/A-3. pretix-zugferd ensures this by passing them
-                # through ghost script. Unfortunately, if the logo contains transparency, this will still fail.
-                # I was unable to figure out a way to fix this in GhostScript, so the easy fix is to remove the
-                # transparency, as our invoices always have a white background anyways.
-                ir.remove_transparency()
-            except:
-                logger.exception("Can not remove transparency from logo")
-                pass
             canvas.drawImage(ir,
                              self.logo_left,
                              self.pagesize[1] - self.logo_height - self.logo_top,

src/pretix/base/migrations/0276_item_hidden_if_item_available_mode.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-23 11:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0275_alter_question_valid_number_max_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="item",
-            name="hidden_if_item_available_mode",
-            field=models.CharField(default="hide", max_length=16),
-        ),
-    ]

src/pretix/base/models/items.py

@@ -442,12 +442,8 @@ class Item(LoggedModel):
     UNAVAIL_MODE_INFO = "info"
     UNAVAIL_MODES = (
         (UNAVAIL_MODE_HIDDEN, _("Hide product if unavailable")),
-        (UNAVAIL_MODE_INFO, _("Show product with info on why it’s unavailable")),
+        (UNAVAIL_MODE_INFO, _("Show info text if unavailable")),
     )
-    UNAVAIL_MODE_ICONS = {
-        UNAVAIL_MODE_HIDDEN: 'eye-slash',
-        UNAVAIL_MODE_INFO: 'info'
-    }
 
     MEDIA_POLICY_REUSE = 'reuse'
     MEDIA_POLICY_NEW = 'new'
@@ -600,11 +596,6 @@ class Item(LoggedModel):
                     "be a short period in which both products are visible while all tickets of the referenced "
                     "product are reserved, but not yet sold.")
     )
-    hidden_if_item_available_mode = models.CharField(
-        choices=UNAVAIL_MODES,
-        default=UNAVAIL_MODE_HIDDEN,
-        max_length=16,
-    )
     require_voucher = models.BooleanField(
         verbose_name=_('This product can only be bought using a voucher.'),
         default=False,
@@ -894,8 +885,6 @@ class Item(LoggedModel):
             return 'available_from'
         elif subevent_item and subevent_item.available_until and subevent_item.available_until < now_dt:
             return 'available_until'
-        elif self.hidden_if_item_available and self._dependency_available:
-            return 'hidden_if_item_available'
         else:
             return None
 

src/pretix/base/models/orders.py

@@ -2281,9 +2281,9 @@ class OrderFee(models.Model):
     FEE_TYPE_OTHER = "other"
     FEE_TYPE_GIFTCARD = "giftcard"
     FEE_TYPES = (
-        (FEE_TYPE_SERVICE, _("Service fee")),
         (FEE_TYPE_PAYMENT, _("Payment fee")),
         (FEE_TYPE_SHIPPING, _("Shipping fee")),
+        (FEE_TYPE_SERVICE, _("Service fee")),
         (FEE_TYPE_CANCELLATION, _("Cancellation fee")),
         (FEE_TYPE_INSURANCE, _("Insurance fee")),
         (FEE_TYPE_LATE, _("Late fee")),
@@ -3218,12 +3218,6 @@ class CartPosition(AbstractPosition):
             self.tax_code = line_price.code
             self.save(update_fields=['line_price_gross', 'tax_rate'])
 
-    @property
-    def discount_percentage(self):
-        if not self.line_price_gross:
-            return 0
-        return (self.line_price_gross - self.price) / self.line_price_gross * 100
-
     @property
     def addons_without_bundled(self):
         addons = [op for op in self.addons.all() if not op.is_bundled]

src/pretix/base/services/invoices.py

@@ -495,18 +495,12 @@ def build_preview_invoice_pdf(event):
                         invoice=invoice, description=_("Sample product {}").format(i + 1),
                         gross_value=tax.gross, tax_value=tax.tax,
                         tax_rate=tax.rate, tax_name=tax.name, tax_code=tax.code,
-                        event_date_from=event.date_from,
-                        event_date_to=event.date_to,
-                        event_location=event.settings.invoice_event_location,
                     )
         else:
             for i in range(5):
                 InvoiceLine.objects.create(
                     invoice=invoice, description=_("Sample product A"),
                     gross_value=100, tax_value=0, tax_rate=0, tax_code=None,
-                    event_date_from=event.date_from,
-                    event_date_to=event.date_to,
-                    event_location=event.settings.invoice_event_location,
                 )
 
         return event.invoice_renderer.generate(invoice)

src/pretix/control/forms/item.py

@@ -476,7 +476,6 @@ class ItemCreateForm(I18nModelForm):
                 'show_quota_left',
                 'hidden_if_available',
                 'hidden_if_item_available',
-                'hidden_if_item_available_mode',
                 'require_bundling',
                 'require_membership',
                 'grant_membership_type',
@@ -540,8 +539,6 @@ class ItemCreateForm(I18nModelForm):
                     v.pk = None
                     v.item = instance
                     v.save()
-                    if not variation.all_sales_channels:
-                        v.limit_sales_channels.set(variation.limit_sales_channels.all())
                     for mv in variation.meta_values.all():
                         mv.pk = None
                         mv.variation = v
@@ -647,12 +644,18 @@ class ItemUpdateForm(I18nModelForm):
 
         self.fields['available_from_mode'].widget = ButtonGroupRadioSelect(
             choices=self.fields['available_from_mode'].choices,
-            option_icons=Item.UNAVAIL_MODE_ICONS
+            option_icons={
+                Item.UNAVAIL_MODE_HIDDEN: 'eye-slash',
+                Item.UNAVAIL_MODE_INFO: 'info'
+            }
         )
 
         self.fields['available_until_mode'].widget = ButtonGroupRadioSelect(
             choices=self.fields['available_until_mode'].choices,
-            option_icons=Item.UNAVAIL_MODE_ICONS
+            option_icons={
+                Item.UNAVAIL_MODE_HIDDEN: 'eye-slash',
+                Item.UNAVAIL_MODE_INFO: 'info'
+            }
         )
 
         self.fields['hide_without_voucher'].widget = ButtonGroupRadioSelect(
@@ -667,11 +670,6 @@ class ItemUpdateForm(I18nModelForm):
             attrs={'data-checkbox-dependency': '#id_require_voucher'}
         )
 
-        self.fields['hidden_if_item_available_mode'].widget = ButtonGroupRadioSelect(
-            choices=self.fields['hidden_if_item_available_mode'].choices,
-            option_icons=Item.UNAVAIL_MODE_ICONS
-        )
-
         if self.instance.hidden_if_available_id:
             self.fields['hidden_if_available'].queryset = self.event.quotas.all()
             self.fields['hidden_if_available'].help_text = format_html(
@@ -853,7 +851,6 @@ class ItemUpdateForm(I18nModelForm):
             'show_quota_left',
             'hidden_if_available',
             'hidden_if_item_available',
-            'hidden_if_item_available_mode',
             'issue_giftcard',
             'require_membership',
             'require_membership_types',
@@ -971,12 +968,18 @@ class ItemVariationForm(I18nModelForm):
 
         self.fields['available_from_mode'].widget = ButtonGroupRadioSelect(
             choices=self.fields['available_from_mode'].choices,
-            option_icons=Item.UNAVAIL_MODE_ICONS
+            option_icons={
+                Item.UNAVAIL_MODE_HIDDEN: 'eye-slash',
+                Item.UNAVAIL_MODE_INFO: 'info'
+            }
         )
 
         self.fields['available_until_mode'].widget = ButtonGroupRadioSelect(
             choices=self.fields['available_until_mode'].choices,
-            option_icons=Item.UNAVAIL_MODE_ICONS
+            option_icons={
+                Item.UNAVAIL_MODE_HIDDEN: 'eye-slash',
+                Item.UNAVAIL_MODE_INFO: 'info'
+            }
         )
 
         self.meta_fields = []

src/pretix/control/forms/orders.py

@@ -612,13 +612,7 @@ class OrderFeeChangeForm(forms.Form):
 
 
 class OrderFeeAddForm(forms.Form):
-    fee_type = forms.ChoiceField(
-        choices=[("", ""), *OrderFee.FEE_TYPES],
-        help_text=_(
-            "Note that payment fees have a special semantic and might automatically be changed if the "
-            "payment method of the order is changed."
-        )
-    )
+    fee_type = forms.ChoiceField(choices=OrderFee.FEE_TYPES)
     value = forms.DecimalField(
         max_digits=13, decimal_places=2,
         localize=True,

src/pretix/control/templates/pretixcontrol/item/index.html

@@ -172,7 +172,7 @@
                         {% if form.hidden_if_available %}
                             {% bootstrap_field form.hidden_if_available layout="control" horizontal_field_class="col-md-7" %}
                         {% endif %}
-                        {% bootstrap_field form.hidden_if_item_available visibility_field=form.hidden_if_item_available_mode layout="control_with_visibility" %}
+                        {% bootstrap_field form.hidden_if_item_available layout="control" horizontal_field_class="col-md-7" %}
                     </fieldset>
                     {% for v in formsets.values %}
                         <fieldset>

src/pretix/control/templates/pretixcontrol/subevents/fragment_unavail_mode_indicator.html

@@ -2,5 +2,5 @@
 {% if mode == "hide" %}
 <span class="pull-right text-muted unavail-mode-indicator" data-toggle="tooltip" title="{% trans "Hide product if unavailable" %}. {% if f.variation %}{% trans "You can change this option in the variation settings." %}{% else %}{% trans "You can change this option in the product settings." %}{% endif %}"><span class="fa fa-eye-slash"></span></span>
 {% else %}
-<span class="pull-right text-muted unavail-mode-indicator" data-toggle="tooltip" title="{% trans "Show product with info on why it’s unavailable" %}. {% if f.variation %}{% trans "You can change this option in the variation settings." %}{% else %}{% trans "You can change this option in the product settings." %}{% endif %}"><span class="fa fa-info-circle"></span></span>
+<span class="pull-right text-muted unavail-mode-indicator" data-toggle="tooltip" title="{% trans "Show info text if unavailable" %}. {% if f.variation %}{% trans "You can change this option in the variation settings." %}{% else %}{% trans "You can change this option in the product settings." %}{% endif %}"><span class="fa fa-info-circle"></span></span>
 {% endif %}

src/pretix/helpers/reportlab.py

@@ -39,12 +39,6 @@ class ThumbnailingImageReader(ImageReader):
         self._data = None
         return width, height
 
-    def remove_transparency(self, background_color="WHITE"):
-        if "A" in self._image.mode:
-            new_image = Image.new("RGBA", self._image.size, background_color)
-            new_image.paste(self._image, mask=self._image)
-            self._image = new_image.convert("RGB")
-
     def _jpeg_fh(self):
         # Bypass a reportlab-internal optimization that falls back to the original
         # file handle if the file is a JPEG, and therefore does not respect the

src/pretix/locale/de/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-15 16:46+0000\n"
-"PO-Revision-Date: 2025-01-22 16:00+0000\n"
+"PO-Revision-Date: 2024-09-10 07:17+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "de/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.7\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -777,13 +777,13 @@ msgstr "Preis"
 #, javascript-format
 msgctxt "widget"
 msgid "Original price: %s"
-msgstr "Originalpreis: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format
 msgctxt "widget"
 msgid "New price: %s"
-msgstr "Neuer Preis: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:22
 msgctxt "widget"
@@ -836,7 +836,7 @@ msgstr "ab %(currency)s %(price)s"
 #, javascript-format
 msgctxt "widget"
 msgid "Image of %s"
-msgstr "Bild von %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:32
 msgctxt "widget"

src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-15 16:46+0000\n"
-"PO-Revision-Date: 2025-01-22 16:00+0000\n"
+"PO-Revision-Date: 2024-09-10 07:17+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix-js/de_Informal/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.7\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -776,13 +776,13 @@ msgstr "Preis"
 #, javascript-format
 msgctxt "widget"
 msgid "Original price: %s"
-msgstr "Originalpreis: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format
 msgctxt "widget"
 msgid "New price: %s"
-msgstr "Neuer Preis: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:22
 msgctxt "widget"
@@ -835,7 +835,7 @@ msgstr "ab %(currency)s %(price)s"
 #, javascript-format
 msgctxt "widget"
 msgid "Image of %s"
-msgstr "Bild von %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:32
 msgctxt "widget"

src/pretix/locale/djangojs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-21 16:43+0000\n"
+"POT-Creation-Date: 2025-01-15 16:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

src/pretix/locale/es/LC_MESSAGES/djangojs.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-15 16:46+0000\n"
-"PO-Revision-Date: 2025-01-21 00:00+0000\n"
-"Last-Translator: Hector <hector@demandaeventos.es>\n"
+"PO-Revision-Date: 2025-01-16 10:32+0000\n"
+"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/"
 "pretix-js/es/>\n"
 "Language: es\n"
@@ -775,7 +775,7 @@ msgstr "Precio"
 #, javascript-format
 msgctxt "widget"
 msgid "Original price: %s"
-msgstr "Precio original: %s"
+msgstr "Prix initial : %s"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format

src/pretix/locale/ja/LC_MESSAGES/djangojs.po

@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-15 16:46+0000\n"
-"PO-Revision-Date: 2025-01-18 18:00+0000\n"
+"PO-Revision-Date: 2024-12-27 11:45+0000\n"
 "Last-Translator: Hijiri Umemoto <hijiri@umemoto.org>\n"
-"Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/"
-"pretix-js/ja/>\n"
+"Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix-"
+"js/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "注釈:"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:34
 msgid "PayPal"
-msgstr "PayPal"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:35
 msgid "Venmo"
@@ -60,19 +60,19 @@ msgstr "PayPal後払い"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:41
 msgid "iDEAL"
-msgstr "iDEAL"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:42
 msgid "SEPA Direct Debit"
-msgstr "SEPA Direct Debit"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:43
 msgid "Bancontact"
-msgstr "Bancontact"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:44
 msgid "giropay"
-msgstr "giropay"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:45
 msgid "SOFORT"
@@ -88,7 +88,7 @@ msgstr "MyBank"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:48
 msgid "Przelewy24"
-msgstr "Przelewy24"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:49
 msgid "Verkkopankki"
@@ -124,7 +124,7 @@ msgstr "Boleto"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:57
 msgid "WeChat Pay"
-msgstr "WeChat Pay"
+msgstr ""
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:58
 msgid "Mercado Pago"
@@ -241,7 +241,7 @@ msgstr "確認済み"
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:47
 msgid "Approval pending"
-msgstr "承認保留中"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:48
 msgid "Redeemed"
@@ -297,12 +297,16 @@ msgid "Ticket code revoked/changed"
 msgstr "チケットコードのブロック/変更"
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:63
+#, fuzzy
+#| msgid "Ticket not paid"
 msgid "Ticket blocked"
-msgstr "チケットブロック中"
+msgstr "チケット未払い"
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:64
+#, fuzzy
+#| msgid "Ticket not paid"
 msgid "Ticket not valid at this time"
-msgstr "現時点で無効なチケット"
+msgstr "チケット未払い"
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:65
 msgid "Order canceled"
@@ -310,11 +314,11 @@ msgstr "注文がキャンセルされました"
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:66
 msgid "Ticket code is ambiguous on list"
-msgstr "リストのチケットコードは曖昧です"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:67
 msgid "Order not approved"
-msgstr "承認されない注文"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:68
 msgid "Checked-in Tickets"
@@ -451,7 +455,7 @@ msgstr "商品の種類"
 
 #: pretix/static/pretixcontrol/js/ui/checkinrules.js:107
 msgid "Gate"
-msgstr "ゲート"
+msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/checkinrules.js:111
 msgid "Current date and time"
@@ -572,8 +576,10 @@ msgid "Text object (deprecated)"
 msgstr "テキストオブジェクト (廃止済)"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:901
+#, fuzzy
+#| msgid "Text object"
 msgid "Text box"
-msgstr "テキストボックス"
+msgstr "テキストオブジェクト"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:903
 msgid "Barcode area"
@@ -764,13 +770,13 @@ msgstr "価格"
 #, javascript-format
 msgctxt "widget"
 msgid "Original price: %s"
-msgstr "元の価格: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format
 msgctxt "widget"
 msgid "New price: %s"
-msgstr "新しい価格: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:22
 msgctxt "widget"
@@ -823,7 +829,7 @@ msgstr "%(currency)s %(price)sから"
 #, javascript-format
 msgctxt "widget"
 msgid "Image of %s"
-msgstr "%sのイメージ"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:32
 msgctxt "widget"

src/pretix/presale/templates/pretixpresale/event/base.html

@@ -82,17 +82,17 @@
             {% endif %}
             {% if event_logo and event_logo_image_large %}
                 <a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}"
-                   title="{% trans 'Homepage' %}">
+                   aria-label="{% trans 'Homepage' %}" title="{% trans 'Homepage' %}">
                     <img src="{{ event_logo|thumb:'1170x5000' }}" alt="{{ event.name }}" class="event-logo" />
                 </a>
             {% elif event_logo %}
                 <a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}"
-                   title="{% trans 'Homepage' %}">
+                   aria-label="{% trans 'Homepage' %}" title="{% trans 'Homepage' %}">
                     <img src="{{ event_logo|thumb:'5000x120' }}" alt="{{ event.name }}" class="event-logo" />
                 </a>
             {% else %}
                 <h1>
-                    <a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}">{{ event.name }}</a>
+                    <a href="{% eventurl event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}" aria-label="{% trans 'Homepage' %}">{{ event.name }}</a>
                     {% if request.event.settings.show_dates_on_frontpage and not event.has_subevents %}
                         <small>{{ event.get_date_range_display_as_html }}</small>
                     {% endif %}

src/pretix/presale/templates/pretixpresale/event/fragment_availability.html

@@ -5,10 +5,6 @@
     <div class="col-md-2 col-sm-3 col-xs-6 availability-box unavailable">
         <p><small><a href="#voucher">{% trans "Enter a voucher code below to buy this product." %}</a></small></p>
     </div>
-{% elif item.current_unavailability_reason == 'hidden_if_item_available' %}
-    <div class="col-md-2 col-sm-3 col-xs-6 availability-box unavailable">
-        <p><small>{% trans "Not available yet." %}</small></p>
-    </div>
 {% elif item.current_unavailability_reason == 'available_from' or var.current_unavailability_reason == 'available_from' %}
     <div class="col-md-2 col-sm-3 col-xs-6 availability-box unavailable">
         <p><small>{% trans "Not available yet." %}</small></p>

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -268,14 +268,8 @@
                         {% if line.discount and line.line_price_gross != line.price %}
                             <span class="text-success discounted" data-toggle="tooltip" title="{% trans "The price of this product was reduced because of an automatic discount." %}">
                                 <br>
-                                <span class="fa fa-star fa-fw" aria-hidden="true"></span>
-                                {% if line.price < line.line_price_gross %}
-                                    {% blocktranslate trimmed with percent=line.discount_percentage|floatformat:0 %}
-                                        {{ percent }} % Discount
-                                    {% endblocktranslate %}
-                                {% else %}
-                                    {% trans "Discounted" %}
-                                {% endif %}
+                                <span class="fa fa-percent fa-fw" aria-hidden="true"></span>
+                                {% trans "Discounted" %}
                             </span>
                         {% endif %}
                     </div>
@@ -341,14 +335,8 @@
                         {% if line.discount and line.line_price_gross != line.price %}
                             <span class="text-success discounted" data-toggle="tooltip" title="{% trans "The price of this product was reduced because of an automatic discount." %}">
                                 <br>
-                                <span class="fa fa-star fa-fw" aria-hidden="true"></span>
-                                {% if line.price < line.line_price_gross %}
-                                    {% blocktranslate trimmed with percent=line.discount_percentage|floatformat:0 %}
-                                        {{ percent }} % Discount
-                                    {% endblocktranslate %}
-                                {% else %}
-                                    {% trans "Discounted" %}
-                                {% endif %}
+                                <span class="fa fa-percent fa-fw" aria-hidden="true"></span>
+                                {% trans "Discounted" %}
                             </span>
                         {% endif %}
                     </div>

src/pretix/presale/views/event.py

@@ -70,7 +70,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.event import Event, SubEvent
 from pretix.base.models.items import (
-    Item, ItemAddOn, ItemBundle, SubEventItem, SubEventItemVariation,
+    ItemAddOn, ItemBundle, SubEventItem, SubEventItemVariation,
 )
 from pretix.base.services.placeholders import PlaceholderContext
 from pretix.base.services.quotas import QuotaAvailability
@@ -302,14 +302,14 @@ def get_grouped_items(event, *, channel: SalesChannel, subevent=None, voucher=No
 
         if item.hidden_if_item_available:
             if item.hidden_if_item_available.has_variations:
-                item._dependency_available = any(
+                dependency_available = any(
                     var.check_quotas(subevent=subevent, _cache=quota_cache, include_bundled=True)[0] == Quota.AVAILABILITY_OK
                     for var in item.hidden_if_item_available.available_variations
                 )
             else:
                 q = item.hidden_if_item_available.check_quotas(subevent=subevent, _cache=quota_cache, include_bundled=True)
-                item._dependency_available = q[0] == Quota.AVAILABILITY_OK
-            if item._dependency_available and item.hidden_if_item_available_mode == Item.UNAVAIL_MODE_HIDDEN:
+                dependency_available = q[0] == Quota.AVAILABILITY_OK
+            if dependency_available:
                 item._remove = True
                 continue
 

src/pretix/static/pretixbase/js/addressform.js

@@ -34,17 +34,10 @@ $(function () {
                     }
                     for(var k in dependents) {
                         const options = data[k],
-                            dependent = dependents[k];
-                        let visible = 'visible' in options ? options.visible : true;
+                            dependent = dependents[k],
+                            visible = 'visible' in options ? options.visible : true,
+                            required = 'required' in options && options.required && isRequired && visible;
 
-                        if (dependent.is("[data-display-dependency]")) {
-                            const dependency = $(dependent.attr("data-display-dependency"));
-                            visible = visible && (
-                                (dependency.attr("type") === 'checkbox' || dependency.attr("type") === 'radio') ? dependency.prop('checked') : !!dependency.val()
-                            );
-                        }
-
-                        const required = 'required' in options && options.required && isRequired && visible;
                         dependent.closest(".form-group").toggle(visible).toggleClass('required', required);
                         dependent.prop("required", required);
                     }

src/pretix/static/pretixpresale/js/widget/widget.js

@@ -38,7 +38,6 @@ var strings = {
     'unavailable_available_from': django.pgettext('widget', 'Not yet available'),
     'unavailable_available_until': django.pgettext('widget', 'Not available anymore'),
     'unavailable_active': django.pgettext('widget', 'Currently not available'),
-    'unavailable_hidden_if_item_available': django.pgettext('widget', 'Not yet available'),
     'order_min': django.pgettext('widget', 'minimum amount to order: %s'),
     'exit': django.pgettext('widget', 'Close ticket shop'),
     'loading_error': django.pgettext('widget', 'The ticket shop could not be loaded.'),

src/tests/api/test_items.py

@@ -323,7 +323,6 @@ TEST_ITEM_RES = {
     "max_per_order": None,
     "hidden_if_available": None,
     "hidden_if_item_available": None,
-    "hidden_if_item_available_mode": "hide",
     "checkin_attention": False,
     "checkin_text": None,
     "has_variations": False,

src/tests/control/test_items.py

@@ -673,12 +673,7 @@ class ItemsTest(ItemFormTest):
         with scopes_disabled():
             q = Question.objects.create(event=self.event1, question="Size", type="N")
             q.items.add(self.item2)
-            self.item2.limit_sales_channels.set(self.orga1.sales_channels.filter(identifier__in=["web", "bar"]))
-            self.item2.all_sales_channels = False
-            self.item2.save()
-            self.var2.limit_sales_channels.set(self.orga1.sales_channels.filter(identifier__in=["web"]))
-            self.var2.all_sales_channels = False
-            self.var2.save()
+        self.item2.sales_channels = ["web", "bar"]
         prop = self.event1.item_meta_properties.create(name="Foo")
         self.item2.meta_values.create(property=prop, value="Bar")
 
@@ -695,7 +690,6 @@ class ItemsTest(ItemFormTest):
         with scopes_disabled():
             i_old = Item.objects.get(name__icontains='Business')
             i_new = Item.objects.get(name__icontains='Intermediate')
-            v2_new = i_new.variations.get(value__icontains='Gold')
             assert i_new.category == i_old.category
             assert i_new.description == i_old.description
             assert i_new.active == i_old.active
@@ -704,8 +698,7 @@ class ItemsTest(ItemFormTest):
             assert i_new.require_voucher == i_old.require_voucher
             assert i_new.hide_without_voucher == i_old.hide_without_voucher
             assert i_new.allow_cancel == i_old.allow_cancel
-            assert set(i_new.limit_sales_channels.values_list("identifier", flat=True)) == {"web", "bar"}
-            assert set(v2_new.limit_sales_channels.values_list("identifier", flat=True)) == {"web"}
+            assert set(i_new.limit_sales_channels.all()) == set(i_old.limit_sales_channels.all())
             assert i_new.meta_data == i_old.meta_data == {"Foo": "Bar"}
             assert set(i_new.questions.all()) == set(i_old.questions.all())
             assert set([str(v.value) for v in i_new.variations.all()]) == set([str(v.value) for v in i_old.variations.all()])