#ARC-18 Changes time for stages

assets/css/main.css

@@ -1064,7 +1064,7 @@ footer:after {
 }
 
 .pagin nav ul li a {
-    background-color: none;
+    background-color:unset;
     color: black;
     font-size: 20px;
     line-height: 50px;
@@ -1090,7 +1090,6 @@ footer:after {
 
 .pagin nav ul li a:hover,
 .pagin nav ul li a:active {
-    color: black;
     color: white;
     background-color: #2c2c2c;
     border-color: #2c2c2c;
@@ -2493,7 +2492,7 @@ input[type="checkbox"]:checked + span {
 }
 
 .exButton .btn-group .btn span {
-    font-family: Arial. Verdana, Helvetica, sans-serif;
+    font-family: Arial, Verdana, Helvetica, sans-serif;
     font-weight: bold;
 }
 
@@ -3779,7 +3778,7 @@ input[type="checkbox"]:checked + span {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
     -webkit-transform: scale(1.03);
-    -moz- transform: scale(1.03);
+    -moz-transform: scale(1.03);
     transform: scale(1.03);
     box-shadow: 0 0 10px rgba(0,0,0,0.7);
     z-index: 999;
@@ -3856,7 +3855,7 @@ input[type="checkbox"]:checked + span {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
     -webkit-transform: scale(1.03);
-    -moz- transform: scale(1.03);
+    -moz-transform: scale(1.03);
     transform: scale(1.03);
     box-shadow: 0 0 10px rgba(0,0,0,0.7);
     z-index: 999;
@@ -5346,7 +5345,7 @@ input[type="radio"]:checked + span {
     font-family: Arial, Verdana, Helvetica, sans-serif;
     font-size: 16px;
     font-weight: bold;
-    margin: 0px 0 -15 0;
+    margin: 0 0 -15px 0;
 }
 
 .inp-edit {

assets/js/chat.js

@@ -77,7 +77,6 @@ function csrfSafeMethod(method) {
 
 var socket = new SocketHandler();
 var csrftoken = getCookie('csrftoken');
-
 $(function () {
 
     function dialog(message, yesCallback, notCallback) {

assets/js/chat_contractor.js

@@ -441,7 +441,9 @@ $(function () {
                     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.term + '</p><span>' + v.cost + ' <i class="fa fa-rub"></i></span></div><div><p>' + statusName + '</p></div></div></div>';
+                        '<p> Срок до ' + v.term + '</p><span>' + v.cost + ' <i class="fa fa-rub"></i></span>' +
+                        '<p>Cрок заказа рассчитывается с момента резервирования средств</p>' +
+                        '</div><div><p>' + statusName + '</p></div></div></div>';
                 });
 
                 if (statusNotAgreed) {

chat/templates/chat_customer.html

@@ -426,8 +426,9 @@
                                 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>' +
-                                        '<p>до '+ v.term +'</p><span>' + v.cost + '<i class="fa fa-rub"></i></span>' +
-                                        '</div><div><p>'+ statusName +'</p></div></div></div>';
+                                        '<p>Срок до '+ v.term +'</p><span>' + v.cost + '<i class="fa fa-rub"></i></span>' +
+                                        '<p>Cрок заказа рассчитывается с момента резервирования средств</p>' +
+                                        '</div><div><p style="font-color:red;">'+ statusName +'</p></div></div></div>';
 
                             }
                             if(data.secure) {

projects/views.py

@@ -750,6 +750,11 @@ class PortfolioDetail(DetailView):
     model = Portfolio
     template_name = 'portfolio_detail.html'
 
+    def dispatch(self, request, *args, **kwargs):
+        if not self.get_object().user:
+            return HttpResponseForbidden('404 Not Found')
+        return super().dispatch(request, *args, **kwargs)
+
 
 class ArbitrationCreateView(CreateView):
     model = Arbitration

wallets/signals.py

@@ -1,5 +1,6 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.utils import timezone
 from django.core.mail import send_mail, EmailMultiAlternatives
 from django.template.loader import get_template, render_to_string
 
@@ -58,6 +59,8 @@ def reserve_stages(sender, instance, created, **kwargs):
                 stage = Stage.objects.get(pk=pk)
                 stages_names.append(stage.name)
                 stage.is_paid = True
+                delta = stage.term - stage.approve_time.date()
+                stage.term = timezone.now().date() + delta
                 order = stage.order
                 stage.save()
 
@@ -80,6 +83,8 @@ def reserve_stages(sender, instance, created, **kwargs):
             stage = Stage.objects.get(pk=pk)
             stages_names.append(stage.name)
             stage.is_paid = True
+            delta = stage.term - stage.approve_time.date()
+            stage.term = timezone.now().date() + delta
             order = stage.order
             stage.save()
 

work_sell/views.py

@@ -23,6 +23,7 @@ from .serialize import serialize
 from .response import JSONResponse, response_mimetype
 from archilance.mixins import BaseMixin
 
+
 class PictureCreateView(CreateView):
     model = Picture
     fields = '__all__'
@@ -131,6 +132,11 @@ class WorkSellDetail(DetailView):
     model = WorkSell
     template_name = 'worksell_detail.html'
 
+    def dispatch(self, request, *args, **kwargs):
+        if not self.get_object().contractor and not self.get_object().team:
+            return HttpResponseForbidden('404 Not Found')
+        return super().dispatch(request, *args, **kwargs)
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['worksell_related'] = WorkSell.objects.exclude(pk=self.get_object().pk)[:5]