diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index be61c50..2b0901d 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -118,7 +118,7 @@

{{ order }}

- Испонитель: {{ order.order.contractor.get_full_name }} + Исполнитель: {{ order.order.contractor.get_full_name }}

@@ -128,7 +128,6 @@
{% endfor %} -
@@ -147,7 +146,6 @@
отправить
-

Этапы работы

@@ -168,7 +166,7 @@

- Зарезирвировать + Зарезервировать
diff --git a/common/migrations/0009_merge.py b/common/migrations/0009_merge.py index c10046b..f079aec 100644 --- a/common/migrations/0009_merge.py +++ b/common/migrations/0009_merge.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-29 17:21 +# Generated by Django 1.9.7 on 2016-08-29 17:37 from __future__ import unicode_literals from django.db import migrations @@ -8,8 +8,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('common', '0006_settings_noreply_email'), ('common', '0008_auto_20160829_1923'), + ('common', '0006_settings_noreply_email'), ] operations = [ diff --git a/projects/migrations/0021_merge.py b/projects/migrations/0021_merge.py index efcc798..0885b46 100644 --- a/projects/migrations/0021_merge.py +++ b/projects/migrations/0021_merge.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-29 17:21 +# Generated by Django 1.9.7 on 2016-08-29 17:37 from __future__ import unicode_literals from django.db import migrations diff --git a/wallets/templates/score-detail.html b/wallets/templates/score-detail.html index 9e72082..4282c45 100644 --- a/wallets/templates/score-detail.html +++ b/wallets/templates/score-detail.html @@ -16,16 +16,17 @@

{{ user_score_balance }}

- {% if user_score.is_customer %} -
- пополнить + {% if user_score.is_customer and user_score_balance > 0 %} +
+ пополнить
{% endif %} -
- вывести средства -
+ {% if user_score.is_contractor %} +
+ вывести средства +
+ {% endif %}