Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui

lms/lms/doctype/batch_student/batch_student.py

@@ -11,6 +11,10 @@ class BatchStudent(Document):
 
 @frappe.whitelist()
 def enroll_batch(batch_name):
+	if frappe.db.exists(
+		"Batch Student", {"student": frappe.session.user, "parent": batch_name}
+	):
+		frappe.throw("You are already enrolled in this batch")
 	enrollment = frappe.new_doc("Batch Student")
 	enrollment.student = frappe.session.user
 	enrollment.parent = batch_name

lms/www/batches/batch_details.html

@@ -150,7 +150,7 @@
                 href="/billing/batch/{{ batch_info.name }}">
                 {{ _("Register Now") }}
             </a>
-            {% elif batch_info.allow_self_enrollment %}
+            {% elif batch_info.allow_self_enrollment and batch_info.seat_count and seats_left %}
             <button class="btn btn-primary wide-button enroll-batch">
                 {{ _("Enroll Now") }}
             </button>

lms/www/billing/billing.html

@@ -38,7 +38,7 @@
         <div class="flex">
             <div class="field-label">
                 {{ _("Total Price: ") }}
-                <span class="total-price">{{ frappe.utils.fmt_money(amount, 2, currency) }}</span>
+                <span class="total-price">{{ frappe.utils.fmt_money(amount_with_gst, 2, currency) if gst_applied else frappe.utils.fmt_money(amount, 2, currency) }}</span>
             </div>
         </div>
         {% if gst_applied %}

lms/www/billing/billing.py

@@ -17,9 +17,7 @@ def get_context(context):
 
 	context.original_currency = context.currency
 	context.original_amount = (
-		apply_gst(context.amount, None)[0]
+		(context.amount * 1.18) if context.original_currency == "INR" else context.amount
-		if context.original_currency == "INR"
-		else context.amount
 	)
 
 	context.exception_country = frappe.get_all(
@@ -32,7 +30,7 @@ def get_context(context):
 
 	context.address = get_address()
 	if context.currency == "INR":
-		context.amount, context.gst_applied = apply_gst(context.amount, None)
+		context.amount_with_gst, context.gst_applied = apply_gst(context.amount, None)
 
 
 def validate_access(doctype, docname, module):

lms/www/cohorts/cohort.html

@@ -1,6 +1,11 @@
 {% extends "www/cohorts/base.html" %} {% block title %} {{ _("Manage") }} {{
 course.title }} {% endblock %} {% block page_content %}
 <div class="course-home-headings">{{ cohort.title }}</div>
+{% if cohort.description %}
+<div>
+	{{ frappe.utils.md_to_html(cohort.description) }}
+</div>
+{% endif %}
 
 <p>
 	{{ frappe.db.count("Cohort Subgroup", {"cohort": cohort.name}) }} {{

lms/www/courses/index.html

@@ -169,3 +169,8 @@
     </div>
 </div>
 {% endblock %}
+{% block script %}
+<script>
+	frappe.telemetry.capture("active_site", "lms");
+</script>
+{% endblock %}