From df3156a3da450a90ac967efaa0b03447c70cc76e Mon Sep 17 00:00:00 2001 From: Dominik George <dominik.george@teckids.org> Date: Fri, 11 Mar 2022 23:01:54 +0100 Subject: [PATCH] Use number instead of transaction_id --- aleksis/apps/tezor/models/invoice.py | 2 +- aleksis/apps/tezor/tables.py | 2 +- aleksis/apps/tezor/templates/tezor/invoice/full.html | 4 ++-- aleksis/apps/tezor/templates/tezor/invoice/payment.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index b7c1eb5..8cc80a0 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 1139c5e..4766038 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 add38a9..d2dd3fe 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 7d51c90..838fa26 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 }}"> -- GitLab