fix: course certificate price display

This commit is contained in:
Jannat Patel
2022-05-24 16:51:55 +05:30
parent c92220f1e5
commit 87fe3e72a2
7 changed files with 136 additions and 103 deletions

View File

@@ -372,4 +372,4 @@ def format_amount(amount, currency):
if amount_reduced < 1:
return amount
precision = 0 if amount % 1000 == 0 else 1
return _("{0}K").format(fmt_money(amount_reduced, precision, currency))
return _("{0}k").format(fmt_money(amount_reduced, precision, currency))

View File

@@ -51,6 +51,18 @@
{{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
</div>
{% endif %}
{% if course.paid_certificate %}
<div class="vertically-center ml-3">
<svg class="icon icon-md">
<use href="#icon-badge"></use>
</svg>
<span class="certificate-price" data-price="{{ course.price_certificate }}">
{{ format_amount(course.price_certificate, course.currency) }}
</span>
</div>
{% endif %}
</div>
{% endif %}
</div>
@@ -66,12 +78,6 @@
<div class="progress-percent">{{ progress }}% {{ _("Completed") }} </div>
{% endif %}
{% if course.paid_certificate %}
<div class="certificate-price small mt-3" data-price="{{ course.price_certificate }}">
{{ _("Certificate Price: {0}").format(format_amount(course.price_certificate, course.currency)) }}
</div>
{% endif %}
<div class="course-card-footer">
<span class="">
{% set instructors = get_instructors(course.name) %}

View File

@@ -13,60 +13,62 @@
<div class="chapter-content collapse navbar-collapse" id="{{ get_slugified_chapter_title(chapter.title) }}">
{% if chapter.description %}
<div class="chapter-description muted-text">
{{ chapter.description }}
</div>
{% endif %}
{% if chapter.description %}
<div class="chapter-description muted-text">
{{ chapter.description }}
</div>
{% endif %}
{% set is_instructor = is_instructor(course.name) %}
<div class="lessons">
{% set is_instructor = is_instructor(course.name) %}
<div class="lessons">
{% for lesson in get_lessons(course.name, chapter) %}
{% set active = membership.current_lesson == lesson.name %}
<div class="lesson-info {% if active %} active-lesson {% endif %}">
{% for lesson in get_lessons(course.name, chapter) %}
{% set active = membership.current_lesson == lesson.name %}
<div class="lesson-info {% if active %} active-lesson {% endif %}">
{% if membership or lesson.include_in_preview %}
<a class="lesson-links" href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}"
data-course="{{ course.name }}">
<svg class="icon icon-md mr-2">
<use class="" href="#{{ lesson.icon }}">
</svg>
{{ lesson.title }}
{% if membership or lesson.include_in_preview %}
<a class="lesson-links" href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}"
data-course="{{ course.name }}">
<svg class="icon icon-md mr-2">
<use class="" href="#{{ lesson.icon }}">
</svg>
{{ lesson.title }}
{% if membership %}
<img class="ml-1 lesson-progress-tick {{ get_progress(course.name, lesson.name) != 'Complete' and 'hide' }}"
src="/assets/lms/icons/check.svg">
{% if membership %}
<svg class="icon icon-md lesson-progress-tick {{ get_progress(course.name, lesson.name) != 'Complete' and 'hide' }}">
<use class="" href="#icon-green-check">
</svg>
{% endif %}
</a>
{% elif is_instructor and not lesson.include_in_preview %}
<a class="lesson-links"
title="This lesson is not available for preview. As you are the Instructor of the course only you can see it."
href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}"
data-course="{{ course.name }}">
<svg class="icon icon-md">
<use class="" href="#icon-lock">
</svg>
<div>{{ lesson.title }}</div>
</a>
{% else %}
<div class="no-preview" title="This lesson is not available for preview" data-course="{{ course.name }}">
<div class="lesson-links">
<svg class="icon icon-md">
<use class="" href="#icon-lock-gray">
</svg>
<div>{{ lesson.title }}</div>
</div>
</div>
{% endif %}
</a>
{% elif is_instructor and not lesson.include_in_preview %}
<a class="lesson-links"
title="This lesson is not available for preview. As you are the Instructor of the course only you can see it."
href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}"
data-course="{{ course.name }}">
<svg class="icon icon-md">
<use class="" href="#icon-lock">
</svg>
<div>{{ lesson.title }}</div>
</a>
{% else %}
<div class="no-preview" title="This lesson is not available for preview" data-course="{{ course.name }}">
<div class="lesson-links">
<svg class="icon icon-md">
<use class="" href="#icon-lock">
</svg>
<div>{{ lesson.title }}</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
{% endfor %}
</div>
</div>
</div>
{% endfor %}