Fixed extending complaint period

openprocurement · Feb 15, 2016 · db1b562 · db1b562
1 parent 4675927
commit db1b562
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/openprocurement/tender/openua/models.py b/openprocurement/tender/openua/models.py
@@ -217,6 +217,7 @@ class Options:
         }
     status = StringType(choices=['draft', 'claim', 'answered', 'pending', 'accepted', 'invalid', 'resolved', 'declined', 'cancelled', 'satisfied', 'ignored'], default='draft')
     acceptance = BooleanType()
+    dateAccepted = IsoDateTimeType()
     rejectReason = StringType(choices=['lawNonСompliance', 'noPaymentReceived', 'buyerViolationsСorrected'])
     rejectReasonDescription = StringType()
     reviewDate = IsoDateTimeType()

diff --git a/openprocurement/tender/openua/views/award_complaint.py b/openprocurement/tender/openua/views/award_complaint.py
@@ -125,11 +125,6 @@ def patch(self):
         elif self.request.authenticated_role == 'reviewers' and self.context.status == 'pending' and data.get('status', self.context.status) == 'invalid':
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
-            if complaintPeriod.endDate:
-                complaintPeriodendDate = complaintPeriod.endDate + (self.context.dateDecision - self.context.dateSubmitted)
-                complaintPeriodendDate = datetime.combine(complaintPeriodendDate.date(), time(0, tzinfo=complaintPeriodendDate.tzinfo)) + timedelta(days=1)
-                if complaintPeriod.endDate < complaintPeriodendDate:
-                    complaintPeriod.endDate = complaintPeriodendDate
         elif self.request.authenticated_role == 'reviewers' and self.context.status == 'pending' and data.get('status', self.context.status) == 'accepted':
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateAccepted = get_now()
@@ -139,7 +134,7 @@ def patch(self):
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
             if complaintPeriod.endDate:
-                complaintPeriodendDate = complaintPeriod.endDate + (self.context.dateDecision - self.context.dateSubmitted)
+                complaintPeriodendDate = complaintPeriod.endDate + (self.context.dateDecision - self.context.dateAccepted)
                 complaintPeriodendDate = datetime.combine(complaintPeriodendDate.date(), time(0, tzinfo=complaintPeriodendDate.tzinfo)) + timedelta(days=1)
                 if complaintPeriod.endDate < complaintPeriodendDate:
                     complaintPeriod.endDate = complaintPeriodendDate