Merge branch 'setup' of https://bitbucket.org/PekopT/archilance into setup

api/urls.py

@@ -8,6 +8,7 @@ from .views import (
     UserViewSet,
     MessageViewSet,
     StageViewSet,
+    NoteViewSet,
 )
 
 
@@ -20,5 +21,6 @@ router.register(r'realties', RealtyViewSet)
 router.register(r'specializations', SpecializationViewSet)
 router.register(r'users', UserViewSet)
 router.register(r'message', MessageViewSet)
+router.register(r'note', NoteViewSet)
 
 urlpatterns = router.urls

api/views.py

@@ -18,9 +18,9 @@ from common.models import Location
 from common.serializers import LocationSerializer
 from common.filters import LocationFilterSet
 
-from chat.models import Message
+from chat.models import Message, Notes
-from chat.serializers import MessageSerializer
+from chat.serializers import MessageSerializer, NoteSerializer
-from chat.filters import MessageFilterSet
+from chat.filters import MessageFilterSet, NoteFilterSet
 
 
 class StageViewSet(ModelViewSet):
@@ -29,10 +29,6 @@ class StageViewSet(ModelViewSet):
     filter_class = StageFilterSet
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
-    # def put(self, request, *args, **kwargs):
-    #     # import code; code.interact(local=dict(globals(), **locals()))
-    #     return super().update(request, *args, **kwargs)
-
 
 class ProjectViewSet(ModelViewSet):
     queryset = Project.objects.all()
@@ -40,6 +36,12 @@ class ProjectViewSet(ModelViewSet):
     filter_class = ProjectFilterSet
 
 
+class NoteViewSet(ModelViewSet):
+    queryset = Notes.objects.all()
+    serializer_class = NoteSerializer
+    filter_class = NoteFilterSet
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
+
 class MessageViewSet(ModelViewSet):
     queryset = Message.objects.all()
     serializer_class = MessageSerializer
@@ -57,14 +59,12 @@ class MessageViewSet(ModelViewSet):
         return queryset
 
 
-
 class RealtyViewSet(ModelViewSet):
     queryset = Realty.objects.all()
     serializer_class = RealtySerializer
     filter_class = RealtyFilterSet
 
 
-
 class SpecializationViewSet(ModelViewSet):
     queryset = Specialization.objects.root_nodes()[0].get_descendants()
     # queryset = Specialization.objects # Migrate with this enabled

archilance/settings/base.py

@@ -52,6 +52,7 @@ LOCAL_APPS = [
     'users',
     'reviews',
     'chat',
+    'wallets',
 ]
 
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS

archilance/urls.py

@@ -18,6 +18,7 @@ urlpatterns = [
     url(r'^chat/', include('chat.urls')),
     url(r'^specializations/', include('specializations.urls')),
     url(r'^users/', include('users.urls')),
+    url(r'^common/', include('common.urls')),
     url(r'^users/', include('registration.backends.default.urls')),
 
     url(r'^admin/', admin.site.urls),

assets/css/extra.css

@@ -64,3 +64,21 @@
     background-color: #00bb7b;
     font-size: 17px;
 }
+
+.textAreaBlock2 input[type="text"] {
+    margin: 0;
+}
+
+
+.stepssBlock ul li.reserved::before {
+    background: rgba(0, 0, 0, 0) url("../img/reserved2.png") no-repeat scroll center center / cover ;
+    height: 16px;
+    width: 17px;
+}
+
+
+.stepssBlock ul li.unreserved::before {
+    background: rgba(0, 0, 0, 0) url("../img/reserved.png") no-repeat scroll center center / cover ;
+    height: 14px;
+    width: 13px;
+}

chat/filters.py

@@ -1,6 +1,6 @@
 from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter
 
-from .models import Message
+from .models import Message, Notes
 
 
 class MessageFilterSet(FilterSet):
@@ -12,3 +12,13 @@ class MessageFilterSet(FilterSet):
 
     class Meta:
         model = Message
+
+
+class NoteFilterSet(FilterSet):
+    text = AllLookupsFilter()
+    created = AllLookupsFilter()
+    sender = RelatedFilter('users.filters.UserFilterSet')
+    recipent = RelatedFilter('users.filters.UserFilterSet')
+
+    class Meta:
+        model = Notes

chat/serializers.py

@@ -20,7 +20,16 @@ class MessageSerializer(ModelSerializer):
         )
 
 
-# class NotesSerializer(ModelSerializer):
+class NoteSerializer(ModelSerializer):
-#
+
-#     class Meta:
+    class Meta:
-#         model = Notes
+        model = Notes
+
+        fields = (
+            'text',
+            'created',
+            'order',
+            'sender',
+            'recipent',
+        )
+

chat/templates/chat_contractor.html

@@ -8,6 +8,7 @@
             <div class="col-lg-12 allProjects">
                 <h1>Чат {{ request.user }} {{ request.user.pk }}</h1>
             </div>
+
             <div class="btnReadyBlock disTab">
                 <div class="triangle1"></div>
                 <div class="col-lg-6 col-lg-offset-3 tabsChat">
@@ -29,7 +30,9 @@
                     </div>
                 </div>
             </div>
+
             <div class="tab-content">
+               <!-- Tab1 contacts block -->
                 <div class="chatBlock disTab tab-pane fade in active" id="tab1">
                     <div class="col-lg-3 wrMessages">
                         <div class="messageBlock box-sizing disTab">
@@ -56,102 +59,46 @@
 
                         </div>
                     </div>
-                    <div class="col-lg-6 commChat" id="contact-chat">
-                        <div id="message-chat-space">
 
-                        </div>
+                    <div class="col-lg-6 commChat" id="contact-chat">
+                        <div id="message-chat-space"></div>
                         <form id="contact-chat-form">
                             <input type="hidden" value="{{ request.user.pk }}" name="senderId" id="senderId"/>
                             <input type="hidden" value="" name="recipentId" id="recipentId"/>
-
                             <textarea id="chat" name="chat_message" class="box-sizing"></textarea>
                             <div class="bunChat">
                                 <div class="setChat box-sizing">
                                     <p>Прикрепить файл</p>
-							<span>
+							        <span>Не более 10 файлов с общим объемом 500мб</span>
-								Не более 10 файлов с общим объемом 500мб
-							</span>
                                 </div>
