From d571adfb996505eda334540d15faf0f6913d5ad1 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <thallada@edx.org>
Date: Fri, 6 Oct 2017 16:09:24 -0400
Subject: [PATCH] Use upsell_link in upgrade reminder template

---
 openedx/core/djangoapps/schedules/tasks.py             | 10 ++--------
 .../schedules/edx_ace/upgradereminder/email/body.html  |  4 ++--
 .../schedules/edx_ace/upgradereminder/email/body.txt   |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/openedx/core/djangoapps/schedules/tasks.py b/openedx/core/djangoapps/schedules/tasks.py
index 3c843c4546..67cd0af11f 100644
--- a/openedx/core/djangoapps/schedules/tasks.py
+++ b/openedx/core/djangoapps/schedules/tasks.py
@@ -326,14 +326,6 @@ def _upgrade_reminder_schedules_for_bin(site, target_day, bin_num, org_list, exc
         template_context.update({
             'student_name': user.profile.name,
             'user_personal_address': user.profile.name if user.profile.name else user.username,
-            'user_schedule_upgrade_deadline_time': dateformat.format(
-                schedule.upgrade_deadline,
-                get_format(
-                    'DATE_FORMAT',
-                    lang=first_schedule.enrollment.course.language,
-                    use_l10n=True
-                )
-            ),
 
             'course_name': first_schedule.enrollment.course.display_name,
             'course_url': absolute_url(site, reverse('course_root', args=[str(first_schedule.enrollment.course_id)])),
@@ -343,6 +335,8 @@ def _upgrade_reminder_schedules_for_bin(site, target_day, bin_num, org_list, exc
             'cert_image': absolute_url(site, static('course_experience/images/verified-cert.png')),
         })
 
+        _add_upsell_button_to_email_template(user, first_schedule, template_context)
+
         yield (user, first_schedule.enrollment.course.language, template_context)
 
 
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
index d33c12d25f..68a1bd2fe9 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
@@ -30,7 +30,7 @@
                 {% endblocktrans %}
             </p>
 
-            <a href="{{ course_url }}">
+            <a href="{{ upsell_link }}">
                 <img
                     src="{{ cert_image }}"
                     alt="{% blocktrans %}Example print-out of a verified certificate{% endblocktrans %}"
@@ -50,7 +50,7 @@
             <p>
                 <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
                 <a
-                    href="{{ course_url }}"
+                    href="{{ upsell_link }}"
                     style="
                         color: #ffffff;
                         text-decoration: none;
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt
index 3bbf29c78e..cc36b8be5c 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt
@@ -11,4 +11,4 @@ Dear {{ user_personal_address }},
     Upgrade by {{ user_schedule_upgrade_deadline_time }}.
 {% endblocktrans %}
 
-{% trans "Upgrade now at" %} <{{ course_url }}>
+{% trans "Upgrade now at" %} <{{ upsell_link }}>