Merge master -> artur

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>

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 = [

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

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>

work_sell/migrations/0008_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 = [
-        ('work_sell', '0007_auto_20160829_1740'),
         ('work_sell', '0007_auto_20160829_1837'),
+        ('work_sell', '0007_auto_20160829_1740'),
     ]
 
     operations = [