fix: batch registration button conditions

lms/www/batches/batch_details.html

@@ -1,56 +1,35 @@
-{% extends "lms/templates/lms_base.html" %}
+{% extends "lms/templates/lms_base.html" %} {% block title %} {{
-{% block title %}
+_(batch_info.title) }} {% endblock %} {% block page_content %}
-	{{ _(batch_info.title) }}
-{% endblock %}
-
-
-{% block page_content %}
 <div class="common-page-style lms-page-style">
 	{{ BatchHeader(batch_info) }}
 	<div class="container">
 		{{ BatchOverlay(batch_info, courses, students) }}
 		<div class="pt-10">
-            {{ BatchDetails(batch_info) }}
+			{{ BatchDetails(batch_info) }} {{ CourseList(courses) }}
-            {{ CourseList(courses) }}
 		</div>
 	</div>
 	{{ BatchDetailsRaw() }}
 </div>
-{% endblock %}
+{% endblock %} {% macro BatchHeader(batch_info) %}
-
-{% macro BatchHeader(batch_info) %}
 <div class="course-head-container">
 	<div class="container">
 		<div class="course-card-wide">
-            {{ BreadCrumb(batch_info) }}
+			{{ BreadCrumb(batch_info) }} {{ BatchHeaderDetails(batch_info,
-            {{ BatchHeaderDetails(batch_info, courses, students) }}
+			courses, students) }}
 		</div>
 	</div>
 </div>
-{% endmacro %}
+{% endmacro %} {% macro BreadCrumb(batch_info) %}
-
-{% macro BreadCrumb(batch_info) %}
 <article class="mb-8">
-    <a class="dark-links" href="/batches">
+	<a class="dark-links" href="/batches"> {{ _("All Batches") }} </a>
-        {{ _("All Batches") }}
+	<img class="" src="/assets/lms/icons/chevron-right.svg" />
-    </a>
+	<span class="breadcrumb-destination"> {{ _("Batch Details") }} </span>
-    <img class="" src="/assets/lms/icons/chevron-right.svg">
-    <span class="breadcrumb-destination">
-        {{ _("Batch Details") }}
-    </span>
 </article>
-{% endmacro %}
+{% endmacro %} {% macro BatchHeaderDetails(batch_info, courses, students) %}
+<div class="class-details" data-batch="{{ batch_info.name }}">
+	<div class="page-title">{{ batch_info.title }}</div>
 
-{% macro BatchHeaderDetails(batch_info, courses, students) %}
+	<div class="">{{ batch_info.description }}</div>
-    <div class="class-details" data-batch="{{ batch_info.name }}">
-
-        <div class="page-title">
-            {{ batch_info.title }}
-        </div>
-
-        <div class="">
-            {{ batch_info.description }}
-        </div>
 
 	<div class="mt-8">
 		<svg class="icon icon-sm">
@@ -79,16 +58,11 @@
 		</span>
 	</div>
 	{% endif %}
-    </div>
+</div>
-{% endmacro %}
+{% endmacro %} {% macro BatchOverlay(batch_info, courses, students) %}
-
-{% macro BatchOverlay(batch_info, courses, students) %}
 <div class="course-overlay-card class-overlay">
-
 	<div class="course-overlay-content">
-
+		{% if batch_info.seat_count %} {% if seats_left %}
-        {% if batch_info.seat_count %}
-            {% if seats_left %}
 		<div class="indicator-pill green pull-right">
 			{{ _("Seats Available") }}: {{ seats_left }}
 		</div>
@@ -96,12 +70,10 @@
 		<div class="indicator-pill red pull-right">
 			{{ _("No seats left") }}
 		</div>
-            {% endif %}
+		{% endif %} {% endif %} {% if batch_info.paid_batch %}
-        {% endif %}
-
-        {% if batch_info.paid_batch %}
 		<div class="bold-heading">
-            {{ frappe.utils.fmt_money(batch_info.amount, 0, batch_info.currency) }}
+			{{ frappe.utils.fmt_money(batch_info.amount, 0, batch_info.currency)
+			}}
 		</div>
 		{% endif %}
 
@@ -132,7 +104,8 @@
 				<use href="#icon-clock"></use>
 			</svg>
 			<span>
-                {{ frappe.utils.format_time(batch_info.start_time, "hh:mm a") }} -
+				{{ frappe.utils.format_time(batch_info.start_time, "hh:mm a") }}
+				-
 			</span>
 			<span>
 				{{ frappe.utils.format_time(batch_info.end_time, "hh:mm a") }}
@@ -142,15 +115,22 @@
 
 		<div class="mt-2">
 			{% if is_moderator or is_evaluator %}
