Dmitriy Shesterkin 9 years ago
parent fd26b2ce66
commit 7c09b55fa9
  1. 5
      src/customer/models.py
  2. 2
      src/customer/tasks.py
  3. 4
      src/tests/test_models.py
  4. 5
      templates/customer/profile/orders_list.html

@ -653,6 +653,7 @@ class License(models.Model):
@property @property
def account_status(self): def account_status(self):
if self.status in [0, 4]: if self.status in [0, 4]:
return 'Счет не оплачен' return 'Счет не оплачен'
else: else:
@ -665,7 +666,7 @@ class License(models.Model):
freeze_date = self.order_date + timezone.timedelta(5) freeze_date = self.order_date + timezone.timedelta(5)
return f'Счет заморожен {freeze_date.strftime("%d.%m.%Y")}' return f'Счет заморожен {freeze_date.strftime("%d.%m.%Y")}'
if self.status == 0: if self.status == 0:
remain_day = relativedelta(self.order_date + timezone.timedelta(4), remain_day = relativedelta(self.order_date + timezone.timedelta(5),
timezone.now().date()) timezone.now().date())
remain_day_str = f'{remain_day.days} ' \ remain_day_str = f'{remain_day.days} ' \
f'{numeral.choose_plural(remain_day.days, "день, дня, дней")}' f'{numeral.choose_plural(remain_day.days, "день, дня, дней")}'
@ -676,7 +677,7 @@ class License(models.Model):
return f'{remain_str} {remain_day_str}' return f'{remain_str} {remain_day_str}'
@property @property
def status_need_to_change(self): def is_status_need_to_change(self):
if self.status == 0: if self.status == 0:
remain_day = relativedelta(self.order_date + timezone.timedelta(5), remain_day = relativedelta(self.order_date + timezone.timedelta(5),
timezone.now().date()) timezone.now().date())

@ -99,7 +99,7 @@ def check_not_paid_accounts():
if not_paid_accounts_list: if not_paid_accounts_list:
for account in not_paid_accounts_list: for account in not_paid_accounts_list:
if account.status_need_to_change: if account.is_status_need_to_change:
account.set_freeze_status() account.set_freeze_status()
account_list.append(account) account_list.append(account)

@ -58,9 +58,9 @@ def test_license_status_need_to_change(lic, days):
lic.order_date = timezone.now().date() - timezone.timedelta(days) lic.order_date = timezone.now().date() - timezone.timedelta(days)
lic.save() lic.save()
if days > 5: if days > 5:
assert lic.status_need_to_change is True assert lic.is_status_need_to_change is True
else: else:
assert lic.status_need_to_change is False assert lic.is_status_need_to_change is False
@pytest.mark.django_db @pytest.mark.django_db

@ -69,6 +69,11 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
<div class="filter__table">
</div>
{% endblock content %} {% endblock content %}
{% block js %} {% block js %}

Loading…
Cancel
Save