From b759ce2d5a9ce796c379c359acd727ce3ccd1fee Mon Sep 17 00:00:00 2001 From: SDE Date: Thu, 16 Jan 2025 15:28:06 +0300 Subject: [PATCH] 2.1.23 fix send support mail --- AuthApp/js_views.py | 6 +++++- BaseModels/mailSender.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 9d7cdd0..81a22aa 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -314,7 +314,11 @@ def send_message_ajax(request): 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']] + opts = get_options_by_opt_types('support_email', only_vals=True) + if opts and 'support_email' in opts: + to = [opts['support_email']] + else: + to = [mail_sets['sender_email']] res = admin_send_mail_by_SMTPlib( mail_sets, subject=subject, diff --git a/BaseModels/mailSender.py b/BaseModels/mailSender.py index 8b50189..2f0fe8e 100644 --- a/BaseModels/mailSender.py +++ b/BaseModels/mailSender.py @@ -145,8 +145,8 @@ def send_mail_by_SMTPlib(sets, subject, from_email, to_init, html_content, smtp_ res = None if type(to) in (list, tuple): - if sets['sender_email'] in to: - to.remove(sets['sender_email']) + # if sets['sender_email'] in to: + # to.remove(sets['sender_email']) if len(to) > 1: to_str = u', '.join(to)