From bc139767a82df497cd7045b2dcfb33a0d0bb73dd Mon Sep 17 00:00:00 2001
From: raizasafeel <89463672+raizasafeel@users.noreply.github.com>
Date: Tue, 14 Apr 2026 17:07:52 +0530
Subject: [PATCH 1/2] feat: add empty state to batch student progress detail

---
 .../pages/Batches/components/BatchStudentProgress.vue  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Batches/components/BatchStudentProgress.vue b/frontend/src/pages/Batches/components/BatchStudentProgress.vue
index c2c05889..09ec110c 100644
--- a/frontend/src/pages/Batches/components/BatchStudentProgress.vue
+++ b/frontend/src/pages/Batches/components/BatchStudentProgress.vue
@@ -3,10 +3,17 @@
 		v-model="show"
 		:options="{
 			size: 'xl',
+			title: studentDetails.data?.full_name || __('Student Details'),
 		}"
 	>
 		<template #body>
-			<div v-if="studentDetails.data" class="p-5 space-y-10 text-sm">
+			<div
+				v-if="studentDetails.loading && !studentDetails.data"
+				class="flex items-center justify-center py-12"
+			>
+				<LoadingIndicator class="size-4" />
+			</div>
+			<div v-else-if="studentDetails.data" class="p-5 space-y-10 text-sm">
 				<div class="flex items-center gap-x-2">
 					<Avatar :image="studentDetails.data.user_image" size="3xl" />
 					<div class="space-y-1">
@@ -136,6 +143,7 @@ import {
 	ListRows,
 	ListRow,
 	ListRowItem,
+	LoadingIndicator,
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import ProgressBar from '@/components/ProgressBar.vue'

From 46c24b116652eb42ada3ebe90238dbcd9f2b033b Mon Sep 17 00:00:00 2001
From: raizasafeel <89463672+raizasafeel@users.noreply.github.com>
Date: Tue, 14 Apr 2026 17:08:13 +0530
Subject: [PATCH 2/2] fix: admin roles can enroll students in course/batch
 successfully

---
 lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py | 2 +-
 lms/lms/doctype/lms_enrollment/lms_enrollment.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
index 86058741..e5045505 100644
--- a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
+++ b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
@@ -32,7 +32,7 @@ class LMSBatchEnrollment(Document):
 
 	def validate_payment(self):
 		paid_batch = frappe.db.get_value("LMS Batch", self.batch, "paid_batch")
-		if paid_batch:
+		if paid_batch and not self.is_admin():
 			payment = frappe.db.exists(
 				"LMS Payment",
 				{
diff --git a/lms/lms/doctype/lms_enrollment/lms_enrollment.py b/lms/lms/doctype/lms_enrollment/lms_enrollment.py
index a4a4a75a..21db1042 100644
--- a/lms/lms/doctype/lms_enrollment/lms_enrollment.py
+++ b/lms/lms/doctype/lms_enrollment/lms_enrollment.py
@@ -63,7 +63,7 @@ class LMSEnrollment(Document):
 		if not course_details.published and not is_admin():
 			frappe.throw(_("You cannot enroll in an unpublished course."))
 
-		if course_details.paid_course:
+		if course_details.paid_course and not is_admin():
 			payment = frappe.db.exists(
 				"LMS Payment",
 				{