From 1f3bb1eaf8bf4f3f075839dc8418ddf45d6cf7de Mon Sep 17 00:00:00 2001
From: PekopT <alex@brilliantov.me>
Date: Mon, 29 Aug 2016 20:36:40 +0300
Subject: [PATCH 1/2] various

---
 chat/templates/chat_customer.html   |  6 ++----
 wallets/templates/score-detail.html | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

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 @@
                                     <p class="titleOB">{{ order }}</p>
                                     <div class="hideOBB">
                                         <p class="pOB">
-                                            <span>Испонитель:</span> {{ order.order.contractor.get_full_name }}
+                                            <span>Исполнитель:</span> {{ order.order.contractor.get_full_name }}
                                         </p>
                                         <a href="#" class="linkChat11">
                                             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
@@ -128,7 +128,6 @@
                                 </div>
                             {% endfor %}
                         </div>
-
                     </div>
                     <div class="col-lg-6 commChat">
                         <div id="message-chat-order-space"></div>
@@ -147,7 +146,6 @@
                                 <a href="#" id="order-chat-add-message">отправить</a>
                             </div>
                         </form>
-
                     </div>
                     <div class="col-lg-3 wrstepschat" id="order-stages-tab">
                         <p>Этапы работы</p>
@@ -168,7 +166,7 @@
                             </p>
 
                             <div class="textAreaBlock2 FFD box-sizing disTab">
-						        <a href="#" id="reserve-button" data-order-id="">Зарезирвировать</a>
+						        <a href="#" id="reserve-button" data-order-id="">Зарезервировать</a>
 					        </div>
 
 					    </div>
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 @@
                     <div class="triangle1"></div>
                     <p>{{ user_score_balance }} <i class="fa fa-rub"></i></p>
 
-                    {% if user_score.is_customer %}
-                        <div class="col-lg-6">
-                            <a href="#" data-toggle="modal" data-target="#fullfill-balance"class="linkS linkS1">пополнить</a>
+                    {% if user_score.is_customer and user_score_balance > 0 %}
+                        <div class="col-lg-12">
+                            <a href="#" data-toggle="modal" data-target="#fullfill-balance" class="linkS linkS1">пополнить</a>
                         </div>
                     {% endif %}
 
-                    <div class="col-lg-12">
-                        <a href="#" data-toggle="modal" data-target="#withdraw-money"
-                           class="linkS linkS2">вывести средства</a>
-                    </div>
+                    {% if user_score.is_contractor %}
+                        <div class="col-lg-12">
+                            <a href="#" data-toggle="modal" data-target="#withdraw-money" class="linkS linkS2">вывести средства</a>
+                        </div>
+                    {% endif %}
 
                     <div id="withdraw-money" class="modal fade" role="dialog">
                         <div class="modal-dialog" role="document" style="width:900px;">
@@ -121,6 +122,12 @@
                                     <i class="fa fa-rub"></i>
                                 </td>
                             </tr>
+                        {% empty %}
+                          <tr>
+                          <td colspan="4">
+                            Платежей и/или списаний пока нет
+                          </td>
+                          </tr>
                         {% endfor %}
                     </table>
                 </div>

From 89211d3072c6ab32ecde23f1dc600096b93d755e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 29 Aug 2016 20:38:53 +0300
Subject: [PATCH 2/2] migrations merge

---
 common/migrations/0009_merge.py    | 16 ++++++++++++++++
 projects/migrations/0021_merge.py  | 16 ++++++++++++++++
 work_sell/migrations/0008_merge.py | 16 ++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 common/migrations/0009_merge.py
 create mode 100644 projects/migrations/0021_merge.py
 create mode 100644 work_sell/migrations/0008_merge.py

diff --git a/common/migrations/0009_merge.py b/common/migrations/0009_merge.py
new file mode 100644
index 0000000..f079aec
--- /dev/null
+++ b/common/migrations/0009_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('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
new file mode 100644
index 0000000..0885b46
--- /dev/null
+++ b/projects/migrations/0021_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0018_auto_20160829_1837'),
+        ('projects', '0020_stage_term'),
+    ]
+
+    operations = [
+    ]
diff --git a/work_sell/migrations/0008_merge.py b/work_sell/migrations/0008_merge.py
new file mode 100644
index 0000000..d0ccdb8
--- /dev/null
+++ b/work_sell/migrations/0008_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0007_auto_20160829_1837'),
+        ('work_sell', '0007_auto_20160829_1740'),
+    ]
+
+    operations = [
+    ]