diff --git a/aleksis/apps/tezor/migrations/0001_initial.py b/aleksis/apps/tezor/migrations/0001_initial.py index 16716174e4829ed019de800d4d83e803f95bee6d..98802cabe1a043e935049e80df04c07b1ce497e7 100644 --- a/aleksis/apps/tezor/migrations/0001_initial.py +++ b/aleksis/apps/tezor/migrations/0001_initial.py @@ -85,7 +85,7 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='invoice', - constraint=models.UniqueConstraint(fields=('transaction_id', 'group'), name='number_uniq_per_group'), + constraint=models.UniqueConstraint(fields=('number', 'group'), name='number_uniq_per_group'), ), migrations.AddConstraint( model_name='client', diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index ce14a11b6706c769f80ef2c698c7b031b50c997e..d5d4ab4b39f315c02aa4e68e506cbcb2c3127605 100644 --- a/aleksis/apps/tezor/models/invoice.py +++ b/aleksis/apps/tezor/models/invoice.py @@ -69,7 +69,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 32e2e3f07ad3c1c009d94ea376909a50feb63f94..16ed8a0ed491b7eb064c432cfd06950239ba620d 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 4c1b3bafe5ed9fa3380117892ba2c91fd9d629dc..7043c5c3bc59224d5d5ec0cdc726cfadced02344 100644 --- a/aleksis/apps/tezor/templates/tezor/invoice/full.html +++ b/aleksis/apps/tezor/templates/tezor/invoice/full.html @@ -3,7 +3,7 @@ {% load render_table from django_tables2 %} -{% block browser_title %}{{ object.transaction_id }}{% endblock %} +{% block browser_title %}{{ object.number }}{% endblock %} {% block content %} @@ -13,7 +13,7 @@ {% has_perm 'tezor.display_billing_rule' user object as can_view_billing_information %} {% has_perm 'tezor.print_invoice_rule' user object as can_print_invoice %} - <h1>{% trans "Invoice" %} {{ object.transaction_id }} — {{ object.created.date }}</h1> + <h1>{% trans "Invoice" %} {{ object.number }} — {{ object.created.date }}</h1> {% if can_view_invoice_group %} <a class="btn colour-primary waves-effect waves-light" href="{% url 'invoice_group_by_pk' object.group.pk %}">{% trans "Back" %}</a> 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 }}">