Merge pull request #336 from pateljannat/format-amount

This commit is contained in:
Jannat Patel
2022-05-19 17:17:10 +05:30
committed by GitHub
5 changed files with 16 additions and 6 deletions

View File

@@ -189,7 +189,8 @@ jinja = {
"lms.lms.utils.is_instructor",
"lms.lms.utils.convert_number_to_character",
"lms.lms.utils.get_signup_optin_checks",
"lms.lms.utils.get_popular_courses"
"lms.lms.utils.get_popular_courses",
"lms.lms.utils.format_amount"
],
"filters": []
}

View File

@@ -203,13 +203,15 @@
"depends_on": "paid_certificate",
"fieldname": "price_certificate",
"fieldtype": "Currency",
"label": "Certificate Price"
"label": "Certificate Price",
"mandatory_depends_on": "paid_certificate"
},
{
"depends_on": "paid_certificate",
"fieldname": "currency",
"fieldtype": "Link",
"label": "Currency",
"mandatory_depends_on": "paid_certificate",
"options": "Currency"
},
{
@@ -258,7 +260,7 @@
"link_fieldname": "course"
}
],
"modified": "2022-05-04 11:03:24.001015",
"modified": "2022-05-19 16:59:21.933367",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Course",

View File

@@ -1,6 +1,6 @@
import re
import frappe
from frappe.utils import flt, cint, cstr, getdate, add_months
from frappe.utils import flt, cint, cstr, getdate, add_months, fmt_money
from lms.lms.md import markdown_to_html, find_macros
import string
from frappe import _
@@ -366,3 +366,10 @@ def get_evaluation_details(course, member=None):
"request": request,
"no_of_attempts": no_of_attempts
})
def format_amount(amount, currency):
amount_reduced = amount / 1000
if amount_reduced < 1:
return amount
precision = 0 if amount % 1000 == 0 else 1
return _("{0}K").format(fmt_money(amount_reduced, precision, currency))

View File

@@ -68,7 +68,7 @@
{% if course.paid_certificate %}
<div class="certificate-price small mt-3" data-price="{{ course.price_certificate }}">
{{ _("Certificate Price: ") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }}
{{ _("Certificate Price: {0}").format(format_amount(course.price_certificate, course.currency)) }}
</div>
{% endif %}

View File

@@ -151,7 +151,7 @@
{% if course.paid_certificate %}
<div class="certificate-price" data-price="{{ course.price_certificate }}">
{{ _("Certificate Price:") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }}
{{ _("Certificate Price:") }} {{ format_amount(course.price_certificate, course.currency) }}
</div>
{% endif %}