Skip to content

Commit af6953d

Browse files
committed
Updated allowed tracking number formats (Fix #256)
1 parent d1a275a commit af6953d

File tree

2 files changed

+38
-7
lines changed

2 files changed

+38
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Generated by Django 5.0 on 2024-02-01 16:37
2+
3+
import django.core.validators
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
dependencies = [
9+
("kmuhelper", "0110_orderitem_made_product_optional"),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name="order",
15+
name="tracking_number",
16+
field=models.CharField(
17+
blank=True,
18+
default="",
19+
help_text="Trackingnummer ohne Leerzeichen. (optional)",
20+
max_length=35,
21+
validators=[
22+
django.core.validators.RegexValidator(
23+
"^[A-Z0-9\\.]{8,}$",
24+
"Erlaubte Zeichen: Grossbuchstaben, Zahlen und Punkte. Länge: 8-35 Zeichen",
25+
)
26+
],
27+
verbose_name="Trackingnummer",
28+
),
29+
),
30+
]

kmuhelper/modules/main/models.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
gettext,
1515
npgettext,
1616
)
17+
from rich import print
18+
1719
from kmuhelper import settings, constants
1820
from kmuhelper.modules.emails.models import EMail, Attachment
1921
from kmuhelper.modules.main.mixins import AddressModelMixin
2022
from kmuhelper.modules.pdfgeneration import PDFOrder
2123
from kmuhelper.overrides import CustomModel
2224
from kmuhelper.translations import langselect, I18N_HELP_TEXT, Language
2325
from kmuhelper.utils import runden, formatprice, modulo10rekursiv, faq
24-
from rich import print
2526

2627
_ = gettext_lazy
2728

@@ -390,16 +391,16 @@ class Order(CustomModel, AddressModelMixin):
390391
verbose_name=_("Trackingnummer"),
391392
default="",
392393
blank=True,
393-
max_length=25,
394+
max_length=35,
394395
validators=[
395396
RegexValidator(
396-
r"^99\.[0-9]{2}\.[0-9]{6}\.[0-9]{8}$",
397-
_("Bite benutze folgendes Format: 99.xx.xxxxxx.xxxxxxxx"),
397+
r"^[A-Z0-9\.]{8,}$",
398+
_(
399+
"Erlaubte Zeichen: Grossbuchstaben, Zahlen und Punkte. Länge: 8-35 Zeichen"
400+
),
398401
)
399402
],
400-
help_text=_(
401-
"Bitte gib hier eine Trackingnummer der Schweizer Post ein. (optional)"
402-
),
403+
help_text=_("Trackingnummer ohne Leerzeichen. (optional)"),
403404
)
404405

405406
is_removed_from_stock = models.BooleanField(

0 commit comments

Comments
 (0)