From 7f42260960d32a5a4075d5d070e431b59fa73f27 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Sat, 8 Jul 2017 15:22:08 +0300 Subject: [PATCH] some fix --- src/customer/tasks.py | 15 ++--- src/customer/views/license.py | 5 +- src/dokumentor/settings/common.py | 50 +++------------- templates/customer/profile/orders_list.html | 64 +++++++++++++++++++++ 4 files changed, 85 insertions(+), 49 deletions(-) diff --git a/src/customer/tasks.py b/src/customer/tasks.py index 29d303d..e39069c 100644 --- a/src/customer/tasks.py +++ b/src/customer/tasks.py @@ -7,7 +7,7 @@ from celery.schedules import crontab from celery.task import periodic_task from django.core.urlresolvers import reverse from django.utils import timezone -from datetime import datetime, timedelta +from datetime import datetime from django.core.mail import mail_admins @@ -23,12 +23,13 @@ def check_license(): profiles = UserProfile.objects.all() now = datetime.today() - licenses = License.objects.filter( - order_date__lte=now - timedelta(10), - status=0, - deleted=False - ) - licenses.update(status=4) + # TODO: not needed + # licenses = License.objects.filter( + # order_date__lte=now - timedelta(10), + # status=0, + # deleted=False + # ) + # licenses.update(status=4) for profile in profiles: try: diff --git a/src/customer/views/license.py b/src/customer/views/license.py index 42583eb..2bbb6ee 100644 --- a/src/customer/views/license.py +++ b/src/customer/views/license.py @@ -186,5 +186,8 @@ def orders_list(request): deleted=False).order_by('-id') merged = itertools.chain(accounts_list, licenses_list) - context = {'object_list': merged} + + context = { + 'object_list': merged + } return render(request, template_name, context) diff --git a/src/dokumentor/settings/common.py b/src/dokumentor/settings/common.py index 9f45ded..3965e4e 100644 --- a/src/dokumentor/settings/common.py +++ b/src/dokumentor/settings/common.py @@ -158,7 +158,7 @@ INSTALLED_APPS = [ # 'cmsplugin_filer_video', 'captcha', - 'yandex_money', + # 'yandex_money', 'filer', 'easy_thumbnails', 'treebeard', @@ -280,13 +280,13 @@ THUMBNAIL_PROCESSORS = ( 'filer.thumbnail_processors.scale_and_crop_with_subject_location', 'easy_thumbnails.processors.filters' ) - -RAVEN_CONFIG = { - 'dsn': 'http://02d524ef0d044bdfae0b39546b752cb2:1e025305594d4532ae93125372dcde50@sentry.mitri4.pro/1', - # If you are using git, you can also automatically configure the - # release based on the git info. - 'release': raven.fetch_git_sha(ROOT_DIR), -} +if not DEBUG: + RAVEN_CONFIG = { + 'dsn': 'http://02d524ef0d044bdfae0b39546b752cb2:1e025305594d4532ae93125372dcde50@sentry.mitri4.pro/1', + # If you are using git, you can also automatically configure the + # release based on the git info. + 'release': raven.fetch_git_sha(ROOT_DIR), + } # cache settings COMMON_CACHE_PREFIX = 'dokumentor_' @@ -304,16 +304,6 @@ CACHES = { } } -YANDEX_MONEY_DEBUG = False -YANDEX_MONEY_SCID = 84437 -YANDEX_MONEY_SHOP_ID = 92585 -YANDEX_MONEY_SHOP_PASSWORD = 'sQuMtorHE02U' -YANDEX_MONEY_FAIL_URL = 'https://dokumentor.ru/my/payment/fail/' -YANDEX_MONEY_SUCCESS_URL = 'https://dokumentor.ru/my/payment/success/' -YANDEX_MONEY_PAYMENT_URL = 'https://money.yandex.ru/eshop.xml' -# информировать о случаях, когда модуль вернул Яндекс.Кассе ошибку -YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True - DADATA_API_KEY = 'e4232c46f82c0b2e8c5f9bd583d6224ce9c934e0' DADATA_SECRET_KEY = '9c5c3fdfba74af122730db650346b3e91586abc7' @@ -348,25 +338,8 @@ LOGGING = { 'class': 'logging.StreamHandler', 'formatter': 'verbose' }, - 'mail_admins': { - 'level': 'ERROR', - 'filters': ['require_debug_false'], - 'class': 'django.utils.log.AdminEmailHandler' - }, - 'yandex_money': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(ROOT_DIR, 'var/log/yandex_money.log'), - 'maxBytes': 1024 * 1024 * 5, - 'backupCount': 5, - }, }, 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, 'django.db.backends': { 'level': 'ERROR', 'handlers': ['console'], @@ -381,11 +354,6 @@ LOGGING = { 'level': 'DEBUG', 'handlers': ['console'], 'propagate': False, - }, - 'yandex_money': { - 'handlers': ['yandex_money'], - 'level': 'DEBUG', - 'propagate': False - }, + } }, } diff --git a/templates/customer/profile/orders_list.html b/templates/customer/profile/orders_list.html index fde025a..d292cc1 100644 --- a/templates/customer/profile/orders_list.html +++ b/templates/customer/profile/orders_list.html @@ -69,6 +69,70 @@ {% endfor %} + + {% for object in filters.qs %} + + + + + + + + {% endfor %} +
{{ object.order_date }} + {% if object.type %} + + {% else %} +
+

Лицензия № {{object.id}} на {{ object.get_term }}, + {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}

+

{% if object.term > 0 %}{{ object.get_action_link|safe }}{% else %}Пробный период{% endif %}

+
+ {% endif %} + 		+ {% if 'активна' in object.get_paid_status and not object.type %} +
+ + + +
+ {% endif %} + {% if 'выдана' in object.get_paid_status and not object.type %} +
+ + + +
+ {% endif %} + 		+ {% if object.type %} + + {% else %} +
+

{{ object.get_paid_status }}

+

Период действия: {% if object.date_from %}{{ object.date_from }} - {{ object.date_to }}{% else %}-{% endif %}

+
+ {% endif %} + 		+ {% if object.status == 0 %} + + + + + + {% endif %} +