diff --git a/src/customer/models.py b/src/customer/models.py index 344d4a2..8675185 100644 --- a/src/customer/models.py +++ b/src/customer/models.py @@ -645,7 +645,7 @@ class License(models.Model): else: left_str = f'{left.days} {numeral.choose_plural(left.days, "день, дня, дней")}' remain_str = numeral.choose_plural(left.days, "остался, осталось, осталось") - return f'Лицензия активирована: {remain_str} {left_str}' + return f'Лицензия активна, {remain_str} {left_str}' elif self.status == 3: return 'Время истекло' else: @@ -665,7 +665,7 @@ class License(models.Model): freeze_date = self.order_date + timezone.timedelta(5) return f'Счет заморожен {freeze_date.strftime("%d.%m.%Y")}' if self.status == 0: - remain_day = relativedelta(self.order_date + timezone.timedelta(5), + remain_day = relativedelta(self.order_date + timezone.timedelta(4), timezone.now().date()) remain_day_str = f'{remain_day.days} ' \ f'{numeral.choose_plural(remain_day.days, "день, дня, дней")}' diff --git a/src/customer/tasks.py b/src/customer/tasks.py index ec79271..bf67857 100644 --- a/src/customer/tasks.py +++ b/src/customer/tasks.py @@ -74,7 +74,7 @@ def send_offer_for_get_bonus(): date_join_start = today - timezone.timedelta(days=9) date_join_end = today - timezone.timedelta(days=8) users = DokUser.objects.filter(profile__active=True, profile__confirmed=True).\ - filter(date_joined__gt=date_join_start, date_joined__lt=date_join_end) + filter(date_joined__gt=date_join_start, date_joined__lte=date_join_end) for user in users: licenses = License.objects.filter(company=user.profile).filter(status=2) diff --git a/src/customer/urls.py b/src/customer/urls.py index 01b7a71..c63ee79 100644 --- a/src/customer/urls.py +++ b/src/customer/urls.py @@ -25,8 +25,8 @@ urlpatterns = [ url(r'^payment/success/$', license.payment_success, name='yamoney_success'), url(r'^payment/fail/$', license.payment_fail, name='yamoney_fail'), # for delete - url(r'^license_list/$', license.license_list, name='customer_license_list'), - url(r'^paid_list/$', license.paid_list, name='customer_paid_list'), + # url(r'^license_list/$', license.license_list, name='customer_license_list'), + # url(r'^paid_list/$', license.paid_list, name='customer_paid_list'), # for delete end url(r'^orders/$', license.orders_list, name='customer-orders'), diff --git a/src/customer/views/license.py b/src/customer/views/license.py index 4d72f6d..42583eb 100644 --- a/src/customer/views/license.py +++ b/src/customer/views/license.py @@ -67,7 +67,7 @@ def order_license(request): payment.save() return redirect(reverse('yamoney_confirm', kwargs={'payment_id': payment.id})) - return redirect(reverse('customer_license_list')) + return redirect(reverse('customer-orders')) return render(request, template_name, dictionary) diff --git a/src/tests/test_models.py b/src/tests/test_models.py index 3060d99..c1fef06 100644 --- a/src/tests/test_models.py +++ b/src/tests/test_models.py @@ -44,8 +44,8 @@ def test_license_account_sub_status_not_paid(lic, days): lic.status = consts.STATUS_NOT_PAID lic.order_date = timezone.now().date() - timezone.timedelta(days) lic.save() - if days != 5: - assert f'{5 - days}' in lic.account_sub_status + if days != 4: + assert f'{4 - days}' in lic.account_sub_status else: assert 'будет заморожен' in lic.account_sub_status diff --git a/src/tests/test_tasks.py b/src/tests/test_tasks.py index f407cb3..a36aac3 100644 --- a/src/tests/test_tasks.py +++ b/src/tests/test_tasks.py @@ -12,23 +12,23 @@ from customer.models import UserProfile from customer.tasks import delete_not_activated_users, send_offer_for_get_bonus, \ check_not_paid_accounts -dates_gte_five = [timezone.now() - timezone.timedelta(days=100), - timezone.now() - timezone.timedelta(days=15), - timezone.now() - timezone.timedelta(days=6)] +dates_gte_five = [timezone.now().date() - timezone.timedelta(days=100), + timezone.now().date() - timezone.timedelta(days=15), + timezone.now().date() - timezone.timedelta(days=6)] -dates_lt_five = [timezone.now() - timezone.timedelta(days=5), - timezone.now() - timezone.timedelta(days=4), - timezone.now() - timezone.timedelta(days=3), - timezone.now() - timezone.timedelta(days=2), - timezone.now() - timezone.timedelta(days=1), - timezone.now() - timezone.timedelta(days=0)] +dates_lt_five = [timezone.now().date() - timezone.timedelta(days=5), + timezone.now().date() - timezone.timedelta(days=4), + timezone.now().date() - timezone.timedelta(days=3), + timezone.now().date() - timezone.timedelta(days=2), + timezone.now().date() - timezone.timedelta(days=1), + timezone.now().date() - timezone.timedelta(days=0)] -dates_bonus = [timezone.now() - timezone.timedelta(days=9)] +dates_bonus = [timezone.now().date() - timezone.timedelta(days=9)] -dates_not_bonus = [timezone.now() - timezone.timedelta(days=1), - timezone.now() - timezone.timedelta(days=8), - timezone.now() - timezone.timedelta(days=10), - timezone.now() - timezone.timedelta(days=32)] +dates_not_bonus = [timezone.now().date() - timezone.timedelta(days=1), + timezone.now().date() - timezone.timedelta(days=8), + timezone.now().date() - timezone.timedelta(days=10), + timezone.now().date() - timezone.timedelta(days=32)] @freeze_time("2017-06-28 00:21:34", tz_offset=2) @@ -43,14 +43,13 @@ def test_delete_not_activated_users_great_five_days(user, create_date): profile.save() user.save() ConfirmEmail.objects.get_or_create(user=user) - delete_not_activated_users() - assert DokUser.objects.count() == 0 assert UserProfile.objects.count() == 0 assert ConfirmEmail.objects.count() == 0 +@freeze_time("2017-06-28 00:21:34", tz_offset=2) @pytest.mark.parametrize('create_date', dates_lt_five) @pytest.mark.django_db def test_delete_not_activated_users_less_five_day(user, create_date): diff --git a/src/yandex_money/models.py b/src/yandex_money/models.py index 4c24893..26e1057 100644 --- a/src/yandex_money/models.py +++ b/src/yandex_money/models.py @@ -139,3 +139,7 @@ class Payment(models.Model): def __unicode__(self): return u'[Payment id={}, order_number={}, payment_type={}, status={}]'.format( self.id, self.order_number, self.payment_type, self.status) + + def __str__(self): + return u'[Payment id={}, order_number={}, payment_type={}, status={}]'.format( + self.id, self.order_number, self.payment_type, self.status) diff --git a/templates/base.html b/templates/base.html index 84e41ae..05a80a1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -102,8 +102,10 @@ {{ license_days }} Купить лицензию - + {% comment %} + Мои заказы + История расчетов + {% endcomment %} Лицензии и расчёты