diff --git a/AuthApp/js_urls.py b/AuthApp/js_urls.py index 795d2f9..9cfcbcf 100644 --- a/AuthApp/js_urls.py +++ b/AuthApp/js_urls.py @@ -27,4 +27,7 @@ urlpatterns = [ path('change_profile/', change_profile_ajax, name='change_profile_ajax'), path('change_profile_confirm/', change_profile_confirm_ajax, name='change_profile_confirm_ajax'), path('change_avatar_confirm/', change_avatar_confirm_ajax, name='change_avatar_confirm_ajax'), + + path('request_offer/', request_offer_ajax, name='request_offer_ajax') + ] \ No newline at end of file diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 5dffd9d..5f2ebf7 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -29,6 +29,57 @@ import base64 # html = render_to_string('blocks/profile/b_subscribe.html', Dict, request=request) # return JsonResponse({'html': html}, status=200) + + +def request_offer_ajax(request): + if request.method != 'POST': + raise Http404 + + data = request.POST + if not data and request.body: + data = request.body + + from GeneralApp.funcs_options import get_options_by_opt_types, get_mail_send_options + sets = get_options_by_opt_types(['domain', 'project_name'], only_vals=True) + + request_type = None + subject = 'Получен запрос' + if 'form_name' in data: + if data['form_name'] == 'msg_from_advertisement': + subject = 'Получен запрос на рекламу' + request_type = 'запрос на рекламу' + + if request_type: + request_type_str = f'Тип запроса: {request_type}
' + else: + request_type_str = '' + + Dict = { + 'logo': f'{request.scheme}://{sets["domain"]}/static/img/svg/LogoMobile.svg', + 'project_name': sets['project_name'], + 'message_title': subject, + 'message_text': f'

ДАННЫЕ ЗАПРОСА

' + f'

' + f'{request_type_str}' + f'Имя: {data["name"]}
' + f'Телефон: {data["phone"]}' + f'

' + } + + html = render_to_string('mail/m_request_offer.html', Dict, request) + from BaseModels.mailSender import admin_send_mail_by_SMTPlib + mail_sets = get_mail_send_options() + to = [mail_sets['sender_email'], 'web@syncsystems.net'] + res = admin_send_mail_by_SMTPlib( + mail_sets, + subject=subject, + from_email=mail_sets['sender_email'], to=to, + html_content=html + ) + + return JsonResponse({'status': 'sended'}) + + @login_required(login_url='/profile/login/') def chats_ajax(request): if request.method != 'POST': diff --git a/BaseModels/mailSender.py b/BaseModels/mailSender.py index 1417d09..8c2cfd3 100644 --- a/BaseModels/mailSender.py +++ b/BaseModels/mailSender.py @@ -91,7 +91,7 @@ def admin_send_mail_by_SMTPlib(sets, subject, from_email, to, html_content, atta smtp_port = sets['mail_server_smtp_port'] smtp_password = sets['sender_mail_password'] smtp_login = sets['sender_mail_login'] - res = send_mail_by_SMTPlib(subject, from_email, to, html_content, smtp_server, smtp_port, smtp_login, + res = send_mail_by_SMTPlib(sets, subject, from_email, to, html_content, smtp_server, smtp_port, smtp_login, smtp_password, attachments) @@ -106,14 +106,14 @@ def admin_send_mail_by_SMTPlib(sets, subject, from_email, to, html_content, atta def send_mail_by_SMTPlib(sets, subject, from_email, to_init, html_content, smtp_server, smtp_port, smtp_login, smtp_password, attachments=None): to = to_init - if not settings.prod_server: - to = 'web@syncsystems.net' - else: - to = to_init - try: - from settings_local import DEBUG - except: - print('get settings_local fail') + # if not settings.prod_server: + # to = 'web@syncsystems.net' + # else: + # to = to_init + # try: + # from settings_local import DEBUG + # except: + # print('get settings_local fail') res = None mail_lib = None @@ -153,8 +153,8 @@ def send_mail_by_SMTPlib(sets, subject, from_email, to_init, html_content, smtp_ else: to_str = to[0] else: - if to == sets['sender_email']: - return None + # if to == sets['sender_email']: + # return None to_str = to to = [] to.append(to_str) diff --git a/GeneralApp/funcs_options.py b/GeneralApp/funcs_options.py index fb4c1ab..bf34d9d 100644 --- a/GeneralApp/funcs_options.py +++ b/GeneralApp/funcs_options.py @@ -10,8 +10,8 @@ def get_options_by_opt_types(opt_types, only_vals=False): opts = Option.objects.filter(**kwargs) if opts and only_vals: - opts = opts.values('name', 'value') - opts = {item['name']: item['value'] for item in opts} + opts = opts.values('opt_type', 'value') + opts = {item['opt_type']: item['value'] for item in opts} return opts def get_first_option_value_by_opt_type(opt_type): diff --git a/static/js/user_profile.js b/static/js/user_profile.js index b485a20..62f8fd3 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -832,36 +832,38 @@ function RequestCommercialOffer (el){ }); } -// function SendFeedbackForm (el){ -// -// event.preventDefault() -// let form = el.form; -// let formData = new FormData(form); -// -// -// -// -// $.ajax({ -// headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, -// url: '/user_account/request_offer/', -// type: "POST", -// // async: true, -// cache: false, -// processData: false, -// contentType: false, -// // enctype: 'json', -// data: formData, -// success: function(data){ -// -// // location.href = '/profile' -// -// -// }, -// error: function (data, exception){ -// // document.querySelector(".login").innerHTML = data.responseJSON.html -// } -// }); -// } +function SendFeedbackForm (el){ + + event.preventDefault() + let form = el.form; + let formData = new FormData(form); + let form_name = form.dataset['name'] + formData.set('form_name',form_name) + + + + + $.ajax({ + headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, + // url: '/user_account/request_offer/', + type: "POST", + // async: true, + cache: false, + processData: false, + contentType: false, + // enctype: 'json', + data: formData, + success: function(data){ + + // location.href = '/profile' + + + }, + error: function (data, exception){ + // document.querySelector(".login").innerHTML = data.responseJSON.html + } + }); +} diff --git a/templates/blocks/static_pages_blocks/b_feedback_form.html b/templates/blocks/static_pages_blocks/b_feedback_form.html index 40b8d1b..3dc95c1 100644 --- a/templates/blocks/static_pages_blocks/b_feedback_form.html +++ b/templates/blocks/static_pages_blocks/b_feedback_form.html @@ -13,7 +13,11 @@ {% translate "Пожалуйста опишите Ваш вопрос максимально подробно, а также укажите Ваш e-mail для обратной связи." %} {% endif %} -
+
diff --git a/templates/mail/m_request_offer.html b/templates/mail/m_request_offer.html new file mode 100644 index 0000000..4632682 --- /dev/null +++ b/templates/mail/m_request_offer.html @@ -0,0 +1,65 @@ + +
+
+
+ {{ project_name }} +
+

+ {{ message_title|safe }} +

+
+{#

#} + {{ message_text|safe }} +{#

#} +
+ {% for button in message_buttons %} + + {% endfor %} + + +
+
+
+{# Адрес кафе: Минск, ул. Будславская, 2#} +{#
#} +{# График работы: пн-вс 12:00 - 24:00#} +{#
#} +{# Телефоны кафе: +375 44 77 321 77#} +
+
+ + + +
+
\ No newline at end of file diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html index b91d222..a863b07 100644 --- a/templates/pages/p_article.html +++ b/templates/pages/p_article.html @@ -44,7 +44,7 @@
-
+
{{ page.name }}
{{ page.description|truncatechars:100 }}