-
                                 <a id="contact-chat-add-message" href="javascript:void(0)">отправить</a>
-
                             </div>
                         </form>
-
                     </div>
-                    <div class="col-lg-3 wrChat1">
-                        <div class="messageBlock box-sizing disTab">
-                            <p>Контакты</p>
-                            <div class="message">
-                                <div class="imgMess">
-                                    <img src="img/mess.png" alt="mess-image">
-                                </div>
-                                <p class="nameMess">
-                                    <a href="#">Иванов Петр Иванович</a>
-                                </p>
-                                <a href="javascript:void(0)" class="conMess">Контакты</a>
-                            </div>
-                        </div>
-                        <div class="col-lg-12 startChat">
-                            <div class="insetSC1">
-                                Начало:
-                                <span>Срок сдачи:</span>
-                            </div>
-                            <div class="insetSC2">
-                                13.0.2016
-                                <span>13.0.2016</span>
-                            </div>
-                        </div>
-                        <div class="col-lg-12 documentsChat">
-                            <p>Входящие документы</p>
-                            <ul>
-                                <li>
-                                    Архитерурное 2.jpg
-                                    <span>7мб</span>
-                                    <div></div>
-                                </li>
 
-                            </ul>
+                    <div class="col-lg-3 wrChat1">
-                            <a href="javascript:void(0)">
-                                Распечатать с помощью ресурса
-                            </a>
-                        </div>
                         <div class="textAreaBlock2 box-sizing disTab">
                             <p>Для заметок</p>
                             <textarea id="chat2"></textarea>
                             <a href="javascript:void()">сохранить</a>
                         </div>
-                        <div class="closeChat closeChat1">
-                            <a href="javascript:void(0)">
-                                Закрыть проект<br>и оставить отзыв
-                            </a>
-                        </div>
-                        <div class="closeChat closeChat2">
-                            <a href="javascript:void(0)">
-                                Закрыть проект<br>и оставить отзыв
-                            </a>
-                        </div>
                     </div>
                 </div>
+               <!-- End block Tab1 -->
+
+               <!-- Tab2 chat order block -->
                 <div class="chatBlock disTab tab-pane fade" id="tab2">
                     <div class="col-lg-3 wrMessages">
 
                         <div class="messageBlock box-sizing disTab">
                             <p>Заказы</p>
                             {% for order in orders %}
-                                <div class="orderBlock box-sizing order-block"
+                                <div class="orderBlock box-sizing order-block" data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
-                                     data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
                                     <span class="dimovChat"></span>
-                                    <p class="titleOB">
+                                    <p class="titleOB">{{ order }}</p>
-                                        {{ order }}
-                                    </p>
                                     <div class="hideOBB">
-                                        <p class="pOB">
+                                        <p class="pOB"><span>Исполнитель:</span> {{ request.user.get_full_name }}</p>
-                                            <span>Испонитель:</span> {{ request.user.get_full_name }}
+                                        <p class="pOB"><span>Чаты:</span> Иванов, Петров</p>
-                                        </p>
-                                        <p class="pOB">
-                                            <span>Чаты:</span> Иванов, Петров, Пенкин
-                                        </p>
                                         <a href="javascript:void(0)" class="linkChat11">
                                             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
                                             Полное описание заказа
@@ -163,27 +110,24 @@
 
                     </div>
                     <div class="col-lg-6 commChat">
-                        <div id="message-chat-order-space">
+                        <div id="message-chat-order-space"></div>
-                        </div>
                         <form id="chat-contractor-order">
-                            <input type="text" id="orderId"/>
+                            <input type="hidden" id="orderId"/>
-                            <input type="text" id="senderOrderId" value="{{ request.user.pk }}"/>
+                            <input type="hidden" id="senderOrderId" value="{{ request.user.pk }}"/>
-                            <input type="text" id="recipentOrderId"/>
+                            <input type="hidden" id="recipentOrderId"/>
 
                             <textarea id="chat" class="box-sizing"></textarea>
                             <div class="bunChat">
                                 <div class="setChat box-sizing">
                                     <p>Прикрепить файл</p>
-							<span>
+							        <span>Не более 10 файлов с общим объемом 500мб</span>
-								Не более 10 файлов с общим объемом 500мб
-							</span>
                                 </div>
                                 <a href="javascript:void(0)" id="order-chat-add-message">отправить</a>
                             </div>
                         </form>
-                    </div>
-                    <div class="col-lg-3 wrTAB">
 
+                    </div>
+                    <div class="col-lg-3 wrstepschat">
                         <p>Этапы работы</p>
                         <div class="stepssBlock box-sizing disTab">
                             <p class="titleStepss">1 / Согласование условий</p>
@@ -193,16 +137,33 @@
                         </div>
                         <div id="order-stages"></div>
 
+                        <div class="stepssBlock box-sizing disTab">
+                            <p class="titleStepss">2 / Резервирование</p>
+                            <p class="textStepss">
+                                Резервирование заказчиком суммы оплаты по заказ. Деньги перечисляются и хранятся на
+                                сайте.
+                            </p>
+                            <ul class="stages-paid"></ul>
+                        </div>
+
+
                         <div class="textAreaBlock2 box-sizing disTab">
+                            <ul class="notes-block">
+                            </ul>
                             <p>Для заметок</p>
-                            <textarea id="chat2"></textarea>
+                            <form id="add-form-order-note">
-                            <a href="javascript:void()">сохранить</a>
+                                <textarea id="chat2" name="text"></textarea>
-                        </div>
+                                <input type="hidden" name="order" id="orderNote" value="" />
-                        <div class="linkChatB box-sizing disTab">
+                                <input type="hidden" name="sender" id="senderNote" value="{{ request.user.pk }}" />
-                            <a href="javascript:void(0)">предложить проект</a>
+                                <input type="hidden" name="recipent" id="recipentNote" value="" />
+                                <a href="javascript:void()" id="add-note-button">сохранить</a>
+                            </form>
                         </div>
                     </div>
                 </div>
+               <!-- End block Tab2-->
+
+               <!-- Tab3 groups block -->
                 <div class="chatBlock disTab tab-pane fade" id="tab3">
                     <div class="col-lg-3 wrMessages">
                         <div class="messageBlock box-sizing disTab">
@@ -250,9 +211,6 @@
                         </div>
                         <div id="order-stages"></div>
 
