Merge pull request #1938 from pateljannat/enrollment-from-batch-main

fix: batch enrollment conditions

Author: pateljannat

lms/lms/doctype/lms_batch/lms_batch.py

@@ -30,7 +30,6 @@ def validate(self):
 		self.validate_payments_app()
 		self.validate_amount_and_currency()
 		self.validate_duplicate_assessments()
-		self.validate_membership()
 		self.validate_timetable()
 		self.validate_evaluation_end_date()
 
@@ -82,16 +81,6 @@ def validate_evaluation_end_date(self):
 		if self.evaluation_end_date and self.evaluation_end_date < self.end_date:
 			frappe.throw(_("Evaluation end date cannot be less than the batch end date."))
 
-	def validate_membership(self):
-		members = frappe.get_all("LMS Batch Enrollment", {"batch": self.name}, pluck="member")
-		for course in self.courses:
-			for member in members:
-				if not frappe.db.exists("LMS Enrollment", {"course": course.course, "member": member}):
-					enrollment = frappe.new_doc("LMS Enrollment")
-					enrollment.course = course.course
-					enrollment.member = member
-					enrollment.save()
-
 	def validate_seats_left(self):
 		if cint(self.seat_count) < 0:
 			frappe.throw(_("Seat count cannot be negative."))

lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py

@@ -17,6 +17,8 @@ def after_insert(self):
 	def validate(self):
 		self.validate_owner()
 		self.validate_duplicate_members()
+		self.validate_payment()
+		self.validate_self_enrollment()
 		self.validate_seat_availability()
 		self.validate_course_enrollment()
 
@@ -28,6 +30,32 @@ def validate_owner(self):
 		if "Moderator" not in roles and "Batch Evaluator" not in roles:
 			frappe.throw(_("You must be a Moderator or Batch Evaluator to enroll users in a batch."))
 
+	def validate_payment(self):
+		paid_batch = frappe.db.get_value("LMS Batch", self.batch, "paid_batch")
+		if paid_batch:
+			payment = frappe.db.exists(
+				"LMS Payment",
+				{
+					"payment_for_document_type": "LMS Batch",
+					"payment_for_document": self.batch,
+					"member": self.member,
+					"payment_received": True,
+				},
+			)
+			if not payment:
+				frappe.throw(_("Payment is required to enroll in this batch."))
+			else:
+				self.payment = payment
+
+	def validate_self_enrollment(self):
+		allow_self_enrollment = frappe.db.get_value("LMS Batch", self.batch, "allow_self_enrollment")
+		if not allow_self_enrollment and not self.is_admin():
+			frappe.throw(_("Enrollment in this batch is restricted. Please contact the Administrator."))
+
+	def is_admin(self):
+		roles = frappe.get_roles(frappe.session.user)
+		return "Course Creator" in roles or "Moderator" in roles or "Batch Evaluator" in roles
+
 	def validate_duplicate_members(self):
 		if frappe.db.exists(
 			"LMS Batch Enrollment",
@@ -52,6 +80,7 @@ def validate_course_enrollment(self):
 				enrollment = frappe.new_doc("LMS Enrollment")
 				enrollment.course = course.course
 				enrollment.member = self.member
+				enrollment.enrollment_from_batch = self.batch
 				enrollment.save()
 
 	def add_member_to_live_class(self):

lms/lms/doctype/lms_enrollment/lms_enrollment.json

@@ -10,6 +10,7 @@
   "progress",
   "payment",
   "current_lesson",
+  "enrollment_from_batch",
   "column_break_3",
   "member",
   "member_name",
@@ -129,13 +130,19 @@
    "fieldname": "member_image",
    "fieldtype": "Attach Image",
    "label": "Member Image"
+  },
+  {
+   "fieldname": "enrollment_from_batch",
+   "fieldtype": "Link",
+   "label": "Enrollment from Batch",
+   "options": "LMS Batch"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-12-15 21:27:30.733483",
- "modified_by": "Administrator",
+ "modified": "2025-12-23 12:50:13.622277",
+ "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Enrollment",
  "owner": "Administrator",

lms/lms/doctype/lms_enrollment/lms_enrollment.py

@@ -29,6 +29,9 @@ def validate_course_enrollment_eligibility(self):
 				)
 			)
 
+		if self.enrollment_from_batch:
+			return
+
 		if not course_details.published:
 			frappe.throw(_("You cannot enroll in an unpublished course."))
 

lms/lms/utils.py

@@ -1775,11 +1775,7 @@ def enroll_in_batch(batch, payment_name=None):
 	if not frappe.db.exists("LMS Batch", batch):
 		frappe.throw(_("The specified batch does not exist."))
 
-	batch_doc = frappe.db.get_value(
-		"LMS Batch", batch, ["name", "seat_count", "allow_self_enrollment", "paid_batch"], as_dict=True
-	)
 	payment_doc = get_payment_details(payment_name)
-	validate_enrollment_eligibility(batch_doc, payment_doc)
 	create_enrollment(batch, payment_doc)
 
 
@@ -1792,27 +1788,6 @@ def get_payment_details(payment_name):
 	return payment_doc
 
 
-def validate_enrollment_eligibility(batch_doc, payment_doc=None):
-	if frappe.db.exists("LMS Batch Enrollment", {"batch": batch_doc.name, "member": frappe.session.user}):
-		frappe.throw(_("You are already enrolled in this batch."))
-
-	if batch_doc.paid_batch:
-		if not payment_doc or not payment_doc.payment_received:
-			frappe.throw(_("Payment is required to enroll in this batch."))
-
-	elif not batch_doc.allow_self_enrollment and not is_admin():
-		frappe.throw(_("Enrollment in this batch is restricted. Please contact the Administrator."))
-
-	students = frappe.db.count("LMS Batch Enrollment", {"batch": batch_doc.name})
-	if batch_doc.seat_count and students >= batch_doc.seat_count:
-		frappe.throw(_("There are no seats available in this batch."))
-
-
-def is_admin():
-	roles = frappe.get_roles(frappe.session.user)
-	return "Course Creator" in roles or "Moderator" in roles or "Batch Evaluator" in roles
-
-
 def create_enrollment(batch, payment_doc=None):
 	new_student = frappe.new_doc("LMS Batch Enrollment")
 	new_student.update(