Merge pull request #1150 from pateljannat/roles-desk-access-issue

fix: desk access and course amount validation issue

lms/install.py

@@ -66,7 +66,9 @@ def delete_lms_roles():
 
 
 def create_course_creator_role():
-	if not frappe.db.exists("Role", "Course Creator"):
+	if frappe.db.exists("Role", "Course Creator"):
+		frappe.db.set_value("Role", "Course Creator", "desk_access", 0)
+	else:
 		role = frappe.get_doc(
 			{
 				"doctype": "Role",
@@ -79,7 +81,9 @@ def create_course_creator_role():
 
 
 def create_moderator_role():
-	if not frappe.db.exists("Role", "Moderator"):
+	if frappe.db.exists("Role", "Moderator"):
+		frappe.db.set_value("Role", "Moderator", "desk_access", 0)
+	else:
 		role = frappe.get_doc(
 			{
 				"doctype": "Role",
@@ -92,7 +96,9 @@ def create_moderator_role():
 
 
 def create_evaluator_role():
-	if not frappe.db.exists("Role", "Batch Evaluator"):
+	if frappe.db.exists("Role", "Batch Evaluator"):
+		frappe.db.set_value("Role", "Batch Evaluator", "desk_access", 0)
+	else:
 		role = frappe.new_doc("Role")
 		role.update(
 			{
@@ -105,7 +111,9 @@ def create_evaluator_role():
 
 
 def create_lms_student_role():
-	if not frappe.db.exists("Role", "LMS Student"):
+	if frappe.db.exists("Role", "LMS Student"):
+		frappe.db.set_value("Role", "LMS Student", "desk_access", 0)
+	else:
 		role = frappe.new_doc("Role")
 		role.update(
 			{

lms/lms/doctype/lms_course/lms_course.py

@@ -53,7 +53,7 @@ class LMSCourse(Document):
 				frappe.throw(_("Please install the Payments app to create a paid courses."))
 
 	def validate_amount_and_currency(self):
-		if self.paid_course and (not self.amount and not self.currency):
+		if self.paid_course and (not self.course_price and not self.currency):
 			frappe.throw(_("Amount and currency are required for paid courses."))
 
 	def on_update(self):

lms/patches.txt

@@ -93,4 +93,5 @@ lms.patches.v2_0.sidebar_settings
 lms.patches.v2_0.delete_certificate_request_notification #18-09-2024
 lms.patches.v2_0.add_course_statistics #21-10-2024
 lms.patches.v2_0.give_discussions_permissions
-lms.patches.v2_0.delete_web_forms
+lms.patches.v2_0.delete_web_forms
+lms.patches.v2_0.update_desk_access_for_lms_roles

lms/patches/v2_0/update_desk_access_for_lms_roles.py

@@ -0,0 +1,9 @@
+import frappe
+
+
+def execute():
+	roles = ["Course Creator", "Moderator", "Batch Evaluator", "LMS Student"]
+
+	for role in roles:
+		if frappe.db.exists("Role", role):
+			frappe.db.set_value("Role", role, "desk_access", 0)