feat: cerificate price

lms/lms/doctype/course_evaluator/course_evaluator.js

@@ -2,5 +2,13 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Course Evaluator', {
-
+    onload: (frm) => {
+        frm.set_query('evaluator', function(doc) {
+            return {
+                filters: {
+                    "ignore_user_type": 1,
+                }
+            };
+        });
+    }
 });

lms/lms/doctype/lms_certificate/lms_certificate.js

@@ -2,13 +2,13 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('LMS Certificate', {
-  onload: function (frm) {
+    onload: function (frm) {
-    frm.set_query("student", function (doc) {
+        frm.set_query("member", function (doc) {
-      return {
+                return {
-        filters: {
+                    filters: {
-          "ignore_user_type": 1,
+                        "ignore_user_type": 1,
-        }
+                    }
-      };
+                };
-    });
+        });
-  }
+    }
 });

lms/lms/doctype/lms_certificate/lms_certificate.json

@@ -7,6 +7,7 @@
  "field_order": [
   "course",
   "member",
+  "member_name",
   "column_break_3",
   "issue_date",
   "expiry_date"
@@ -44,11 +45,18 @@
    "label": "Member",
    "options": "User",
    "reqd": 1
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-04-05 14:19:34.409244",
+ "modified": "2022-04-06 11:49:36.077370",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate",
@@ -70,6 +78,6 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "member",
+ "title_field": "member_name",
  "track_changes": 1
-}
+}

lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js

@@ -20,5 +20,13 @@ frappe.ui.form.on('LMS Certificate Evaluation', {
                 }
             };
         });
+
+        frm.set_query('member', function(doc) {
+            return {
+                filters: {
+                    "ignore_user_type": 1,
+                }
+            };
+        });
     }
 });

lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json

@@ -8,6 +8,7 @@
  "field_order": [
   "course",
   "member",
+  "member_name",
   "date",
   "start_time",
   "end_time",
@@ -28,7 +29,6 @@
   {
    "fieldname": "member",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Member",
    "options": "User",
@@ -68,11 +68,18 @@
    "fieldname": "end_time",
    "fieldtype": "Time",
    "label": "End Time"
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-04-01 16:26:39.168390",
+ "modified": "2022-04-06 11:44:17.051279",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate Evaluation",
@@ -93,5 +100,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": []
+ "states": [],
+ "title_field": "member_name"
 }

lms/lms/doctype/lms_certificate_request/lms_certificate_request.js

@@ -9,5 +9,15 @@ frappe.ui.form.on('LMS Certificate Request', {
                 frm: frm
             });
         });
+    },
+
+    onload: function(frm) {
+        frm.set_query('member', function(doc) {
+            return {
+                filters: {
+                    "ignore_user_type": 1,
+                }
+            };
+        });
     }
 });

lms/lms/doctype/lms_certificate_request/lms_certificate_request.json

@@ -8,6 +8,7 @@
  "field_order": [
   "course",
   "member",
+  "member_name",
   "evaluator",
   "column_break_4",
   "date",
@@ -72,11 +73,18 @@
   {
    "fieldname": "column_break_4",
    "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-04-01 15:29:31.553492",
+ "modified": "2022-04-06 11:33:33.711545",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate Request",
@@ -97,5 +105,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": []
+ "states": [],
+ "title_field": "member_name"
 }

lms/lms/doctype/lms_course/lms_course.json

@@ -36,9 +36,12 @@
   "enable_certification",
   "expiry",
   "column_break_22",
-  "paid_certificate",
   "grant_certificate_after",
-  "evaluator"
+  "evaluator",
+  "pricing_section",
+  "paid_certificate",
+  "currency",
+  "price_certificate"
  ],
  "fields": [
   {
@@ -189,6 +192,25 @@
    "fieldtype": "Link",
    "label": "Evaluator",
    "options": "Course Evaluator"
+  },
+  {
+   "depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"",
+   "fieldname": "pricing_section",
+   "fieldtype": "Section Break",
+   "label": "Pricing"
+  },
+  {
+   "depends_on": "paid_certificate",
+   "fieldname": "price_certificate",
+   "fieldtype": "Currency",
+   "label": "Certificate Price"
+  },
+  {
+   "depends_on": "paid_certificate",
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "label": "Currency",
+   "options": "Currency"
   }
  ],
  "is_published_field": "published",
@@ -214,7 +236,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2022-04-01 15:19:13.075063",
+ "modified": "2022-04-07 12:27:05.353788",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

