fix: show price on all course cards

frappe · Aug 16, 2023 · c2a6697 · c2a6697
1 parent 211775d
commit c2a6697
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json
@@ -194,7 +194,7 @@
    "fieldname": "currency",
    "fieldtype": "Link",
    "label": "Currency",
-   "mandatory_depends_on": "paid_certificate",
+   "mandatory_depends_on": "paid_course",
    "options": "Currency"
   },
   {
@@ -223,7 +223,7 @@
    "fieldtype": "Currency",
    "label": "Course Price",
    "option": "currency",
-   "mandatory_depends_on": "paid_certificate"
+   "mandatory_depends_on": "paid_course"
   },
   {
    "fieldname": "column_break_rxww",
@@ -254,7 +254,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2023-08-02 12:07:26.354119",
+ "modified": "2023-08-02 12:07:26.354110",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
@@ -559,7 +559,9 @@ def get_courses_under_review():
 			"title",
 			"short_introduction",
 			"image",
-			"enable_certification",
+			"paid_course",
+			"course_price",
+			"currency",
 			"status",
 			"published",
 		],

diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html
@@ -110,7 +110,7 @@
 
             <div class="course-price">
                 {% if course.paid_course %}
-                    {{ format_amount(course.course_price, course.currency) }}
+                    {{ frappe.utils.fmt_money(course.course_price, 0, course.currency) }}
                 {% else %}
                     {{ _("Free") }}
                 {% endif %}

diff --git 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",
 			],
@@ -148,7 +148,9 @@ def get_authored_courses(member=None, only_published=True):
 				"title",
 				"short_introduction",
 				"image",
-				"enable_certification",
+				"paid_course",
+				"course_price",
+				"currency",
 				"status",
 				"published",
 			],

diff --git a/lms/www/classes/class.py b/lms/www/classes/class.py
@@ -129,8 +129,8 @@ def get_class_course_details(class_courses):
 				"upcoming",
 				"short_introduction",
 				"image",
-				"paid_certificate",
-				"price_certificate",
+				"paid_course",
+				"course_price",
 				"enable_certification",
 				"currency",
 			],

diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
@@ -123,7 +123,7 @@
             {{ Notes(course) }}
 
             <div class="vertically-center mb-3 bold-heading">
-                {{ format_amount(course.course_price, course.currency)  }}
+                {{ frappe.utils.fmt_money(course.course_price, 0, course.currency)  }}
             </div>
 
             <div class="vertically-center mb-3">