diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index b7c1eb5418bde62776942ccd74b0564a86b82601..8cc80a04d14c7f020298770d11483580a94291cb 100644 --- a/aleksis/apps/tezor/models/invoice.py +++ b/aleksis/apps/tezor/models/invoice.py @@ -56,7 +56,7 @@ class Invoice(BasePayment, PureDjangoModel): class Meta: constraints = [ - models.UniqueConstraint(fields=["transaction_id", "group"], name="number_uniq_per_group") + models.UniqueConstraint(fields=["number", "group"], name="number_uniq_per_group") ] @property diff --git a/aleksis/apps/tezor/tables.py b/aleksis/apps/tezor/tables.py index 1139c5eae99adb5ea61b632c504b703836646789..47660380cc7330a34e46d946c9fce975fe4e1a59 100644 --- a/aleksis/apps/tezor/tables.py +++ b/aleksis/apps/tezor/tables.py @@ -85,7 +85,7 @@ class InvoiceGroupsTable(tables.Table): class InvoicesTable(tables.Table): - transaction_id = tables.Column() + number = tables.Column() status = tables.Column() created = tables.DateColumn() billing_first_name = tables.Column() diff --git a/aleksis/apps/tezor/templates/tezor/invoice/full.html b/aleksis/apps/tezor/templates/tezor/invoice/full.html index add38a90fa88f33578f98b3282ae1f315d05a031..d2dd3fe7067fabd0a12166a3bc4f231c1338f66e 100644 --- a/aleksis/apps/tezor/templates/tezor/invoice/full.html +++ b/aleksis/apps/tezor/templates/tezor/invoice/full.html @@ -3,11 +3,11 @@ {% load render_table from django_tables2 %} -{% block browser_title %}{{ object.transaction_id }}{% endblock %} +{% block browser_title %}{{ object.number }}{% endblock %} {% block content %} - <h1>{% trans "Invoice" %} {{ object.transaction_id }} — {{ object.created.date }}</h1> + <h1>{% trans "Invoice" %} {{ object.number }} — {{ object.created.date }}</h1> <a class="btn colour-primary waves-effect waves-light" href="{% url 'invoice_group_by_pk' object.group.pk %}">{% trans "Back" %}</a> {% render_table object.purchased_items_table %} diff --git a/aleksis/apps/tezor/templates/tezor/invoice/payment.html b/aleksis/apps/tezor/templates/tezor/invoice/payment.html index 7d51c9012f759d9865852a26064745beb640d0a2..838fa26a54bda50be6865880c7fd21d8c7cabab3 100644 --- a/aleksis/apps/tezor/templates/tezor/invoice/payment.html +++ b/aleksis/apps/tezor/templates/tezor/invoice/payment.html @@ -3,8 +3,8 @@ {% load i18n %} {% load material_form %} -{% block page_title %}{% blocktrans %}Make payment for{% endblocktrans %} {{ payment.transaction_id }}{% endblock %} -{% block browser_title %}{% blocktrans %}Make payment for{% endblocktrans %} {{ payment.transaction_id }}{% endblock %} +{% block page_title %}{% blocktrans %}Make payment for{% endblocktrans %} {{ payment.number }}{% endblock %} +{% block browser_title %}{% blocktrans %}Make payment for{% endblocktrans %} {{ payment.number }}{% endblock %} {% block content %} <form action="{{ form.action }}" method="{{ form.method }}">