mirror of
https://github.com/pretix/pretix.git
synced 2026-10-02 19:24:42 +00:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc52dc81f3 | ||
|
|
f3dbbce39c | ||
|
|
a2cef22ea8 | ||
|
|
3843448812 | ||
|
|
49893ca9df | ||
|
|
4eade5070e | ||
|
|
32b1997208 | ||
|
|
eaf4a310f6 | ||
|
|
8dc0f7c1b2 | ||
|
|
dd3e6c4692 |
@@ -19,4 +19,4 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||||
# <https://www.gnu.org/licenses/>.
|
# <https://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
__version__ = "2026.3.0.dev0"
|
__version__ = "2026.4.0.dev0"
|
||||||
|
|||||||
@@ -769,11 +769,7 @@ class PaymentDetailsField(serializers.Field):
|
|||||||
pp = value.payment_provider
|
pp = value.payment_provider
|
||||||
if not pp:
|
if not pp:
|
||||||
return {}
|
return {}
|
||||||
try:
|
return pp.api_payment_details(value)
|
||||||
return pp.api_payment_details(value)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("Failed to retrieve payment_details")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
|
|
||||||
class OrderPaymentSerializer(I18nAwareModelSerializer):
|
class OrderPaymentSerializer(I18nAwareModelSerializer):
|
||||||
|
|||||||
@@ -411,7 +411,7 @@ def mail_send_task(self, **kwargs) -> bool:
|
|||||||
try:
|
try:
|
||||||
outgoing_mail = OutgoingMail.objects.select_for_update(of=OF_SELF).get(pk=outgoing_mail)
|
outgoing_mail = OutgoingMail.objects.select_for_update(of=OF_SELF).get(pk=outgoing_mail)
|
||||||
except OutgoingMail.DoesNotExist:
|
except OutgoingMail.DoesNotExist:
|
||||||
logger.info(f"Ignoring job for non existing email {outgoing_mail.guid}")
|
logger.info(f"Ignoring job for non existing email {outgoing_mail}")
|
||||||
return False
|
return False
|
||||||
if outgoing_mail.status == OutgoingMail.STATUS_INFLIGHT:
|
if outgoing_mail.status == OutgoingMail.STATUS_INFLIGHT:
|
||||||
logger.info(f"Ignoring job for inflight email {outgoing_mail.guid}")
|
logger.info(f"Ignoring job for inflight email {outgoing_mail.guid}")
|
||||||
|
|||||||
@@ -67,9 +67,9 @@ from pretix.base.email import get_email_context
|
|||||||
from pretix.base.i18n import get_language_without_region, language
|
from pretix.base.i18n import get_language_without_region, language
|
||||||
from pretix.base.media import MEDIA_TYPES
|
from pretix.base.media import MEDIA_TYPES
|
||||||
from pretix.base.models import (
|
from pretix.base.models import (
|
||||||
CartPosition, Device, Event, GiftCard, Item, ItemVariation, Membership,
|
CartPosition, Device, Event, GiftCard, Item, ItemVariation, LogEntry,
|
||||||
Order, OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User,
|
Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
|
||||||
Voucher,
|
SeatCategoryMapping, User, Voucher,
|
||||||
)
|
)
|
||||||
from pretix.base.models.event import SubEvent
|
from pretix.base.models.event import SubEvent
|
||||||
from pretix.base.models.orders import (
|
from pretix.base.models.orders import (
|
||||||
@@ -1618,7 +1618,7 @@ class OrderChangeManager:
|
|||||||
MembershipOperation = namedtuple('MembershipOperation', ('position', 'membership'))
|
MembershipOperation = namedtuple('MembershipOperation', ('position', 'membership'))
|
||||||
CancelOperation = namedtuple('CancelOperation', ('position', 'price_diff'))
|
CancelOperation = namedtuple('CancelOperation', ('position', 'price_diff'))
|
||||||
AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat', 'membership',
|
AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat', 'membership',
|
||||||
'valid_from', 'valid_until', 'is_bundled', 'result'))
|
'valid_from', 'valid_until', 'is_bundled', 'result', 'count'))
|
||||||
SplitOperation = namedtuple('SplitOperation', ('position',))
|
SplitOperation = namedtuple('SplitOperation', ('position',))
|
||||||
FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value', 'price_diff'))
|
FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value', 'price_diff'))
|
||||||
AddFeeOperation = namedtuple('AddFeeOperation', ('fee', 'price_diff'))
|
AddFeeOperation = namedtuple('AddFeeOperation', ('fee', 'price_diff'))
|
||||||
@@ -1632,16 +1632,24 @@ class OrderChangeManager:
|
|||||||
ForceRecomputeOperation = namedtuple('ForceRecomputeOperation', tuple())
|
ForceRecomputeOperation = namedtuple('ForceRecomputeOperation', tuple())
|
||||||
|
|
||||||
class AddPositionResult:
|
class AddPositionResult:
|
||||||
_position: Optional[OrderPosition]
|
_positions: Optional[List[OrderPosition]]
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._position = None
|
self._positions = None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def position(self) -> OrderPosition:
|
def position(self) -> OrderPosition:
|
||||||
if self._position is None:
|
if self._positions is None:
|
||||||
raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
|
raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
|
||||||
return self._position
|
if len(self._positions) != 1:
|
||||||
|
raise RuntimeError("More than one position created.")
|
||||||
|
return self._positions[0]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def positions(self) -> List[OrderPosition]:
|
||||||
|
if self._positions is None:
|
||||||
|
raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
|
||||||
|
return self._positions
|
||||||
|
|
||||||
def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, allow_blocked_seats=False):
|
def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, allow_blocked_seats=False):
|
||||||
self.order = order
|
self.order = order
|
||||||
@@ -1848,8 +1856,12 @@ class OrderChangeManager:
|
|||||||
|
|
||||||
def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
|
def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
|
||||||
subevent: SubEvent = None, seat: Seat = None, membership: Membership = None,
|
subevent: SubEvent = None, seat: Seat = None, membership: Membership = None,
|
||||||
valid_from: datetime = None, valid_until: datetime = None) -> 'OrderChangeManager.AddPositionResult':
|
valid_from: datetime = None, valid_until: datetime = None, count: int = 1) -> 'OrderChangeManager.AddPositionResult':
|
||||||
|
if count < 1:
|
||||||
|
raise ValueError("Count must be positive")
|
||||||
if isinstance(seat, str):
|
if isinstance(seat, str):
|
||||||
|
if count > 1:
|
||||||
|
raise ValueError("Cannot combine count > 1 with seat")
|
||||||
if not seat:
|
if not seat:
|
||||||
seat = None
|
seat = None
|
||||||
else:
|
else:
|
||||||
@@ -1903,14 +1915,14 @@ class OrderChangeManager:
|
|||||||
if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00'):
|
if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00'):
|
||||||
self._invoice_dirty = True
|
self._invoice_dirty = True
|
||||||
|
|
||||||
self._totaldiff_guesstimate += price.gross
|
self._totaldiff_guesstimate += price.gross * count
|
||||||
self._quotadiff.update(new_quotas)
|
self._quotadiff.update({q: count for q in new_quotas})
|
||||||
if seat:
|
if seat:
|
||||||
self._seatdiff.update([seat])
|
self._seatdiff.update([seat])
|
||||||
|
|
||||||
result = self.AddPositionResult()
|
result = self.AddPositionResult()
|
||||||
self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat, membership,
|
self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat, membership,
|
||||||
valid_from, valid_until, is_bundled, result))
|
valid_from, valid_until, is_bundled, result, count))
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def split(self, position: OrderPosition):
|
def split(self, position: OrderPosition):
|
||||||
@@ -2530,29 +2542,35 @@ class OrderChangeManager:
|
|||||||
secret_dirty.remove(position)
|
secret_dirty.remove(position)
|
||||||
position.save(update_fields=['canceled', 'secret'])
|
position.save(update_fields=['canceled', 'secret'])
|
||||||
elif isinstance(op, self.AddOperation):
|
elif isinstance(op, self.AddOperation):
|
||||||
pos = OrderPosition.objects.create(
|
new_pos = []
|
||||||
item=op.item, variation=op.variation, addon_to=op.addon_to,
|
new_logs = []
|
||||||
price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code,
|
for i in range(op.count):
|
||||||
tax_value=op.price.tax, tax_rule=op.item.tax_rule,
|
pos = OrderPosition.objects.create(
|
||||||
positionid=nextposid, subevent=op.subevent, seat=op.seat,
|
item=op.item, variation=op.variation, addon_to=op.addon_to,
|
||||||
used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until,
|
price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code,
|
||||||
is_bundled=op.is_bundled,
|
tax_value=op.price.tax, tax_rule=op.item.tax_rule,
|
||||||
)
|
positionid=nextposid, subevent=op.subevent, seat=op.seat,
|
||||||
nextposid += 1
|
used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until,
|
||||||
self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
|
is_bundled=op.is_bundled,
|
||||||
'position': pos.pk,
|
)
|
||||||
'item': op.item.pk,
|
nextposid += 1
|
||||||
'variation': op.variation.pk if op.variation else None,
|
new_pos.append(pos)
|
||||||
'addon_to': op.addon_to.pk if op.addon_to else None,
|
new_logs.append(self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
|
||||||
'price': op.price.gross,
|
'position': pos.pk,
|
||||||
'positionid': pos.positionid,
|
'item': op.item.pk,
|
||||||
'membership': pos.used_membership_id,
|
'variation': op.variation.pk if op.variation else None,
|
||||||
'subevent': op.subevent.pk if op.subevent else None,
|
'addon_to': op.addon_to.pk if op.addon_to else None,
|
||||||
'seat': op.seat.pk if op.seat else None,
|
'price': op.price.gross,
|
||||||
'valid_from': op.valid_from.isoformat() if op.valid_from else None,
|
'positionid': pos.positionid,
|
||||||
'valid_until': op.valid_until.isoformat() if op.valid_until else None,
|
'membership': pos.used_membership_id,
|
||||||
})
|
'subevent': op.subevent.pk if op.subevent else None,
|
||||||
op.result._position = pos
|
'seat': op.seat.pk if op.seat else None,
|
||||||
|
'valid_from': op.valid_from.isoformat() if op.valid_from else None,
|
||||||
|
'valid_until': op.valid_until.isoformat() if op.valid_until else None,
|
||||||
|
}, save=False))
|
||||||
|
|
||||||
|
op.result._positions = new_pos
|
||||||
|
LogEntry.bulk_create_and_postprocess(new_logs)
|
||||||
elif isinstance(op, self.SplitOperation):
|
elif isinstance(op, self.SplitOperation):
|
||||||
position = position_cache.setdefault(op.position.pk, op.position)
|
position = position_cache.setdefault(op.position.pk, op.position)
|
||||||
split_positions.append(position)
|
split_positions.append(position)
|
||||||
@@ -2877,7 +2895,7 @@ class OrderChangeManager:
|
|||||||
return total
|
return total
|
||||||
|
|
||||||
def _check_order_size(self):
|
def _check_order_size(self):
|
||||||
if (len(self.order.positions.all()) + len([op for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
|
if (len(self.order.positions.all()) + sum([op.count for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
|
||||||
raise OrderError(
|
raise OrderError(
|
||||||
self.error_messages['max_order_size'] % {
|
self.error_messages['max_order_size'] % {
|
||||||
'max': settings.PRETIX_MAX_ORDER_SIZE,
|
'max': settings.PRETIX_MAX_ORDER_SIZE,
|
||||||
@@ -2938,7 +2956,7 @@ class OrderChangeManager:
|
|||||||
]) + len([
|
]) + len([
|
||||||
o for o in self._operations if isinstance(o, self.SplitOperation)
|
o for o in self._operations if isinstance(o, self.SplitOperation)
|
||||||
])
|
])
|
||||||
adds = len([o for o in self._operations if isinstance(o, self.AddOperation)])
|
adds = sum([o.count for o in self._operations if isinstance(o, self.AddOperation)])
|
||||||
if current > 0 and current - cancels + adds < 1:
|
if current > 0 and current - cancels + adds < 1:
|
||||||
raise OrderError(self.error_messages['complete_cancel'])
|
raise OrderError(self.error_messages['complete_cancel'])
|
||||||
|
|
||||||
@@ -2985,17 +3003,18 @@ class OrderChangeManager:
|
|||||||
elif isinstance(op, self.CancelOperation) and op.position in positions_to_fake_cart:
|
elif isinstance(op, self.CancelOperation) and op.position in positions_to_fake_cart:
|
||||||
fake_cart.remove(positions_to_fake_cart[op.position])
|
fake_cart.remove(positions_to_fake_cart[op.position])
|
||||||
elif isinstance(op, self.AddOperation):
|
elif isinstance(op, self.AddOperation):
|
||||||
cp = CartPosition(
|
for i in range(op.count):
|
||||||
event=self.event,
|
cp = CartPosition(
|
||||||
item=op.item,
|
event=self.event,
|
||||||
variation=op.variation,
|
item=op.item,
|
||||||
used_membership=op.membership,
|
variation=op.variation,
|
||||||
subevent=op.subevent,
|
used_membership=op.membership,
|
||||||
seat=op.seat,
|
subevent=op.subevent,
|
||||||
)
|
seat=op.seat,
|
||||||
cp.override_valid_from = op.valid_from
|
)
|
||||||
cp.override_valid_until = op.valid_until
|
cp.override_valid_from = op.valid_from
|
||||||
fake_cart.append(cp)
|
cp.override_valid_until = op.valid_until
|
||||||
|
fake_cart.append(cp)
|
||||||
try:
|
try:
|
||||||
validate_memberships_in_order(self.order.customer, fake_cart, self.event, lock=True, ignored_order=self.order, testmode=self.order.testmode)
|
validate_memberships_in_order(self.order.customer, fake_cart, self.event, lock=True, ignored_order=self.order, testmode=self.order.testmode)
|
||||||
except ValidationError as e:
|
except ValidationError as e:
|
||||||
|
|||||||
@@ -331,6 +331,10 @@ class OtherOperationsForm(forms.Form):
|
|||||||
|
|
||||||
|
|
||||||
class OrderPositionAddForm(forms.Form):
|
class OrderPositionAddForm(forms.Form):
|
||||||
|
count = forms.IntegerField(
|
||||||
|
label=_('Number of products to add'),
|
||||||
|
initial=1,
|
||||||
|
)
|
||||||
itemvar = forms.ChoiceField(
|
itemvar = forms.ChoiceField(
|
||||||
label=_('Product')
|
label=_('Product')
|
||||||
)
|
)
|
||||||
@@ -432,6 +436,10 @@ class OrderPositionAddForm(forms.Form):
|
|||||||
d['used_membership'] = [m for m in self.memberships if str(m.pk) == d['used_membership']][0]
|
d['used_membership'] = [m for m in self.memberships if str(m.pk) == d['used_membership']][0]
|
||||||
else:
|
else:
|
||||||
d['used_membership'] = None
|
d['used_membership'] = None
|
||||||
|
if d.get("count", 1) and d.get("seat"):
|
||||||
|
raise ValidationError({
|
||||||
|
"seat": _("You can not choose a seat when adding multiple products at once.")
|
||||||
|
})
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -329,6 +329,7 @@
|
|||||||
{{ add_form.custom_error }}
|
{{ add_form.custom_error }}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% bootstrap_field add_form.count layout="control" %}
|
||||||
{% bootstrap_field add_form.itemvar layout="control" %}
|
{% bootstrap_field add_form.itemvar layout="control" %}
|
||||||
{% bootstrap_field add_form.price addon_after=request.event.currency layout="control" %}
|
{% bootstrap_field add_form.price addon_after=request.event.currency layout="control" %}
|
||||||
{% if add_form.addon_to %}
|
{% if add_form.addon_to %}
|
||||||
@@ -364,6 +365,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="form-horizontal">
|
<div class="form-horizontal">
|
||||||
|
{% bootstrap_field add_position_formset.empty_form.count layout="control" %}
|
||||||
{% bootstrap_field add_position_formset.empty_form.itemvar layout="control" %}
|
{% bootstrap_field add_position_formset.empty_form.itemvar layout="control" %}
|
||||||
{% bootstrap_field add_position_formset.empty_form.price addon_after=request.event.currency layout="control" %}
|
{% bootstrap_field add_position_formset.empty_form.price addon_after=request.event.currency layout="control" %}
|
||||||
{% if add_position_formset.empty_form.addon_to %}
|
{% if add_position_formset.empty_form.addon_to %}
|
||||||
|
|||||||
@@ -2059,12 +2059,13 @@ class OrderChange(OrderView):
|
|||||||
else:
|
else:
|
||||||
variation = None
|
variation = None
|
||||||
try:
|
try:
|
||||||
ocm.add_position(item, variation,
|
for i in range(f.cleaned_data.get("count", 1)):
|
||||||
f.cleaned_data['price'],
|
ocm.add_position(item, variation,
|
||||||
f.cleaned_data.get('addon_to'),
|
f.cleaned_data['price'],
|
||||||
f.cleaned_data.get('subevent'),
|
f.cleaned_data.get('addon_to'),
|
||||||
f.cleaned_data.get('seat'),
|
f.cleaned_data.get('subevent'),
|
||||||
f.cleaned_data.get('used_membership'))
|
f.cleaned_data.get('seat'),
|
||||||
|
f.cleaned_data.get('used_membership'))
|
||||||
except OrderError as e:
|
except OrderError as e:
|
||||||
f.custom_error = str(e)
|
f.custom_error = str(e)
|
||||||
return False
|
return False
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -32,6 +32,7 @@ ausgecheckt
|
|||||||
ausgeklappt
|
ausgeklappt
|
||||||
auswahl
|
auswahl
|
||||||
Authentication
|
Authentication
|
||||||
|
Authenticator
|
||||||
Authenticator-App
|
Authenticator-App
|
||||||
Autorisierungscode
|
Autorisierungscode
|
||||||
Autorisierungs-Endpunktes
|
Autorisierungs-Endpunktes
|
||||||
@@ -130,6 +131,7 @@ Eingangsscan
|
|||||||
Einlassbuchung
|
Einlassbuchung
|
||||||
Einlassdatum
|
Einlassdatum
|
||||||
Einlasskontrolle
|
Einlasskontrolle
|
||||||
|
Einmalpasswörter
|
||||||
einzuchecken
|
einzuchecken
|
||||||
email
|
email
|
||||||
E-Mail-Renderer
|
E-Mail-Renderer
|
||||||
@@ -163,6 +165,7 @@ Explorer
|
|||||||
FA
|
FA
|
||||||
Favicon
|
Favicon
|
||||||
F-Droid
|
F-Droid
|
||||||
|
freeOTP
|
||||||
Footer
|
Footer
|
||||||
Footer-Link
|
Footer-Link
|
||||||
Footer-Text
|
Footer-Text
|
||||||
@@ -557,6 +560,7 @@ Zahlungs-ID
|
|||||||
Zahlungspflichtig
|
Zahlungspflichtig
|
||||||
Zehnerkarten
|
Zehnerkarten
|
||||||
Zeitbasiert
|
Zeitbasiert
|
||||||
|
zeitbasierte
|
||||||
Zeitslotbuchung
|
Zeitslotbuchung
|
||||||
Zimpler
|
Zimpler
|
||||||
ZIP-Datei
|
ZIP-Datei
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -32,6 +32,7 @@ ausgecheckt
|
|||||||
ausgeklappt
|
ausgeklappt
|
||||||
auswahl
|
auswahl
|
||||||
Authentication
|
Authentication
|
||||||
|
Authenticator
|
||||||
Authenticator-App
|
Authenticator-App
|
||||||
Autorisierungscode
|
Autorisierungscode
|
||||||
Autorisierungs-Endpunktes
|
Autorisierungs-Endpunktes
|
||||||
@@ -130,6 +131,7 @@ Eingangsscan
|
|||||||
Einlassbuchung
|
Einlassbuchung
|
||||||
Einlassdatum
|
Einlassdatum
|
||||||
Einlasskontrolle
|
Einlasskontrolle
|
||||||
|
Einmalpasswörter
|
||||||
einzuchecken
|
einzuchecken
|
||||||
email
|
email
|
||||||
E-Mail-Renderer
|
E-Mail-Renderer
|
||||||
@@ -163,6 +165,7 @@ Explorer
|
|||||||
FA
|
FA
|
||||||
Favicon
|
Favicon
|
||||||
F-Droid
|
F-Droid
|
||||||
|
freeOTP
|
||||||
Footer
|
Footer
|
||||||
Footer-Link
|
Footer-Link
|
||||||
Footer-Text
|
Footer-Text
|
||||||
@@ -557,6 +560,7 @@ Zahlungs-ID
|
|||||||
Zahlungspflichtig
|
Zahlungspflichtig
|
||||||
Zehnerkarten
|
Zehnerkarten
|
||||||
Zeitbasiert
|
Zeitbasiert
|
||||||
|
zeitbasierte
|
||||||
Zeitslotbuchung
|
Zeitslotbuchung
|
||||||
Zimpler
|
Zimpler
|
||||||
ZIP-Datei
|
ZIP-Datei
|
||||||
|
|||||||
+310
-288
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2026-03-17 14:06+0000\n"
|
"POT-Creation-Date: 2026-03-30 11:25+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@ msgstr ""
|
|||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2026-03-17 14:06+0000\n"
|
"POT-Creation-Date: 2026-03-17 14:06+0000\n"
|
||||||
"PO-Revision-Date: 2026-03-18 12:23+0000\n"
|
"PO-Revision-Date: 2026-03-30 03:00+0000\n"
|
||||||
"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
|
"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
|
||||||
"Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
|
"Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
|
||||||
"js/es/>\n"
|
"js/es/>\n"
|
||||||
@@ -329,7 +329,7 @@ msgstr "Pedido no aprobado"
|
|||||||
|
|
||||||
#: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:68
|
#: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:68
|
||||||
msgid "Checked-in Tickets"
|
msgid "Checked-in Tickets"
|
||||||
msgstr "Registro de código QR"
|
msgstr "Billetes registrados"
|
||||||
|
|
||||||
#: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:69
|
#: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:69
|
||||||
msgid "Valid Tickets"
|
msgid "Valid Tickets"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -12,6 +12,7 @@ anonymized
|
|||||||
Auth
|
Auth
|
||||||
authentification
|
authentification
|
||||||
authenticator
|
authenticator
|
||||||
|
Authenticator
|
||||||
automatical
|
automatical
|
||||||
availabilities
|
availabilities
|
||||||
backend
|
backend
|
||||||
@@ -22,6 +23,7 @@ barcodes
|
|||||||
Bcc
|
Bcc
|
||||||
BCC
|
BCC
|
||||||
BezahlCode
|
BezahlCode
|
||||||
|
biometric
|
||||||
BLIK
|
BLIK
|
||||||
blocklist
|
blocklist
|
||||||
BN
|
BN
|
||||||
@@ -56,6 +58,7 @@ EPS
|
|||||||
eps
|
eps
|
||||||
favicon
|
favicon
|
||||||
filetype
|
filetype
|
||||||
|
freeOTP
|
||||||
frontend
|
frontend
|
||||||
frontpage
|
frontpage
|
||||||
Galician
|
Galician
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2406,6 +2406,15 @@ class OrderChangeManagerTests(TestCase):
|
|||||||
self.ocm.commit()
|
self.ocm.commit()
|
||||||
assert self.order.positions.count() == 2
|
assert self.order.positions.count() == 2
|
||||||
|
|
||||||
|
@classscope(attr='o')
|
||||||
|
def test_add_item_quota_partial(self):
|
||||||
|
q1 = self.event.quotas.create(name='Test', size=1)
|
||||||
|
q1.items.add(self.shirt)
|
||||||
|
self.ocm.add_position(self.shirt, None, None, None, count=2)
|
||||||
|
with self.assertRaises(OrderError):
|
||||||
|
self.ocm.commit()
|
||||||
|
assert self.order.positions.count() == 2
|
||||||
|
|
||||||
@classscope(attr='o')
|
@classscope(attr='o')
|
||||||
def test_add_item_addon(self):
|
def test_add_item_addon(self):
|
||||||
self.shirt.category = self.event.categories.create(name='Add-ons', is_addon=True)
|
self.shirt.category = self.event.categories.create(name='Add-ons', is_addon=True)
|
||||||
|
|||||||
@@ -1584,10 +1584,11 @@ class OrderChangeTests(SoupTest):
|
|||||||
'add_position-MAX_NUM_FORMS': '100',
|
'add_position-MAX_NUM_FORMS': '100',
|
||||||
'add_position-0-itemvar': str(self.shirt.pk),
|
'add_position-0-itemvar': str(self.shirt.pk),
|
||||||
'add_position-0-do': 'on',
|
'add_position-0-do': 'on',
|
||||||
|
'add_position-0-count': '2',
|
||||||
'add_position-0-price': '14.00',
|
'add_position-0-price': '14.00',
|
||||||
})
|
})
|
||||||
with scopes_disabled():
|
with scopes_disabled():
|
||||||
assert self.order.positions.count() == 3
|
assert self.order.positions.count() == 4
|
||||||
assert self.order.positions.last().item == self.shirt
|
assert self.order.positions.last().item == self.shirt
|
||||||
assert self.order.positions.last().price == 14
|
assert self.order.positions.last().price == 14
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user