Implement hidden_if_item_available_mode option (Z#23177008) (#4776)

src/pretix/base/forms/questions.py

@@ -1025,9 +1025,10 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 'autocomplete': 'address-level2',
             }),
             'company': forms.TextInput(attrs={
+                'data-display-dependency': '#id_is_business_1',
                 'autocomplete': 'organization',
             }),
-            'vat_id': forms.TextInput(),
+            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1'}),
             'internal_reference': forms.TextInput,
         }
         labels = {
@@ -1058,8 +1059,10 @@ class BaseInvoiceAddressForm(forms.ModelForm):
 
         super().__init__(*args, **kwargs)
 
-        self.fields["company"].widget.attrs["data-display-dependency"] = f'input[name="{self.add_prefix("is_business")}"][value="business"]'
-        self.fields["vat_id"].widget.attrs["data-display-dependency"] = f'input[name="{self.add_prefix("is_business")}"][value="business"]'
+        # If an individual or company address is acceptable, #id_is_business_0 == individual, _1 == company.
+        # However, if only company addresses are acceptable, #id_is_business_0 == company and is the only choice
+        self.fields["company"].widget.attrs["data-display-dependency"] = f'#id_{self.add_prefix("is_business")}_{int(not self.company_required)}'
+        self.fields["vat_id"].widget.attrs["data-display-dependency"] = f'#id_{self.add_prefix("is_business")}_{int(not self.company_required)}'
 
         if not self.ask_vat_id:
             del self.fields['vat_id']
@@ -1140,9 +1143,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         )
         if self.address_required and not self.company_required and not self.all_optional:
             if not event.settings.invoice_name_required:
-                self.fields['name_parts'].widget.attrs['data-required-if'] = f'input[name="{self.add_prefix("is_business")}"][value="individual"]'
+                self.fields['name_parts'].widget.attrs['data-required-if'] = f'#id_{self.add_prefix("is_business")}_0'
             self.fields['name_parts'].widget.attrs['data-no-required-attr'] = '1'
-            self.fields['company'].widget.attrs['data-required-if'] = f'input[name="{self.add_prefix("is_business")}"][value="business"]'
+            self.fields['company'].widget.attrs['data-required-if'] = f'#id_{self.add_prefix("is_business")}_1'
 
         if not event.settings.invoice_address_beneficiary:
             del self.fields['beneficiary']

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

@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="item",
             name="hidden_if_item_available_mode",
-            field=models.CharField(default="hide", max_length=16),
+            field=models.CharField(default="hide", max_length=16, null=True),
         ),
     ]

src/pretix/base/migrations/0277_alter_item_hidden_if_item_available_mode.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2025-01-24 12:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0276_item_hidden_if_item_available_mode"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="item",
+            name="hidden_if_item_available_mode",
+            field=models.CharField(default="hide", max_length=16),
+        ),
+    ]

src/pretix/control/logdisplay.py

@@ -338,7 +338,7 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
         else:
             data['list'] = _("(unknown)")
 
-        data['barcode'] = data.get('barcode', '')[:16]
+        data['barcode'] = data.get('barcode')[:16]
         data['posid'] = logentry.parsed_data.get('positionid', '?')
 
         if 'datetime' in data:
@@ -529,7 +529,7 @@ class VoucherRedeemedLogEntryType(VoucherLogEntryType):
         })
         return format_html(
             self.plain,
-            order_code=format_html('<a href="{}">{}</a>', url, data.get('order_code', '?')),
+            order_code=format_html('<a href="{}">{}</a>', url, data('order_code', '?')),
         )
 
 

src/pretix/helpers/metrics/middleware.py

@@ -62,8 +62,7 @@ class MetricsMiddleware(object):
         t0 = time.perf_counter()
         resp = self.get_response(request)
         tdiff = time.perf_counter() - t0
-        if url.url_name:
-            pretix_view_duration_seconds.observe(tdiff, status_code=resp.status_code, method=request.method,
-                                                 url_name=url.namespace + ':' + url.url_name)
+        pretix_view_duration_seconds.observe(tdiff, status_code=resp.status_code, method=request.method,
+                                             url_name=url.namespace + ':' + url.url_name)
 
         return resp

src/pretix/plugins/paypal2/signals.py

@@ -51,8 +51,8 @@ def register_payment_provider(sender, **kwargs):
 class PaypalEventLogEntryType(EventLogEntryType):
     action_type = 'pretix.plugins.paypal.event'
 
-    def display(self, logentry, data):
-        event_type = data.get('event_type')
+    def display(self, logentry):
+        event_type = logentry.parsed_data.get('event_type')
         text = None
         plains = {
             'PAYMENT.SALE.COMPLETED': _('Payment completed.'),