Skip to content

Correct logic error that was using alternate email address even if it… #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Correct logic error that was using alternate email address even if it… #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/Email/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def send_email_template_for_user(id_user, template, server, **kwargs):
else:
logging.info("Valid record found for user: %s", user.id)

logging.info("Sending email to user: %s using template: '%s'.", user.id, template)
logging.info("Sending email to user: %s using template: '%s'.", user.email, template)

params = {}
for key, value in kwargs.items():
Expand Down Expand Up @@ -74,16 +74,22 @@ def send_email_template_for_user(id_user, template, server, **kwargs):
#
# Evaluate user wanting to use an alternate email address to register
# the account.
if user.parent_email_source == SponsorType.INDIVIDUAL or user.parent_email:
logging.info('Non-COPPA registration')
if user.parent_email_source == SponsorType.INDIVIDUAL and user.parent_email:
user_email = user.parent_email
logging.info('Individual sponsor email %s being used', user_email)

if user.parent_email:
user_email = user.parent_email
logging.info('Sponsor email %s being used', user_email)

send_email_template_to_address(user_email, template, server, user.locale, params)

return


def send_email_template_to_address(recipient, template, server, locale, params=None, **kwargs):
logging.info("Preparing email template: %s", template)
logging.info("Preparing email template: %s for %s", template, recipient)
params = params or {}

# Add any supplied arguments to the parameter dictionary
Expand All @@ -97,7 +103,7 @@ def send_email_template_to_address(recipient, template, server, locale, params=N
(subject, plain, rich) = _read_templates(template, server, locale, params)
# Add error checking here to detect any issues with parsing the template.

logging.info("Sending email to %s", recipient)
logging.info("Sending email to %s", params['email'])
send_email(recipient, subject, plain, rich)


Expand Down