-                        <div class="textAreaBlock2 FFD box-sizing disTab">
-                            <a href="javascript:void()">согласовать</a>
-                        </div>
                         <div class="stepssBlock box-sizing disTab">
                             <p class="titleStepss">2 / Резервирование</p>
                             <p class="textStepss">
@@ -272,6 +230,7 @@
                         </div>
                     </div>
                 </div>
+               <!-- End block Tab3-->
             </div>
             {% include 'partials/footer.html' %}
         </div>
@@ -282,10 +241,6 @@
 {% block js_block %}
     {#   <script type="text/javascript" src="{% static 'js/chat.js' %}"></script>#}
     <script type="text/javascript">
-        /**
-         * Created by mukhtar on 04.07.16.
-         */
-
 
         var SocketHandler = function () {
             var userId = {{ request.user.pk }};
@@ -339,7 +294,6 @@
                 sock.send(JSON.stringify(data));
                 var textareaMessage = document.getElementById("message");
                 textareaMessage.value = "";
-
             }
 
         }
@@ -350,12 +304,28 @@
             var form = document.getElementById('message_form');
             var csrftoken = getCookie('csrftoken');
 
+            $("#approve-stages").on('click', function(){
+                $(".stage-block-approve").each(function(){
+                   var stageId = $(this).attr('data-id');
+
+                });
+            });
+
             // Вытащить сообщения для чата заказа
             $('.order-block').on('click', function () {
+                $('.order-block').each(function () {
+                    $(this).removeClass('orAct');
+                });
+                $(this).addClass('orAct');
+
                 var orderId = $(this).attr('data-id');
                 var recipentId = $(this).attr('data-recipent-id');
                 $("#chat-contractor-order #orderId").val(orderId);
+                $("#add-form-order-note #orderNote").val(orderId);
+
                 $("#chat-contractor-order #recipentOrderId").val(recipentId);
+                $("#add-form-order-note #recipentNote").val(recipentId);
+
                 var inbox = document.getElementById('message-chat-order-space');
                 inbox.innerHTML = '';
 
@@ -366,7 +336,6 @@
                     dataType: 'json',
                     success: function (json) {
                         $.each(json.results, function (i, v) {
-
                             var senderName = 'Вы';
                             var className = 'youChat';
                             if (v.sender.id !== currentChatUser) {
@@ -380,6 +349,21 @@
                     }
                 });
 
+                $.ajax({
+                    url: '/api/note/',
+                    type: 'GET',
+                    data: {csrfmiddlewaretoken: csrftoken, 'order': orderId},
+                    dataType: 'json',
+                    success: function (json) {
+                        console.log(json.results);
+                        var noteHtmlInbox = '';
+                        $.each(json.results, function (i, v) {
+                            noteHtmlInbox += '<li>'+ v.text +'<li>';
+
+                        });
+                        $(".notes-block").html(noteHtmlInbox);
+                    }
+                });
 
                 $.ajax({
                     url: '/api/stages/',
@@ -389,18 +373,52 @@
                     success: function (json) {
                         console.log(json.results);
                         var htmlInbox = "";
-                        $.each(json.results, function (i, v) {
+                        var stagesReservedHtml = "";
-                            htmlInbox += '<div class="numberStepp box-sizing"><div class="insetNumStepp">' +
+                        if (json.results.length > 0) {
-                                    '<p class="titleNumStepp"><span>Этап '+ v.pos +'</span>'+ v.name +'</p>' +
+
-                                    '<p class="textNumStepp">Результаты этапа:'+ v.result+'</p><div>' +
+                            $.each(json.results, function (i, v) {
-                                    '<p>до 16.03.2015</p><span>'+ v.cost +'<i class="fa fa-rub"></i></span></div></div></div>';
+                                if(v.is_paid){
-                        });
+                                    stagesReservedHtml += '<li class="reserved">Сумма за этап '+ i +'.Зарезервирована.</li>';
+                                }else{
+                                    stagesReservedHtml += '<li class="unreserved">Сумма за этап '+ i +'.Не зарезервирована.</li>';
+                                }
+                                htmlInbox += '<div data-id="' + v.id + '" class="numberStepp box-sizing stage-block-approve"><div class="insetNumStepp">' +
+                                        '<p class="titleNumStepp"><span>Этап ' + v.pos + '</span>' + v.name + '</p>' +
+                                        '<p class="textNumStepp">Результаты этапа:' + v.result + '</p><div>' +
+                                        '<p>'+ v.status+'</p><span>' + v.cost + '<i class="fa fa-rub"></i></span></div></div></div>';
+                            });
+                            htmlInbox += '<div class="textAreaBlock2 FFD box-sizing disTab"><a id="approve-stages" href="javascript:void()">согласовать</a></div>';
+
+                        }
                         $("#order-stages").html(htmlInbox);
+                        $(".stages-paid").html(stagesReservedHtml);
+
                     }
                 });
 
             });
 
+            $('#add-note-button').on('click', function(){
+                $.ajax({
+                    url: '/api/note/',
+                    type: 'POST',
+                    beforeSend: function (xhr) {
+                            xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'))
+                    },
+                    data:$("#add-form-order-note").serialize(),
+                    dataType: 'json',
+                    success: function (json) {
+                        console.log(json);
+                        $("#add-form-order-note #chat2").val("");
+
+                    },
+                    error: function(e){
+                        console.log('error');
+                        console.log(e);
+                    }
+                });
+            });
+
             // Вытащить сообщения для конактов
             $('.user-block').on('click', function () {
                 var userId = $(this).attr('data-id');

chat/templates/chat_customer.html

@@ -24,6 +24,7 @@
                 </div>
             </div>
             <div class="tab-content">
+            <!-- Tab1 (contacts block)-->
                 <div class="chatBlock disTab tab-pane fade in active" id="tab1">
                     <div class="col-lg-3 wrMessages">
                         <div class="messageBlock box-sizing disTab">
@@ -52,8 +53,8 @@
                         <div id="message-chat-space">
                         </div>
                         <form id="contact-chat-form">
-                            <input type="text" value="{{ request.user.pk }}" name="senderId" id="senderId"/>
+                            <input type="hidden" value="{{ request.user.pk }}" name="senderId" id="senderId"/>
-                            <input type="text" value="" name="recipentId" id="recipentId"/>
+                            <input type="hidden" value="" name="recipentId" id="recipentId"/>
 
                             <textarea id="chat" name="chat_message" class="box-sizing"></textarea>
                             <div class="bunChat">
@@ -71,77 +72,29 @@
 
                     </div>
                     <div class="col-lg-3 wrChat1">
-                        <div class="messageBlock box-sizing disTab">
-                            <p>Контакты</p>
-                            <div class="message">
-                                <div class="imgMess">
-                                    <img src="img/mess.png" alt="mess-image">
-                                </div>
-                                <p class="nameMess">
-                                    <a href="#">Иванов Петр Иванович</a>
-                                </p>
-                                <a href="javascript:void(0)" class="conMess">Контакты</a>
-                            </div>
-                        </div>
-                        <div class="col-lg-12 startChat">
-                            <div class="insetSC1">
-                                Начало:
-                                <span>Срок сдачи:</span>
-                            </div>
-                            <div class="insetSC2">
-                                13.0.2016
-                                <span>13.0.2016</span>
-                            </div>
-                        </div>
-                        <div class="col-lg-12 documentsChat">
-                            <p>Входящие документы</p>
-                            <ul>
-                                <li>
-                                    Архитерурное 2.jpg
-                                    <span>7мб</span>
-                                    <div></div>
-                                </li>
-                            </ul>
-                            <a href="javascript:void(0)">
-                                Распечатать с помощью ресурса
-                            </a>
-                        </div>
                         <div class="textAreaBlock2 box-sizing disTab">
                             <p>Для заметок</p>
                             <textarea id="chat2"></textarea>
                             <a href="javascript:void()">сохранить</a>
                         </div>
-                        <div class="closeChat closeChat1">
-                            <a href="javascript:void(0)">
-                                Закрыть проект<br>и оставить отзыв
-                            </a>
-                        </div>
-                        <div class="closeChat closeChat2">
-                            <a href="javascript:void(0)">
-                                Закрыть проект<br>и оставить отзыв
-                            </a>
-                        </div>
                     </div>
                 </div>
+            <!-- End block Tab1(contacts block)-->
+
+            <!-- Tab2 (chat order block)-->
                 <div class="chatBlock disTab tab-pane fade" id="tab2">
                     <div class="col-lg-3 wrMessages">
-
                         <div class="messageBlock box-sizing disTab">
                             <p>Заказы</p>
                             {% for order in orders %}
                                 <div class="orderBlock box-sizing order-block"
                                      data-recipent-id="{{ order.order.contractor.pk }}" data-id="{{ order.order.id }}">
                                     <span class="dimovChat"></span>
-                                    <p class="titleOB">
+                                    <p class="titleOB">{{ order }}</p>
-                                        {{ order }}
-                                    </p>
                                     <div class="hideOBB">
                                         <p class="pOB">
                                             <span>Испонитель:</span> {{ order.order.contractor.get_full_name }}
                                         </p>
-                                        {#								<p class="pOB">#}
-                                        {#									<span>Чаты:</span> Иванов, Петров, Пенкин#}
-                                        {#								</p>#}
                                         <a href="javascript:void(0)" class="linkChat11">
                                             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
                                             Полное описание заказа
@@ -174,49 +127,89 @@
 
 
                     </div>
-                    <div class="col-lg-3 wrstepschat">
+                    <div class="col-lg-3 wrstepschat" id="order-stages-tab">
                         <p>Этапы работы</p>
                         <div class="stepssBlock box-sizing disTab">
                             <p class="titleStepss">1 / Согласование условий</p>
                             <p class="textStepss">
                                 Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем.
                             </p>
-                            <p></p>
-
                         </div>
+
+{#                        <div class="stepssBlock box-sizing disTab">#}
+{#                            <p class="textStepss">#}
+{#                                Какое кол-во этапов подразумевает работа? <input type="text" id="countStage" size="3"/>#}
+{#                            </p>#}
+{#                            <div id="formsetStage" class="numberStepp box-sizing" style="display: none;">#}
+{#                            <div class="insetNumStepp" id="stage1">#}
+{#                                <p class="titleNumStepp">#}
+{#                                    <span>Этап </span>#}
+{#                                </p>#}
+{#                                <div class="textAreaBlock2 box-sizing disTab">#}
+{#                                    <form class="new-stages-form">#}
+{#                                        <label>Название</label>#}
+{#                                            <input type="text" name="name"  />#}
+{#                                        <label>Результат</label>#}
+{#                                            <input type="text" name="result" />#}
+{#                                        <label>Стоимость</label>#}
+{#                                            <input type="text" name="cost" />#}
+{#                                        <input type="hidden" name="order" class="orderStagesInput"/>#}
+{#                                    </form>#}
+{#                                </div>#}
+{#                            </div>#}
+{##}
+
+{#                        </div>#}
+{##}
+{#                        </div>#}
+{#                        <div class="textAreaBlock2 FFD box-sizing disTab">#}
+{#                            <a href="javascript:void()">согласовать</a>#}
+{#                        </div>#}
+
+                        <div id="order-stages"></div>
+
                         <div class="stepssBlock box-sizing disTab">
-                            <p class="textStepss">
+						    <p class="titleStepss">2 / Резервирование</p>
-                                Какое кол-во этапов подразумевает работа? <input type="text" id="countStage" size="3"/>
+						    <p class="textStepss">
-                            </p>
+							    Резервирование заказчиком суммы оплаты по заказ. Деньги перечисляются и хранятся на сайте.
-                        <div id="formsetStage" class="numberStepp box-sizing" style="display: none;">
+						    </p>
-                            <div class="insetNumStepp" id="stage1">
+
-                                <p class="titleNumStepp">
+                            <div class="textAreaBlock2 FFD box-sizing disTab">
-                                    <span>Этап </span>
+						        <a href="#" data-toggle="modal" data-target="#reserve-stage-modal">Зарезирвировать</a>
-                                </p>
+					        </div>
-                                <div class="textAreaBlock2 box-sizing disTab">
+
-                                    <form class="new-stages-form">
+					    </div>
-                                        <label>Название</label>
+
-                                            <input type="text" name="name"  />
+                        <!-- Зарезервировать средства (модальное окно)-->
-                                        <label>Результат</label>
+                                <div id="reserve-stage-modal" class="modal fade">
-                                            <input type="text" name="result" />
+                                    <div class="modal-dialog" style="width:900px;">
-                                        <label>Стоимость</label>
+                                        <div class="modal-content">
-                                            <input type="text" name="cost" />
+                                            <div class="modal-header">
-                                        <input type="hidden" name="order" class="orderStagesInput"/>
+                                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                                    </form>
+                                                <h4 class="modal-title">Зарезервировать средства</h4>
+                                            </div>
+
+                                            <div class="modal-body">
+                                                <div class="textAreaBlock2 text-nn box-sizing disTab">
+                                                </div>
+
+                                                <div class="searchF1 polsF1 polsFF links-filter">
+                                                    <input class="btn-submit-link" type="submit" value="Сохранить">
+                                                </div>
+                                            </div>
+                                            <div class="modal-footer"></div>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
+                                <!-- Конец блока  -->
 
-                            <div class="textAreaBlock2 box-sizing disTab">
+					    <div class="stepssBlock box-sizing disTab">
-                                <a href="javascript:void()" id="addStagesForm">сохранить</a>
+						<p class="titleStepss">3 / Выполнение работы</p>
-                            </div>
+						<p class="textStepss">
-                        </div>
+							Процесс выполнения задания в заказе до получения заказчиком итогового результата работы.
+						</p>
+					</div>
 
-                        </div>
-                        <div class="textAreaBlock2 FFD box-sizing disTab">
-                            <a href="javascript:void()">согласовать</a>
-                        </div>
-
-                        <div id="order-stages"></div>
 
                         <div class="textAreaBlock2 box-sizing disTab">
                             <p>Для заметок</p>
@@ -228,6 +221,7 @@
                         </div>
                     </div>
                 </div>
+            <!-- End block (chat order block) -->
             </div>
             {% include 'partials/footer.html' %}
         </div>
@@ -245,8 +239,11 @@
             var csrftoken = getCookie('csrftoken');
 
 
-            $("#addStagesForm").on('click',function(){
+            $("#order-stages").on('click', "#addStagesForm", function(){
-               $(".new-stages-form").each(function(i,v){
+                $(".new-stages-form").each(function(i,v){
+                   console.log($(this).serialize());
+                    alert($(this).serialize());
+
                    $.ajax({
                         url: '/api/stages/',
                         type: 'POST',
@@ -259,6 +256,7 @@
                             console.log(json);
                         },
                         error: function(e){
+                            console.log('error');
                             console.log(e);
                         }
                     });
@@ -266,19 +264,20 @@
                });
             });
 
-            $('#countStage').on('change', function (e) {
+            $('#order-stages-tab').on('change', '#countStage', function(){
-                $(".stages_form").each(function () {
-                    $(this).remove();
-                });
                 var countStage = parseInt($(this).val());
+                var updateFormStages = $(".update-stages-form");
+
+                alert(updateFormStages.length);
+                alert(typeof updateFormStages.length);
                 var limitCount = countStage + 1;
                 for (var i = 2; i < limitCount; i++) {
                     var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form");
                     $("#stage1").after(stageCopy);
                 }
-
             });
 
+
             $('.order-block').on('click', function () {
                 $("#chat-order-add").css("display", "block");
                 $("#formsetStage").css("display","block");
@@ -323,7 +322,29 @@
                     data: {csrfmiddlewaretoken: csrftoken, 'order': orderId},
                     dataType: 'json',
                     success: function (json) {
+                        var stageCount = json.results.length;
+                        if (stageCount == 0){
+                            stageCountVal = 1;
+                        }else{
+                            stageCountVal = stageCount;
+                        }
+
                         var htmlInbox = "";
+
+                        var htmlInboxStage = '<p class="textStepss">Какое кол-во этапов подразумевает работа? ' +
+                                '<input type="text" id="countStage" value="'+ stageCountVal +'"size="3"/></p>';
+
+                        if (stageCount == 0){
+                                htmlInboxStage += '<div class="numberStepp box-sizing" id="stage1">' +
+                                        '<p>Этап <span class="stage-span-id">1</span></p><form class="new-stages-form" id="stage-form">' +
+                                        '<label for="">Название</label><input class="form-control" name="name" type="text"  />' +
+                                        '<label for="">Цена</label><input class="form-control" name="cost" type="text"  />' +
+                                        '<input class="form-control" name="order" type="text" value="'+ orderId +'" class="orderStagesInput"/> />' +
+                                        '<label for="">Срок</label><input class="form-control" name="term" type="text" />' +
+                                        '<label for="">Результат</label><input class="form-control" name="result" type="text"  />' +
+                                        '</form></div>';
+                        }
+                        var statusNotAgreed = true;
                         $.each(json.results, function (i, v) {
                             if (v.status == "not_agreed") {
                                 htmlInbox += '<div class="numberStepp box-sizing">' +
@@ -335,6 +356,8 @@
                                         '<label for="">Результат</label><input class="form-control" type="text" value="'+ v.result +'" />' +
                                         '</form></div>';
                             } else {
+                                statusNotAgreed = false;
+                                htmlInboxStage = "";
                                 htmlInbox += '<div class="numberStepp box-sizing"><div class="insetNumStepp">' +
                                         '<p class="titleNumStepp"><span>Этап ' + v.pos + '</span>' + v.name + '</p>' +
                                         '<p class="textNumStepp">Результаты этапа:' + v.result + '</p><div>' +
@@ -342,6 +365,13 @@
 
                             }
                         });
+
+                        if (statusNotAgreed) {
+                            htmlInbox += '<div class="box-sizing disTab" style="text-align:center;"><div class="checkbox"><input type="checkbox" style="opacity:1">Перейти в режим безопасной сделки' +
+                                    '</div></div><div class="textAreaBlock2 box-sizing disTab">' +
+                                    '<a href="javascript:void()" id="addStagesForm">отправить на согласование</a> </div>';
+                        }
+                        htmlInbox = htmlInboxStage + htmlInbox;
                         $("#order-stages").html(htmlInbox);
                     }
                 });
@@ -486,7 +516,6 @@
                 textareaMessage.value = "";
 
             }
-
         }
 
     </script>

common/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from mptt.admin import MPTTModelAdmin
 
-from .models import Location, MainPage, Settings
+from .models import Location, MainPage, Settings, PrintOrder, PrintDocuments
 
 class LocationAdmin(MPTTModelAdmin):
     readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level')
@@ -9,3 +9,5 @@ class LocationAdmin(MPTTModelAdmin):
 admin.site.register(Location, LocationAdmin)
 admin.site.register(MainPage)
 admin.site.register(Settings)
+admin.site.register(PrintOrder)
+admin.site.register(PrintDocuments)

common/forms.py

@@ -0,0 +1,28 @@
+from django import forms
+from .models import PrintOrder, PrintDocuments
+
+
+class PrintOrderForm(forms.ModelForm):
+    files = forms.ModelMultipleChoiceField(
+        queryset=PrintDocuments.objects.none(),
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
+    )
+
+    class Meta:
+        model = PrintOrder
+
+        fields = (
+            'sender',
+            'phone',
+            'address',
+            'shipping',
+            'files',
+            'text',
+        )
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop('request')
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields['files'].queryset = self.instance.files

common/migrations/0002_auto_20160729_1530.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-29 12:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PrintDocuments',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', models.FileField(upload_to='common/printdocuments/')),
+            ],
+            options={
+                'verbose_name': 'Документы на распечатку',
+                'verbose_name_plural': 'Документы на распечатку',
+            },
+        ),
+        migrations.CreateModel(
+            name='PrintOrder',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sender', models.CharField(max_length=150)),
+                ('phone', models.CharField(max_length=50)),
+                ('address', models.CharField(max_length=255)),
+                ('created', models.DateTimeField(default=django.utils.timezone.now)),
+                ('shipping', models.CharField(choices=[('self_delivery', 'Самовывоз'), ('courier_delivery', 'Доставка курьером')], default='self_delivery', max_length=30)),
+                ('text', models.TextField()),
+            ],
+            options={
+                'verbose_name': 'Заявка на распечатку',
+                'verbose_name_plural': 'Заявки на распечатку',
+            },
+        ),
+        migrations.AddField(
+            model_name='printdocuments',
+            name='printorder',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='print_documents', to='common.PrintOrder'),
+        ),
+    ]

common/migrations/0003_auto_20160729_1747.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-29 14:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0002_auto_20160729_1530'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='settings',
+            name='document_send_description',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='settings',
+            name='document_send_email',
+            field=models.EmailField(default='muhtarzubanchi05@gmail.com', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='settings',
+            name='document_send_time_remove',
+            field=models.IntegerField(default=14),
+        ),
+    ]

common/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 from mptt.models import TreeForeignKey, MPTTModel
 
 
@@ -36,6 +37,9 @@ class MainPage(models.Model):
 
 class Settings(models.Model):
     time_notification = models.IntegerField(default=180)
+    document_send_email = models.EmailField(max_length=100, default="muhtarzubanchi05@gmail.com")
+    document_send_description = models.TextField(blank=True)
+    document_send_time_remove = models.IntegerField(default=14)
 
     def __str__(self):
         return 'Настройки сайта'
@@ -43,3 +47,35 @@ class Settings(models.Model):
     class Meta:
         verbose_name = 'Настройки сайта'
         verbose_name_plural = 'Настройки сайта'
+
+
+class PrintOrder(models.Model):
+    SHIPPINGS = (
+        ('self_delivery', 'Самовывоз'),
+        ('courier_delivery', 'Доставка курьером'),
+    )
+    sender = models.CharField(max_length=150)
+    phone = models.CharField(max_length=50)
+    address = models.CharField(max_length=255)
+    created = models.DateTimeField(default=timezone.now)
+    shipping = models.CharField(max_length=30, default='self_delivery', choices=SHIPPINGS)
+    text = models.TextField()
+
+    def __str__(self):
+        return self.sender
+
+    class Meta:
+        verbose_name = 'Заявка на распечатку'
+        verbose_name_plural = 'Заявки на распечатку'
+
+
+class PrintDocuments(models.Model):
+    printorder = models.ForeignKey(PrintOrder, related_name='print_documents')
+    file = models.FileField(upload_to='common/printdocuments/')
+
+    def __str__(self):
+        return self.file.url
+
+    class Meta:
+        verbose_name = 'Документы на распечатку'
+        verbose_name_plural = 'Документы на распечатку'

common/templates/document_email.html

@@ -0,0 +1,4 @@
+
+Welcome {{ username }}!
+
+Your username is {{ username }} and your password is {{ files }}.

common/templates/printdocument_create.html

@@ -0,0 +1,100 @@
+{% extends 'partials/base.html' %}
+{% load staticfiles %}
+{% load thumbnail %}
+{% block content %}
+    {% include 'partials/header.html' %}
+    <div class="container mainScore">
+        <div class="row">
+            <h1>Услуга по распечатке документов</h1>
+            <form method="POST" enctype="multipart/form-data" novalidate>
+                {% csrf_token %}
+
+                <div class="chatBlock new-rass new-rass2 disTab">
+                    <div class="col-lg-7">
+                        <p class="new-pp new-pp3">Формирование заказа</p>
+
+                        {% if form.non_field_errors %}
+                            <div class="new-pp3" style="color: red; margin-top: 70px">{{ form.non_field_errors }}</div>
+                        {% endif %}
+                        <div class="col-lg-3 wrChat1">
+
+                            <div id="fileUploadContainer" class="col-lg-12 documentsChat">
+                                <div class="upload">
+                                    <p id="fileUploadAddBtn" style="margin: 0">+ добавить файл (до 100 файлов)</p>
+                                </div>
+
+                                <ul class="list-new-new">
+                                    <li class="file-upload-widget" style="display: none">
+                                        <input type="file" name="new_files" class="file-upload-input"
+                                               style="position: absolute; top: -1000px; left: -1000px">
+                                        <p class="file-upload-label"></p>
+                                        <div class="file-upload-remove-btn"></div>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+
+                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                            <p>Описание <span style="color: red">{{ form.text.errors.as_text }}</span></p>
+                            <textarea name="{{ form.text.html_name }}" id="text-new">{{ form.text.value }}</textarea>
+                        </div>
+
+                     <div class="searchF1 polsF1 polsFF radio-afer">
+                            <div class="col-lg-6">
+                                <label>
+                                    <input
+                                        type="radio"
+                                        name="{{ form.shipping.html_name }}"
+                                        value="self_delivery">
+                                    <span></span>
+                                </label>
+                                <p class="text-afer">Самовывоз</p>
+                            </div>
+
+                            <div class="col-lg-6">
+                                <label>
+                                    <input
+                                        type="radio"
+                                        name="{{ form.shipping.html_name }}"
+                                        value="courier_delivery">
+
+                                    <span></span>
+                                </label>
+
+                                <p class="text-afer">Доставка курьером</p>
+
+                            </div>
+                        </div>
+
+                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                            <p>Получатель<span style="color: red">{{ form.sender.errors.as_text }}</span></p>
+                            <input type="text" class="box-sizing" name="{{ form.sender.html_name }}"
+                                   value="{{ form.sender.value }}">
+                        </div>
+
+                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                            <p>Телефон<span style="color: red">{{ form.phone.errors.as_text }}</span></p>
+                            <input type="text" class="box-sizing" name="{{ form.phone.html_name }}"
+                                   value="{{ form.phone.value }}">
+                        </div>
+
+                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                            <p>Адрес<span style="color: red">{{ form.address.errors.as_text }}</span></p>
+                            <input type="text" class="box-sizing" name="{{ form.address.html_name }}"
+                                   value="{{ form.address.value }}">
+                        </div>
+
+                        <div class="searchF1 polsF1 polsFF links-filter">
+                            <input class="btn-submit-link" type="submit" value="Отправить">
+                        </div>
+
+                    </div>
+                    <div class="col-lg-5">
+                        <p class="new-pp new-pp3">Описание услуги и расценки</p>
+                    </div>
+                </div>
+            </form>
+            {% include 'partials/footer.html' %}
+        </div>
+    </div>
+{% endblock %}

common/urls.py

@@ -0,0 +1,11 @@
+from django.conf import urls
+
+from .views import (
+    PrintDocumentCreate,
+)
+
+app_name = 'common'
+
+urlpatterns = [
+    urls.url(r'^printdocument/create/$', PrintDocumentCreate.as_view(), name='create'),
+]

common/views.py

@@ -1,3 +1,49 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.contrib import messages
+from django.core.mail import send_mail
+from django.template.loader import get_template
+from django.template import Context
+from django.http import HttpResponse
+from django.views.generic import View
+from archilance.mixins import BaseMixin
 
-# Create your views here.
+from .forms import PrintOrderForm
+from .models import PrintDocuments, PrintOrder
+
+
+class PrintDocumentCreate(BaseMixin, View):
+    form_class = PrintOrderForm
+    template_name = 'printdocument_create.html'
+
+    def get(self, request, *args, **kwargs):
+        form = self.form_class(request=request)
+        return render(request, self.template_name, {'form': form})
+
+    def post(self, request, *args, **kwargs):
+        form = self.form_class(request.POST, request.FILES, request=request)
+        if form.is_valid():
+            print_order = form.save(commit=False)
+            print_order.save()
+
+            for file in request.FILES.getlist('new_files'):
+                print_doc = PrintDocuments.objects.create(file=file, printorder=print_order)
+                print_doc.save()
+
+            send_mail('Заявка на распечатку',
+                      get_template('document_email.html').render(
+                          {
+                              'username': 'Mukhtar',
+                              'files': 'This is files list'
+                          }
+                      ),
+                      'dagdahzub@mail.ru',
+                      ['muhtarzubanchi05@gmail.com'],
+                      fail_silently=True
+            )
+            messages.info(request, 'Заявка на распечатку принята')
+            return redirect('common:create')
+            # import code; code.interact(local=dict(globals(), **locals()))
+        else:
+            context = self.get_context_data(**kwargs)
+            context.update({'form': form})
+            return render(request, self.template_name, context)

projects/filters.py

@@ -65,6 +65,7 @@ class StageFilterSet(FilterSet):
     status = AllLookupsFilter()
     pos = AllLookupsFilter()
     order = RelatedFilter('projects.filters.OrderFilterSet')
+    is_paid = AllLookupsFilter()
 
     class Meta:
         model = Stage

projects/migrations/0005_auto_20160726_1957.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-26 16:57
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0004_auto_20160726_1931'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stage',
+            name='created',
+            field=models.DateTimeField(default=datetime.datetime(2016, 7, 26, 16, 57, 39, 517305, tzinfo=utc)),
+        ),
+    ]

projects/migrations/0006_auto_20160727_1835.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-27 15:35
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0005_auto_20160726_1957'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stage',
+            name='is_paid',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='stage',
+            name='created',
+            field=models.DateTimeField(default=datetime.datetime(2016, 7, 27, 15, 35, 21, 468300, tzinfo=utc)),
+        ),
+    ]

projects/migrations/0007_auto_20160727_1835.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-27 15:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0006_auto_20160727_1835'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stage',
+            name='created',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

projects/models.py

@@ -165,8 +165,9 @@ class Stage(models.Model):
     term = models.IntegerField(default=0)
     term_type = models.CharField(max_length=10, choices=TERMS, default='hour')
     status = models.CharField(choices=STATUSES, max_length=30, default='not_agreed')
-    created = models.DateTimeField(default=timezone.now())
+    created = models.DateTimeField(default=timezone.now)
     pos = models.IntegerField(default=0, null=True, blank=True)
+    is_paid = models.BooleanField(default=False)
 
     def __str__(self):
         return self.name

projects/serializers.py

@@ -76,6 +76,7 @@ class StageSerializer(ModelSerializer):
             'result',
             'pos',
             'status',
+            'is_paid',
 
         )
 

templates/partials/base.html

@@ -68,6 +68,8 @@
 <script src='{% static "js/main.js" %}'></script> <!-- Файл верстальщика -->
 <script src='{% static "index.js" %}'></script> <!-- Файл программистов -->
 
-{% block js_block %}{% endblock %}
+{% block js_block %}
+
+{% endblock %}
 </body>
 </html>

users/serializers.py

@@ -10,7 +10,7 @@ class UserSerializer(ModelSerializer):
         
         fields = (
             'avatar',
-            'contractor_financial_info',
+            'financial_info',
             'contractor_specializations',
             'contractor_status',
             'created',

users/templates/contractor_profile.html

@@ -287,7 +287,34 @@
                                 <div class="pluss-block">
                                     {{ contractor.contractor_resume.text }}
 
+                                     <a href="#" data-toggle="modal" data-target="#resume-text-edit">Редактировать</a>
                                 </div>
+
+                                <!-- Редактирование текста резюме (модальное окно)-->
+                                <div id="resume-text-edit" class="modal fade">
+                                    <div class="modal-dialog" style="width:900px;">
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                                                <h4 class="modal-title">Редактировать текст резюме</h4>
+                                            </div>
+
+                                            <div class="modal-body">
+                                                <div class="textAreaBlock2 text-nn box-sizing disTab">
+                                                        <p>Описание резюме</p>
+                                                        <textarea name="" id="text-new">{{ contractor.contractor_resume.text }}</textarea>
+                                                </div>
+
+                                                <div class="searchF1 polsF1 polsFF links-filter">
+                                                    <input class="btn-submit-link" type="submit" value="Сохранить">
+                                                </div>
+                                            </div>
+                                            <div class="modal-footer"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!-- Конец блока (resume-modal)-->
+
                                 <div class="gal-pluss">
                                     <div class="inset-gp">
                                         <p class="title-gp">Дипломы / Сертификаты</p>
@@ -459,14 +486,16 @@
 
                 });
             });
-
-
             var url = '/work_sell/basic/';
             var csrftoken = $.cookie('csrftoken');
             $('#fileupload').fileupload({
                 url: url,
                 crossDomain: false,
                 beforeSend: function (xhr, settings) {
+                    $('#progress .progress-bar').css(
+                            'width',
+                            '0%'
+                    );
                     if (!csrfSafeMethod(settings.type)) {
                         xhr.setRequestHeader("X-CSRFToken", csrftoken);
                     }
@@ -475,7 +504,12 @@
                 done: function (e, data) {
                     console.log(data);
                     $.each(data.result.files, function (index, file) {
-                        var img = $('<img style="width:200px;height:200px;">').attr('src', file.url).appendTo("#files");
+                        var img = $('<img style="width:200px;height:200px;margin:10px;">').attr('src', file.url).appendTo("#files");
+                        console.log(file);
+                        var currentValue = $("#upload-files-pk").val();
+                        currentValue += file.id + ';';
+                        $("#upload-files-pk").val(currentValue);
+
                     });
                 },
                 progressall: function (e, data) {

users/templates/portfolio_create_form.html

@@ -77,13 +77,32 @@
         </div>
 
         <div class="polsF1 polsF2 disTab">
-            <input type="file" name="{{ portfolio_form.img.html_name }}"  >
+            <input type="hidden" name="" id="upload-files-pk" value="" />
         </div>
 
+    <!-- The fileinput-button span is used to style the file input field as button -->
+
+{#    <span class="btn btn-success fileinput-button">#}
+{#        <i class="glyphicon glyphicon-plus"></i>#}
+{#        <span>Выберите файлы</span>#}
+{#        <!-- The file input field used as target for the file upload widget -->#}
+{#        <input id="fileupload" type="file" name="file" multiple>#}
+{#    </span>#}
+        <input id="fileupload" type="file" name="file" multiple>
+
+
+    <br>
+    <br>
+    <!-- The global progress bar -->
+    <div id="progress" class="progress">
+        <div class="progress-bar progress-bar-success"></div>
+    </div>
+    <!-- The container for the uploaded files -->
+    <div id="files" class="files"></div>
+    <br>
         <div class="searchF1 polsF1 polsFF links-filter">
                 <input class="btn-submit-link" type="submit" value="Разместить портфолио">
-            </div>
+        </div>
-
     </form>
 </div>
 

users/templates/worksell_create_form.html

@@ -72,12 +72,12 @@
        </div>
 
         <div class="polsF1 polsF2 disTab">
-            <input type="text" name="{{ worksell_form.contractor.html_name }}" value="{{ request.user.pk }}" />
+            <input type="hidden" name="{{ worksell_form.contractor.html_name }}" value="{{ request.user.pk }}" />
         </div>
 
-        <div class="polsF1 polsF2 disTab">
+{#        <div class="polsF1 polsF2 disTab">#}
-            <input type="file" name="{{ worksell_form.img.html_name }}"  >
+{#            <input type="file" name="{{ worksell_form.img.html_name }}"  >#}
-        </div>
+{#        </div>#}
 
 
     <!-- The fileinput-button span is used to style the file input field as button -->

wallets/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from .models import InvoiceHistory
+
+admin.site.register(InvoiceHistory)

wallets/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class WalletsConfig(AppConfig):
+    name = 'wallets'

wallets/migrations/0001_initial.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-27 15:35
+from __future__ import unicode_literals
+
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InvoiceHistory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('comment', models.TextField(blank=True)),
+                ('created', models.DateTimeField(default=datetime.datetime(2016, 7, 27, 15, 35, 21, 502073, tzinfo=utc))),
+                ('sum', models.DecimalField(blank=True, decimal_places=0, default=0, max_digits=10, null=True)),
+                ('type', models.CharField(max_length=20)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='invoice_history', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Счет(История)',
+                'verbose_name_plural': 'Счет(История)',
+            },
+        ),
+    ]

wallets/migrations/0002_auto_20160727_1835.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-27 15:35
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wallets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoicehistory',
+            name='created',
+            field=models.DateTimeField(default=datetime.datetime(2016, 7, 27, 15, 35, 53, 331650, tzinfo=utc)),
+        ),
+    ]

wallets/migrations/0003_auto_20160729_1209.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-29 09:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wallets', '0002_auto_20160727_1835'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoicehistory',
+            name='created',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

wallets/models.py

@@ -0,0 +1,26 @@
+from django.db import models
+from django.utils import timezone
+
+from users.models import User
+
+TYPES = (
+    ('minus', 'Снятие'),
+    ('plus', 'Приход'),
+
+)
+
+
+class InvoiceHistory(models.Model):
+    comment = models.TextField(blank=True)
+    created = models.DateTimeField(default=timezone.now)
+    sum = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True)
+    type = models.CharField(max_length=20)
+    user = models.ForeignKey(User, related_name='invoice_history')
+
+    def __str__(self):
+        return self.pk
+
+    class Meta:
+        verbose_name = 'Счет(История)'
+        verbose_name_plural = 'Счет(История)'
+

wallets/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

wallets/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

work_sell/serialize.py

@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
 def serialize(instance, file_attr='file'):
     obj = getattr(instance, file_attr)
     return {
+        'id': instance.id,
         'url': obj.url,
         'name': obj.name,
         'type': mimetypes.guess_type(obj.path)[0] or 'image/png',