Merge branch 'payment-backends' into 3-add-payment-processing-ui-2

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',

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

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()

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>

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 }}">