eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: validate amount and currency for paid courses and batches

Browse Source
This commit is contained in:
Jannat Patel
2024-11-18 16:37:09 +05:30
parent dcf5c72cad
commit 1ecbc2e3f9
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/lms/doctype/lms_batch/lms_batch.json
View File

@@ -193,13 +193,15 @@
"depends_on": "paid_batch", "depends_on": "paid_batch",
"fieldname": "amount", "fieldname": "amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Amount" "label": "Amount",
"mandatory_depends_on": "paid_batch"
}, },
{ {
"depends_on": "paid_batch", "depends_on": "paid_batch",
"fieldname": "currency", "fieldname": "currency",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Currency", "label": "Currency",
"mandatory_depends_on": "paid_batch",
"options": "Currency" "options": "Currency"
}, },
{ {
@@ -328,7 +330,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2024-07-18 18:06:37.229885", "modified": "2024-11-18 16:28:41.336928",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Batch", "name": "LMS Batch",

5
lms/lms/doctype/lms_batch/lms_batch.py
View File

@@ -28,6 +28,7 @@ class LMSBatch(Document):
self.validate_duplicate_courses() self.validate_duplicate_courses()
self.validate_duplicate_students() self.validate_duplicate_students()
self.validate_payments_app() self.validate_payments_app()
self.validate_amount_and_currency()
self.validate_duplicate_assessments() self.validate_duplicate_assessments()
self.validate_membership() self.validate_membership()
self.validate_timetable() self.validate_timetable()
@@ -64,6 +65,10 @@ class LMSBatch(Document):
if "payments" not in installed_apps: if "payments" not in installed_apps:
frappe.throw(_("Please install the Payments app to create a paid batches.")) frappe.throw(_("Please install the Payments app to create a paid batches."))
def validate_amount_and_currency(self):
if self.paid_batch and (not self.amount or not self.currency):
frappe.throw(_("Amount and currency are required for paid batches."))
def validate_duplicate_assessments(self): def validate_duplicate_assessments(self):
assessments = [row.assessment_name for row in self.assessment] assessments = [row.assessment_name for row in self.assessment]
for assessment in self.assessment: for assessment in self.assessment:

5
lms/lms/doctype/lms_course/lms_course.py
View File

@@ -19,6 +19,7 @@ class LMSCourse(Document):
self.validate_video_link() self.validate_video_link()
self.validate_status() self.validate_status()
self.validate_payments_app() self.validate_payments_app()
self.validate_amount_and_currency()
self.image = validate_image(self.image) self.image = validate_image(self.image)
def validate_published(self): def validate_published(self):
@@ -51,6 +52,10 @@ class LMSCourse(Document):
if "payments" not in installed_apps: if "payments" not in installed_apps:
frappe.throw(_("Please install the Payments app to create a paid courses.")) 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):
frappe.throw(_("Amount and currency are required for paid courses."))
def on_update(self): def on_update(self):
if not self.upcoming and self.has_value_changed("upcoming"): if not self.upcoming and self.has_value_changed("upcoming"):
self.send_email_to_interested_users() self.send_email_to_interested_users()