diff --git a/app/models.py b/app/models.py index ab0053d..4106eb2 100644 --- a/app/models.py +++ b/app/models.py @@ -288,6 +288,7 @@ class Address(db.Model): def genmac(self): alladdr = Address.query.all() allmacs = [] + current_app.logger.info('populating mac addr pool') for addr in alladdr: allmacs.append(str(addr.mac)) while True: diff --git a/app/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html index 3c48381..871ff59 100644 --- a/app/templates/admin/admin_tasks.html +++ b/app/templates/admin/admin_tasks.html @@ -4,12 +4,12 @@
- +
diff --git a/app/templates/main/terms.html b/app/templates/main/terms.html index c38c741..5d70e36 100644 --- a/app/templates/main/terms.html +++ b/app/templates/main/terms.html @@ -8,7 +8,6 @@
Terms of Service

-

Правила и Условия

diff --git a/app/templates/uinvoice/transactions.html b/app/templates/uinvoice/transactions.html index 3d39594..f043929 100644 --- a/app/templates/uinvoice/transactions.html +++ b/app/templates/uinvoice/transactions.html @@ -40,63 +40,57 @@ var myChart = new Chart(ctx, { {% block page_content %}
{% block sidebar %} -
+
+
+ {% include "/settings/acc_avatar.html" %} +
+ +
+
+
Wallet Graph
+
+ +
+
+
{% endblock %} - -
- -
-
-
Wallet Graph
-
- -
- -
- {% include "/settings/acc_avatar.html" %} -
- - -
+
-
Transactions
-
+
Transactions
+
-
- +
+
- + - {% for transaction in transactions %} - {% if transaction.value > 0 %} + {% if transaction.value < 0 %} - - - + + {% else %} - - - - + + + {% endif %} {% endfor %} -
Date Description AmountDate
{{ transaction.description }}{{ transaction.value }} {{ transaction.currency }} {{ moment(transaction.date_created).format('lll') }}{{ transaction.description }}{{ transaction.value|abs }} {{ transaction.currency }}
{{ transaction.description }}{{ transaction.value }} {{ transaction.currency }}
{{ moment(transaction.date_created).format('lll') }}{{ transaction.description }}{{ transaction.value|abs }} {{ transaction.currency }}
-
+ +