diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py index 340dfbd9b7..f967e6aa1e 100644 --- a/openedx/core/djangoapps/schedules/resolvers.py +++ b/openedx/core/djangoapps/schedules/resolvers.py @@ -320,7 +320,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver): for schedule in schedules: enrollment = schedule.enrollment try: - week_summary = get_course_week_summary(enrollment.course_id, week_num) + week_highlights = get_week_highlights(enrollment.course_id, week_num) except CourseUpdateDoesNotExist: continue @@ -333,7 +333,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver): self.site, reverse('course_root', args=[course_id_str]) ), 'week_num': week_num, - 'week_summary': week_summary, + 'week_highlights': week_highlights, # This is used by the bulk email optout policy 'course_ids': [course_id_str], @@ -344,9 +344,9 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver): @request_cached -def get_course_week_summary(course_id, week_num): +def get_week_highlights(course_id, week_num): if COURSE_UPDATE_WAFFLE_FLAG.is_enabled(course_id): course = modulestore().get_course(course_id) - return course.week_summary(week_num) + return course.highlights_for_week(week_num) else: raise CourseUpdateDoesNotExist() diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html index e04f056cc3..50ec6bb539 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html @@ -20,31 +20,18 @@

{% blocktrans trimmed %} Here is what you can look forward to learning this week: -

{{ week_summary }}

{% endblocktrans %} +

-

- - - - {% trans "Resume your course now" %} - -

+ {% trans "Resume your course now" as course_cta_text %} + {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} + + {% include "schedules/edx_ace/common/upsell_cta.html"%} diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt index 3a3109ae7f..e9451139f0 100644 --- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt +++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt @@ -7,3 +7,5 @@ Here is what you can look forward to learning this week: {{ week_summary }} {% endblocktrans %} + +{% include "schedules/edx_ace/common/upsell_cta.txt"%}