From f842717c49d7e358cc59fa4fdf20c3d303e8b5a5 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Tue, 11 Jun 2019 15:47:52 -0400 Subject: [PATCH] Add strike-out price to LMS Course Home sock --- .../course_experience/course-sock-fragment.html | 11 ++++++++++- .../features/course_experience/views/course_sock.py | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html index 932c703dba..f5ccbe72db 100644 --- a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html +++ b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html @@ -60,7 +60,16 @@ from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG Example Certificate Image
- ${Text(_('Upgrade ({course_price})')).format(course_price=HTML(course_price))} + % if course_price_before_discount: + ${Text(_('Upgrade ({course_price} {startdel}{course_price_before_discount}{enddel})')).format( + course_price=HTML(course_price), + course_price_before_discount=HTML(course_price_before_discount), + startdel=HTML(""), + enddel=HTML(""), + )} + % else: + ${Text(_('Upgrade ({course_price})')).format(course_price=HTML(course_price))} + % endif
diff --git a/openedx/features/course_experience/views/course_sock.py b/openedx/features/course_experience/views/course_sock.py index 7d73db331b..50592b14f5 100644 --- a/openedx/features/course_experience/views/course_sock.py +++ b/openedx/features/course_experience/views/course_sock.py @@ -6,9 +6,10 @@ from __future__ import absolute_import from django.template.loader import render_to_string from web_fragments.fragment import Fragment -from course_modes.models import get_cosmetic_verified_display_price +from course_modes.models import get_cosmetic_verified_display_price, get_course_prices, format_course_price from courseware.date_summary import verified_upgrade_deadline_link, verified_upgrade_link_is_valid from openedx.core.djangoapps.plugin_api.views import EdxFragmentView +from openedx.features.discounts.applicability import discount_percentage, can_receive_discount from student.models import CourseEnrollment @@ -30,7 +31,14 @@ class CourseSockFragmentView(EdxFragmentView): show_course_sock = verified_upgrade_link_is_valid(enrollment) if show_course_sock: upgrade_url = verified_upgrade_deadline_link(request.user, course=course) - course_price = get_cosmetic_verified_display_price(course) + + if can_receive_discount(request.user, course): + course_price_before_discount_num = get_course_prices(course, verified_only=True)[0] + course_price_before_discount = format_course_price(course_price_before_discount_num) + course_price = format_course_price("{:0.2f}".format(course_price_before_discount_num * ((100.0 - discount_percentage()) / 100))) + else: + course_price_before_discount = None + course_price = get_cosmetic_verified_display_price(course) else: upgrade_url = '' course_price = '' @@ -38,6 +46,7 @@ class CourseSockFragmentView(EdxFragmentView): context = { 'show_course_sock': show_course_sock, 'course_price': course_price, + 'course_price_before_discount': course_price_before_discount, 'course_id': course.id, 'upgrade_url': upgrade_url, }