From 1a4b94c56f669ba34905665b51eeaa9d64f60a6a Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Mon, 10 Apr 2017 19:07:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=20=D0=BA=D1=83=D1=80=D1=81=D0=B5=20?= =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/settings.py | 10 ++++++++++ management/api.py | 4 ++-- management/letters.py | 4 ++-- management/urls.py | 1 + static/js/bill.js | 3 ++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lms/settings.py b/lms/settings.py index 5d838d4..3f747a0 100644 --- a/lms/settings.py +++ b/lms/settings.py @@ -22,6 +22,16 @@ TEST_EMAIL = 'bez.b.unix@gmail.com' TEACHER = 't@skillbox.ru' SUPERVISOR = 's@skillbox.ru' MANAGER = 'm@skillbox.ru' +MANAGERS = [ + 'maksim.shachkov@skillbox.ru', + 'aleksey.zelentsov@skillbox.ru', + '​roman.fatullaev@skillbox.ru​', + 'vladimir.kakaulin@skillbox.ru​', +​ 'dmitry.perepelitsa@skillbox.ru​', + 'timofey.trifonov@skillbox.ru', +​ 'sergej.gavrilovich@skillbox.ru', +] + SUPPORT = 'hello@skillbox.ru' SUPPORT_PHONE = '+7 (495) 984-41-77' SUPPORT_TIME = '(с 10 до 19 по Москве)' diff --git a/management/api.py b/management/api.py index f6c6b01..9045c27 100755 --- a/management/api.py +++ b/management/api.py @@ -167,8 +167,8 @@ def read_comment(request, context): @api_decor(without_auth=False) def burning_course(request): - course = Course.objects.get(id=request.POST['course']) - user = User.objects.get(id=request.POST['id']) + course = Course.objects.get(id=request.GET['course']) + user = User.objects.get(id=request.GET['id']) send_burning_course_letter(user, course) diff --git a/management/letters.py b/management/letters.py index 665c698..8de9979 100755 --- a/management/letters.py +++ b/management/letters.py @@ -5,7 +5,7 @@ from django.template.loader import get_template from lms.tools import out_date_format from lms.settings import DOMAIN, DEFAULT_FROM_EMAIL, NAME from management.mails import letter_decor - +from random import choice TEST_EMAIL = 'bez.b.unix@gmail.com' @@ -523,7 +523,7 @@ def long_time_no_see(): def send_burning_course_letter(user, course): data = { 'title': u'Студент закончил временный курс', - 'email': MANAGERS, + 'email': choice(MANAGERS), 'text': u'Чувак закончил временный курс: ' + course u'Ему стоит предложить купить весь курс', u'Информация о студенте:' diff --git a/management/urls.py b/management/urls.py index 0df421e..dcf5331 100755 --- a/management/urls.py +++ b/management/urls.py @@ -20,6 +20,7 @@ urlpatterns = [ url(r'sent_charge$', api.sent_charge), url(r'new_feedback/$', api.new_feedback), url(r'read_comment$', api.read_comment), + url(r'burning_course/$', api.burning_course), url(r'faq/([0-9]{1,99})$', views.faq_one), url(r'faq/$', views.faq), url(r'progress_report/$', views.progress_report), diff --git a/static/js/bill.js b/static/js/bill.js index 8d0d89c..debc3e8 100755 --- a/static/js/bill.js +++ b/static/js/bill.js @@ -144,7 +144,8 @@ function send_letter_to_manager(course){ $.ajax({ type: 'GET', url: '/management/send_letter_to_manager', - data: {'id': $('[name=REQUEST_USER_ID]').val(), 'course': course} + data: {'id': $('[name=REQUEST_USER_ID]').val(), 'course': course}, + success: function(){}, }) } }