chore: resolved conflicts

2023-08-17 21:25:52 +05:30
parent 01a1632a5a e23cfac5a7
commit 00bb71f714
29 changed files with 623 additions and 330 deletions
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -103,8 +103,8 @@ def get_enrolled_courses():
 				"short_introduction",
 				"image",
 				"enable_certification",
-				"paid_certificate",
-				"price_certificate",
+				"paid_course",
+				"course_price",
 				"currency",
 				"published",
 				"creation",
@@ -153,7 +153,9 @@ def get_authored_courses(member=None, only_published=True):
 				"title",
 				"short_introduction",
 				"image",
-				"enable_certification",
+				"paid_course",
+				"course_price",
+				"currency",
 				"status",
 				"published",
 				"creation",