From a77cf078dda79879a731a11bc98553bd94290cb2 Mon Sep 17 00:00:00 2001
From: Sak1012 <1012srivatsavas@gmail.com>
Date: Wed, 26 Nov 2025 01:08:03 +0530
Subject: [PATCH] fix(500): item to product renames
---
app/eventyay/base/exporters/json.py | 32 +++++++++----------
app/eventyay/base/models/tax.py | 2 +-
app/eventyay/base/services/cancelevent.py | 4 +--
app/eventyay/control/forms/checkin.py | 4 +--
app/eventyay/control/views/pdf.py | 10 +++---
.../eventyay_common/event/settings_base.html | 2 +-
.../eventyay_common/events/index.html | 2 +-
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/app/eventyay/base/exporters/json.py b/app/eventyay/base/exporters/json.py
index b996c37b83..92e2eb6b85 100644
--- a/app/eventyay/base/exporters/json.py
+++ b/app/eventyay/base/exporters/json.py
@@ -31,30 +31,30 @@ def render(self, form_data):
}
for category in self.event.categories.all()
],
- 'items': [
+ 'products': [
{
- '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'),
- 'tax_name': str(item.tax_rule.name) if item.tax_rule else None,
- 'admission': item.admission,
- 'active': item.active,
+ 'id': product.id,
+ 'name': str(product.name),
+ 'internal_name': str(product.internal_name),
+ 'category': product.category_id,
+ 'price': product.default_price,
+ 'tax_rate': product.tax_rule.rate if product.tax_rule else Decimal('0.00'),
+ 'tax_name': str(product.tax_rule.name) if product.tax_rule else None,
+ 'admission': product.admission,
+ 'active': product.active,
'variations': [
{
'id': variation.id,
'active': variation.active,
'price': variation.default_price
if variation.default_price is not None
- else item.default_price,
+ else product.default_price,
'name': str(variation),
}
- for variation in item.variations.all()
+ for variation in product.variations.all()
],
}
- for item in self.event.items.select_related('tax_rule').prefetch_related('variations')
+ for product in self.event.products.select_related('tax_rule').prefetch_related('variations')
],
'questions': [
{
@@ -83,7 +83,7 @@ def render(self, form_data):
'positions': [
{
'id': position.id,
- 'item': position.item_id,
+ 'product': position.product_id,
'variation': position.variation_id,
'price': position.price,
'attendee_name': position.attendee_name,
@@ -107,10 +107,10 @@ def render(self, form_data):
{
'id': quota.id,
'size': quota.size,
- 'items': [item.id for item in quota.items.all()],
+ 'products': [product.id for product in quota.products.all()],
'variations': [variation.id for variation in quota.variations.all()],
}
- for quota in self.event.quotas.all().prefetch_related('items', 'variations')
+ for quota in self.event.quotas.all().prefetch_related('products', 'variations')
],
}
}
diff --git a/app/eventyay/base/models/tax.py b/app/eventyay/base/models/tax.py
index fa9a91fd72..c7c436d874 100644
--- a/app/eventyay/base/models/tax.py
+++ b/app/eventyay/base/models/tax.py
@@ -173,7 +173,7 @@ def allow_delete(self):
return (
not OrderFee.objects.filter(tax_rule=self, order__event=self.event).exists()
and not OrderPosition.all.filter(tax_rule=self, order__event=self.event).exists()
- and not self.event.items.filter(tax_rule=self).exists()
+ and not self.event.products.filter(tax_rule=self).exists()
and self.event.settings.tax_rate_default != self
)
diff --git a/app/eventyay/base/services/cancelevent.py b/app/eventyay/base/services/cancelevent.py
index 65ec558dd4..56c0d97ede 100644
--- a/app/eventyay/base/services/cancelevent.py
+++ b/app/eventyay/base/services/cancelevent.py
@@ -210,11 +210,11 @@ def cancel_event(
user=user,
)
- for i in event.items.filter(active=True):
+ for i in event.products.filter(active=True):
i.active = False
i.save(update_fields=['active'])
i.log_action(
- 'pretix.event.item.changed',
+ 'pretix.event.product.changed',
user=user,
data={'active': False, '_source': 'cancel_event'},
)
diff --git a/app/eventyay/control/forms/checkin.py b/app/eventyay/control/forms/checkin.py
index 612ef15ba2..dd969fa82c 100644
--- a/app/eventyay/control/forms/checkin.py
+++ b/app/eventyay/control/forms/checkin.py
@@ -44,7 +44,7 @@ def __init__(self, **kwargs):
self.event = kwargs.pop('event')
kwargs.pop('locales', None)
super().__init__(**kwargs)
- self.fields['limit_products'].queryset = self.event.items.all()
+ self.fields['limit_products'].queryset = self.event.products.all()
self.fields['auto_checkin_sales_channels'] = forms.MultipleChoiceField(
label=self.fields['auto_checkin_sales_channels'].label,
help_text=self.fields['auto_checkin_sales_channels'].help_text,
@@ -117,7 +117,7 @@ def __init__(self, **kwargs):
self.event = kwargs.pop('event')
kwargs.pop('locales', None)
super().__init__(**kwargs)
- self.fields['limit_products'].queryset = self.event.items.all()
+ self.fields['limit_products'].queryset = self.event.products.all()
if not self.event.organizer.gates.exists():
del self.fields['gates']
diff --git a/app/eventyay/control/views/pdf.py b/app/eventyay/control/views/pdf.py
index 635c9a09f8..9cf086f9d9 100644
--- a/app/eventyay/control/views/pdf.py
+++ b/app/eventyay/control/views/pdf.py
@@ -62,12 +62,12 @@ def process_upload(self):
return None, f
def _get_preview_position(self):
- item = self.request.event.items.create(
+ product = self.request.event.products.create(
name=_('Sample product'),
default_price=42.23,
description=_('Sample product description'),
)
- item2 = self.request.event.items.create(name=_('Sample workshop'), default_price=23.40)
+ product2 = self.request.event.products.create(name=_('Sample workshop'), default_price=23.40)
from pretix.base.models import Order
@@ -83,9 +83,9 @@ def _get_preview_position(self):
scheme = PERSON_NAME_SCHEMES[self.request.event.settings.name_scheme]
sample = {k: str(v) for k, v in scheme['sample'].items()}
- p = order.positions.create(item=item, attendee_name_parts=sample, price=item.default_price)
- order.positions.create(item=item2, attendee_name_parts=sample, price=item.default_price, addon_to=p)
- order.positions.create(item=item2, attendee_name_parts=sample, price=item.default_price, addon_to=p)
+ p = order.positions.create(product=product, attendee_name_parts=sample, price=product.default_price)
+ order.positions.create(product=product2, attendee_name_parts=sample, price=product.default_price, addon_to=p)
+ order.positions.create(product=product2, attendee_name_parts=sample, price=product.default_price, addon_to=p)
InvoiceAddress.objects.create(order=order, name_parts=sample, company=_('Sample company'))
return p
diff --git a/app/eventyay/eventyay_common/templates/eventyay_common/event/settings_base.html b/app/eventyay/eventyay_common/templates/eventyay_common/event/settings_base.html
index 01650c389b..9dd05e9157 100644
--- a/app/eventyay/eventyay_common/templates/eventyay_common/event/settings_base.html
+++ b/app/eventyay/eventyay_common/templates/eventyay_common/event/settings_base.html
@@ -18,7 +18,7 @@ {% trans "Congratulations!" %}
{% endblocktrans %}
-
{% trans "Create a first product" %}
diff --git a/app/eventyay/eventyay_common/templates/eventyay_common/events/index.html b/app/eventyay/eventyay_common/templates/eventyay_common/events/index.html
index c97ab267ff..602eed9ccf 100644
--- a/app/eventyay/eventyay_common/templates/eventyay_common/events/index.html
+++ b/app/eventyay/eventyay_common/templates/eventyay_common/events/index.html
@@ -127,7 +127,7 @@
{% trans "Filter" %}
{% include "pretixcontrol/fragment_quota_box_paid.html" with quota=q %}
{% endfor %}
{% if e.first_quotas|length > 3 %}
-
···