-            <a class="btn btn-primary wide-button" href="/batches/{{ batch_info.name }}">
+			<a
+				class="btn btn-primary wide-button"
+				href="/batches/{{ batch_info.name }}"
+			>
 				{{ _("Manage Batch") }}
 			</a>
-            {% elif batch_info.paid_batch %}
+			{% elif batch_info.paid_batch and batch_info.start_date >
-            <a class="btn btn-primary wide-button {% if batch_info.seat_count and not seats_left %} hide {% endif %}"
+			frappe.utils.getdate() %}
-                href="/billing/batch/{{ batch_info.name }}">
+			<a
+				class="btn btn-primary wide-button {% if batch_info.seat_count and not seats_left %} hide {% endif %}"
+				href="/billing/batch/{{ batch_info.name }}"
+			>
 				{{ _("Register Now") }}
 			</a>
-            {% elif batch_info.allow_self_enrollment and batch_info.seat_count and seats_left %}
+			{% elif batch_info.allow_self_enrollment and batch_info.seat_count
+			and seats_left and batch_info.start_date > frappe.utils.getdate() %}
 			<button class="btn btn-primary wide-button enroll-batch">
 				{{ _("Enroll Now") }}
 			</button>
@@ -169,24 +149,13 @@
 		{% endif %}
 	</div>
 </div>
-{% endmacro %}
+{% endmacro %} {% macro BatchDetails(batch_info) %}
-
+<div class="batch-details">{{ batch_info.batch_details }}</div>
-
+{% endmacro %} {% macro CourseList(courses) %} {% if courses | length or
-{% macro BatchDetails(batch_info) %}
+is_moderator %}
-<div class="batch-details">
-   {{ batch_info.batch_details }}
-</div>
-{% endmacro %}
-
-
-{% macro CourseList(courses) %}
-{% if courses | length or is_moderator %}
 <div class="batch-course-list">
-
+	<div class="align-center flex">
-    <div class="flex align-center">
+		<div class="page-title">{{ _("Courses") }}</div>
-        <div class="page-title">
-            {{ _("Courses") }}
-        </div>
 		{% if is_moderator %}
 		<button class="btn btn-default btn-sm btn-add-course ml-4">
 			{{ _("Add Course") }}
@@ -200,47 +169,46 @@
 		<div class="h-100">
 			{% if is_moderator %}
 			<div class="card-buttons">
-                <button class="btn icon-btn btn-default btn-edit-course"
+				<button
-                    data-name="{{ course.batch_course }}" data-course="{{ course.name }}"
+					class="btn icon-btn btn-default btn-edit-course"
-                    {% if course.evaluator %} data-evaluator="{{ course.evaluator }}" {% endif %}>
+					data-name="{{ course.batch_course }}"
+					data-course="{{ course.name }}"
+					{%
+					if
+					course.evaluator
+					%}
+					data-evaluator="{{ course.evaluator }}"
+					{%
+					endif
+					%}
+				>
 					<svg class="icon icon-sm">
 						<use href="#icon-edit"></use>
 					</svg>
 				</button>
-                <button class="btn icon-btn btn-default btn-remove-course ml-2" data-course="{{ course.name }}">
+				<button
+					class="btn icon-btn btn-default btn-remove-course ml-2"
+					data-course="{{ course.name }}"
+				>
 					<svg class="icon icon-sm">
 						<use href="#icon-delete"></use>
 					</svg>
 				</button>
 			</div>
-            {% endif %}
+			{% endif %} {{ widgets.CourseCard(course=course, read_only=False) }}
-			{{ widgets.CourseCard(course=course, read_only=False) }}
 		</div>
 		{% endfor %}
 	</div>
 	{% else %}
-	<div class="">
+	<div class="">{{ _("No courses") }}</div>
-		{{ _("No courses") }}
-	</div>
 	{% endif %}
 </div>
-{% endif %}
+{% endif %} {% endmacro %} {% macro BatchDetailsRaw() %} {% if
-{% endmacro %}
+batch_info.batch_details_raw %}
-
+<div class="mt-10 pt-10">{{ batch_info.batch_details_raw }}</div>
-
+{% endif %} {% endmacro %} {%- block script %} {{ super() }} {% if is_moderator
-{% macro BatchDetailsRaw() %}
+%}
-    {% if batch_info.batch_details_raw %}
+<script>
-        <div class="mt-10 pt-10">
-            {{ batch_info.batch_details_raw }}
-        </div>
-    {% endif %}
-{% endmacro %}
-
-{%- block script %}
-    {{ super() }}
-	{% if is_moderator %}
-    <script>
 	let batch_info = {{ batch_info | json }};
-    </script>
+</script>
-    {% endif %}
+{% endif %} {% endblock %}
-{% endblock %}