lms/lms/widgets/CourseCard.html

@@ -60,12 +60,18 @@
   <div class="progress">
     <div class="progress-bar" role="progressbar" aria-valuenow="{{ progress }}"
     aria-valuemin="0" aria-valuemax="100" style="width:{{ progress }}%">
-      <span class="sr-only"> {{ progress }} Complete</span>
+      <span class="sr-only"> {{ progress }} {{ _("Complete") }} </span>
     </div>
   </div>
-  <div class="progress-percent">{{ progress }}% Completed</div>
+  <div class="progress-percent">{{ progress }}% {{ _("Completed") }} </div>
   {% endif %}
 
+    {% if course.paid_certificate %}
+    <div class="certificate-price small mt-3">
+        {{ _("Certificate Price: ") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }}
+    </div>
+    {% endif %}
+
   <div class="course-card-footer">
     <span class="">
       {% set instructors = get_instructors(course.name) %}

lms/public/css/style.css

@@ -122,6 +122,7 @@ input[type=checkbox] {
   display: flex;
   flex-direction: column;
   flex: 1 1 auto;
+  color: var(--text-color);
 }
 
 .course-card-title {
@@ -813,16 +814,6 @@ input[type=checkbox] {
 .progress-percent {
   margin: 0.5rem 0;
   font-size: var(--text-base);
-  font-weight: 500;
-}
-
-.progress-percentage {
-  width: 100%;
-  font-size: 12px;
-  line-height: 165%;
-  letter-spacing: 0.02em;
-  color: #000000;
-  text-align: center;
 }
 
 pre {
@@ -862,13 +853,18 @@ pre {
 .certificate-footer {
     display: flex;
     justify-content: space-between;
-    width: 50%;
+    width: 30%;
     margin: 5rem auto 0;
 }
 
+.certificate-price {
+    font-weight: bold;
+    margin-bottom: 0.5rem;
+}
+
 .certificate-ribbon {
   background-color: var(--primary-color);
-  padding: 1rem;
+  padding: 0.5rem;
   border-radius: var(--border-radius-md);
 }
 
@@ -887,7 +883,7 @@ pre {
     border-radius: var(--border-radius-md);
     position: relative;
     box-shadow: var(--shadow-sm);
-    padding: 2rem;
+    padding: 1rem;
     text-align: center;
     margin: 0 6rem;
 }
@@ -901,26 +897,26 @@ pre {
   height: 1.5rem;
 }
 
+@media (max-width: 1050px) {
+    .certificate-footer {
+        width: 50%;
+    }
+}
+
 @media (max-width: 768px) {
-  .certificate-heading {
+    .certificate-card {
-    font-size: 1rem;
+        margin: 0;
-  }
+    }
 }
 
 @media (max-width: 550px) {
-  .certificate-footer {
+    .certificate-content {
-    flex-direction: column;
+        padding: 1rem;
-  }
+    }
-}
 
-@media (max-width: 500px) {
+    .certificate-footer {
-  .certificate-heading {
+        width: 100%;
-    font-size: 0.5rem;
+    }
-  }
-
-  .certificate-content {
-    padding: 2.5rem 2rem;
-  }
 }
 
 .profile-card {
@@ -944,7 +940,7 @@ pre {
 
 .empty-state-heading {
   font-size: var(--text-xl);
-  color: var(--gray-900);
+  color: var(--text-color);
   font-weight: 600;
 }
 
@@ -957,7 +953,7 @@ pre {
   background-image: url(/assets/frappe/icons/timeless/search.svg);
   border: none;
   border-radius: var(--border-radius-md);
-  font-size: var(--text-base);
+  font-size: var(--text-sm);
   padding: 0.625rem 0.75rem;
   height: 36px;
   background-repeat: no-repeat;
@@ -982,11 +978,11 @@ pre {
 .testimonial-author {
   font-weight: 500;
   font-size: var(--text-lg);
-  color: var(--gray-900);
+  color: var(--text-color);
 }
 
 .testimonial-review {
-  color: var(--gray-900);
+  color: var(--text-color);
   margin-bottom: 2rem;
 }
 
@@ -1212,7 +1208,8 @@ pre {
 .course-overlay-content {
   padding: 1.25rem;
   font-size: var(--text-base);
-  color: var(--gray-900);
+  color: var(--text-color);
+  text-align: center;
 }
 
 .breadcrumb-destination {

lms/templates/certificate.html

@@ -6,7 +6,7 @@
               {{ _("This certifies that") }}
             </div>
             <div class="certificate-heading"> {{ member.full_name }} </div>
-            <div class="mt-5"> {{ _("has successfully completed the course on") }} </div>
+            <div class="mt-2"> {{ _("has successfully completed the course on") }} </div>
             <div class="certificate-heading"> {{ course.title }} </div>
 
             <div class="certificate-footer">

lms/www/courses/course.html

@@ -106,8 +106,8 @@
     </div>
 
     {% if certificate_request %}
-    <p> <b>{{ _("Evaluation On") }}</b>
+    <p class="mb-2"> <b>{{ _("Evaluation On: ") }}</b>
-        {{ _(": {0} at {1}").format(frappe.utils.format_date(certificate_request.date, "medium"),
+        {{ _("{0} at {1}").format(frappe.utils.format_date(certificate_request.date, "medium"),
         frappe.utils.format_time(certificate_request.start_time, "short")) }} </p>
     {% endif %}
 
@@ -131,7 +131,7 @@
     </div>
     {% endif %}
 
-    <div class="vertically-center mb-2">
+    <div class="vertically-center justify-content-center mb-2">
       <div class="">
         <svg class="icon icon-md mr-1">
           <use class="" href="#icon-users">
@@ -151,6 +151,12 @@
       {% endif %}
     </div>
 
+    {% if course.paid_certificate %}
+    <div class="certificate-price">
+        {{ _("Certificate Price:") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }}
+    </div>
+    {% endif %}
+
     {% set lesson_index = get_lesson_index(membership.current_lesson) if membership and
       membership.current_lesson
       else '1.1' %}
@@ -173,12 +179,6 @@
       {{ _("Checkout Course") }} <img class="ml-2" src="/assets/lms/icons/white-arrow.svg" />
     </a>
 
-    {% elif membership %}
-    <a class="button wide-button is-primary" id="continue-learning"
-      href="{{ get_lesson_url(course.name, lesson_index) }}{{ course.query_parameter }}">
-      {{ _("Continue Learning") }} <img class="ml-2" src="/assets/lms/icons/white-arrow.svg" />
-    </a>
-
     {% elif course.upcoming and not is_user_interested %}
       <div class="button wide-button is-default"
         id="notify-me" data-course="{{course.name | urlencode}}">
@@ -191,6 +191,12 @@
           style="color: inherit;">
         {{ _("Manage the course") }}
       </a>
+
+    {% elif membership %}
+    <a class="button wide-button is-primary" id="continue-learning"
+    href="{{ get_lesson_url(course.name, lesson_index) }}{{ course.query_parameter }}">
+    {{ _("Continue Learning") }} <img class="ml-2" src="/assets/lms/icons/white-arrow.svg" />
+    </a>
     {% endif %}
 
     {% set certificate = is_certified(course.name) %}
@@ -210,6 +216,7 @@
     </div>
     {% endif %}
     {% endif %}
+
   </div>
 </div>
 

lms/www/courses/course.py

@@ -12,8 +12,8 @@ def get_context(context):
         raise frappe.Redirect
 
     course = frappe.db.get_value("LMS Course", course_name,
-        ["name", "title", "image", "short_introduction", "description", "published", "upcoming",
+        ["name", "title", "image", "short_introduction", "description", "published", "upcoming", "disable_self_learning", "status",
-        "disable_self_learning", "video_link", "enable_certification", "status", "grant_certificate_after"],
+        "video_link", "enable_certification", "grant_certificate_after", "paid_certificate", "price_certificate", "currency"],
         as_dict=True)
 
     related_courses = frappe.get_all("Related Courses", {"parent": course.name}, ["course"])

lms/www/courses/index.py

@@ -15,7 +15,8 @@ def get_context(context):
 def get_courses():
     courses = frappe.get_all("LMS Course",
                                 filters={"published": True},
-                                fields=["name", "upcoming", "title", "image", "enable_certification"])
+                                fields=["name", "upcoming", "title", "image", "enable_certification",
+                                "paid_certificate", "price_certificate", "currency"])
 
     live_courses, upcoming_courses = [], []
     for course in courses:

lms/www/utils.py

@@ -9,7 +9,7 @@ def get_common_context(context):
         batch_name = None
 
     course = frappe.db.get_value("LMS Course",
-        frappe.form_dict["course"], ["name", "title", "video_link"], as_dict=True)
+        frappe.form_dict["course"], ["name", "title", "video_link", "enable_certification"], as_dict=True)
     if not course:
         context.template = "www/404.html"
         return