diff --git a/frappe-ui b/frappe-ui index 1c97498f..70bc4760 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 1c97498fb2bf4b64c82a96dac0fdb61ae77e59dc +Subproject commit 70bc4760e4fb969b2ef1cbb04e344d2dd5728032 diff --git a/frontend/package.json b/frontend/package.json index 22a7c252..18cb4a51 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "codemirror-editor-vue3": "^2.8.0", "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.108", + "frappe-ui": "^0.1.109", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", "pinia": "^2.0.33", diff --git a/frontend/src/components/BatchCard.vue b/frontend/src/components/BatchCard.vue index c2318715..47005473 100644 --- a/frontend/src/components/BatchCard.vue +++ b/frontend/src/components/BatchCard.vue @@ -6,7 +6,10 @@
Hi {{ doc.billing_name }},
-We noticed that you started enrolling in the {{ doc.payment_for_document_type.split(" ")[-1] }} {{ frappe.db.get_value(doc.payment_for_document_type, doc.payment_for_document, "title") }} but didn’t complete your payment.
-We have a limited number of seats, and they won't be available for long!
-Don’t miss this opportunity to enhance your skills. Click below to complete your enrollment:
-- 👉 Complete Your Enrollment -
-If you have any questions or need assistance, feel free to reach out to our support team.
-Looking forward to seeing you enrolled!
-Hi {{ doc.billing_name }},
\nWe noticed that you started enrolling in the {{ doc.payment_for_document_type.split(\" \")[-1] }} {{ frappe.db.get_value(doc.payment_for_document_type, doc.payment_for_document, \"title\") }} but didn\u2019t complete your payment.
\nWe have a limited number of seats, and they won't be available for long!
\nDon\u2019t miss this opportunity to enhance your skills. Click below to complete your enrollment:
\n\n \ud83d\udc49 Complete Your Enrollment\n
\nIf you have any questions or need assistance, feel free to reach out to our support team.
\nLooking forward to seeing you enrolled!
\nAdd your message here
diff --git a/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.py b/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.py deleted file mode 100644 index 80b7b873..00000000 --- a/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.py +++ /dev/null @@ -1,6 +0,0 @@ -import frappe - - -def get_context(context): - # do your magic here - pass diff --git a/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.txt b/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.txt deleted file mode 100644 index 28e1c47e..00000000 --- a/lms/lms/notification/payment_completion_reminder/payment_completion_reminder.txt +++ /dev/null @@ -1,11 +0,0 @@ -Hi {{ doc.member_name }}, - -We noticed that you started enrolling in the {{ doc.payment_for_document_type.split(" ")[-1] }} {{ frappe.db.get_value(doc.payment_for_document_type, doc.payment_for_document, "title") }} but didn’t complete your payment. We have limited number of seats and they won't be empty for long. - -Don’t miss this opportunity to enhance your skills. Click below to complete your enrollment now: - -[👉 Complete Your Enrollment](/lms/billing/{{ doc.payment_for_document_type.split(" ")[-1].lower()/doc.payment_for_document }}) - -If you have any questions or need assistance, feel free to reach out to our support team. - -Looking forward to seeing you enrolled! diff --git a/lms/lms/utils.py b/lms/lms/utils.py index b8b1d5a9..c7a82860 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -1434,7 +1434,7 @@ def get_batch_students(batch): """ Iterate through courses and track their progress """ for course in batch_courses: progress = frappe.db.get_value( - "LMS Enrollment", {"course": course.course, "member": student.student}, "progress" + "LMS Enrollment", {"course": course.course, "member": student.member}, "progress" ) detail.courses[course.title] = progress if progress == 100: @@ -1445,11 +1445,12 @@ def get_batch_students(batch): title = frappe.db.get_value( assessment.assessment_type, assessment.assessment_name, "title" ) - status = has_submitted_assessment( - assessment.assessment_name, assessment.assessment_type, student.student + assessment_info = has_submitted_assessment( + assessment.assessment_name, assessment.assessment_type, student.member ) - detail.assessments[title] = status - if status not in ["Not Attempted", 0]: + detail.assessments[title] = assessment_info + + if assessment_info.result == "Passed": assessments_completed += 1 detail.courses_completed = courses_completed @@ -1493,9 +1494,28 @@ def has_submitted_assessment(assessment, assessment_type, member=None): attempt = frappe.db.exists(doctype, filters) if attempt: attempt_details = frappe.db.get_value(doctype, filters, fields) - return attempt_details + if assessment_type == "LMS Quiz": + result = "Failed" + passing_percentage = frappe.db.get_value( + "LMS Quiz", assessment, "passing_percentage" + ) + if attempt_details >= passing_percentage: + result = "Passed" + else: + result = attempt_details + return frappe._dict( + { + "status": attempt_details, + "result": result, + } + ) else: - return not_attempted + return frappe._dict( + { + "status": not_attempted, + "result": "Failed", + } + ) @frappe.whitelist() diff --git a/lms/locale/ar.po b/lms/locale/ar.po index 865a4a48..2c4cc89c 100644 --- a/lms/locale/ar.po +++ b/lms/locale/ar.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:08\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "" msgid "All questions should have the same marks if the limit is set." msgstr "" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/bs.po b/lms/locale/bs.po index ece8eeac..8f4a7a56 100644 --- a/lms/locale/bs.po +++ b/lms/locale/bs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-02-09 16:12\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Svi podnesci" msgid "All questions should have the same marks if the limit is set." msgstr "" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "Kursevi su uspješno izbrisani" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 @@ -5193,7 +5199,7 @@ msgstr "" #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json msgid "Thursday" -msgstr "" +msgstr "Četvrtak" #. Label of the time (Time) field in DocType 'LMS Live Class' #: frontend/src/components/Modals/Event.vue:48 diff --git a/lms/locale/de.po b/lms/locale/de.po index d1370769..91c9842f 100644 --- a/lms/locale/de.po +++ b/lms/locale/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Alle Einsendungen" msgid "All questions should have the same marks if the limit is set." msgstr "Alle Fragen sollten die gleiche Punktzahl haben, wenn das Limit festgelegt ist." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "Kursinhalt" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Abgeschlossene Kurse" msgid "Courses Mentored" msgstr "Betreute Kurse" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/eo.po b/lms/locale/eo.po index 9524d5b0..ed735b93 100644 --- a/lms/locale/eo.po +++ b/lms/locale/eo.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Esperanto\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "crwdns149254:0crwdne149254:0" msgid "All questions should have the same marks if the limit is set." msgstr "crwdns149256:0crwdne149256:0" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "crwdns152392:0crwdne152392:0" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "crwdns149562:0crwdne149562:0" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "crwdns149600:0crwdne149600:0" msgid "Courses Mentored" msgstr "crwdns149602:0crwdne149602:0" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "crwdns149604:0crwdne149604:0" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "crwdns150766:0{0}crwdne150766:0" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/es.po b/lms/locale/es.po index 1a26fb89..d85ce414 100644 --- a/lms/locale/es.po +++ b/lms/locale/es.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:08\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Todas las entregas" msgid "All questions should have the same marks if the limit is set." msgstr "Todas las preguntas deberían tener las mismas marcas si el límite está establecido." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "Contenido del curso" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Cursos completados" msgid "Courses Mentored" msgstr "Cursos Mentorados" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "Cursos eliminados correctamente" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "Enviado {0}" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/fa.po b/lms/locale/fa.po index fb7cff7d..9eee167f 100644 --- a/lms/locale/fa.po +++ b/lms/locale/fa.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-02-08 16:11\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "همه موارد ارسالی" msgid "All questions should have the same marks if the limit is set." msgstr "در صورت تعیین حد مجاز، همه سؤالات باید نمرات یکسانی داشته باشند." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "محتوای دوره" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "دورههای گذرانده شده" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/fr.po b/lms/locale/fr.po index c92c7e77..5261d43a 100644 --- a/lms/locale/fr.po +++ b/lms/locale/fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:08\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Tous les envois" msgid "All questions should have the same marks if the limit is set." msgstr "Toutes les questions doivent avoir les mêmes notes si la limite est fixée." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "Contenu du cours" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Cours terminés" msgid "Courses Mentored" msgstr "Cours encadrés" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/hu.po b/lms/locale/hu.po index 983f99c8..d3438f3d 100644 --- a/lms/locale/hu.po +++ b/lms/locale/hu.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "" msgid "All questions should have the same marks if the limit is set." msgstr "" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/pl.po b/lms/locale/pl.po index f69f2704..c82d6ab1 100644 --- a/lms/locale/pl.po +++ b/lms/locale/pl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "" msgid "All questions should have the same marks if the limit is set." msgstr "" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/ru.po b/lms/locale/ru.po index c74f587e..41d0d1f5 100644 --- a/lms/locale/ru.po +++ b/lms/locale/ru.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Все заявки" msgid "All questions should have the same marks if the limit is set." msgstr "Если установлен лимит, все вопросы должны иметь одинаковые баллы." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "Содержание курса" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Курсов завершено" msgid "Courses Mentored" msgstr "Курсы с наставником" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "Отправлено {0}" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/sv.po b/lms/locale/sv.po index 22de7537..fa61fc54 100644 --- a/lms/locale/sv.po +++ b/lms/locale/sv.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-02-09 16:12\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Alla Godkännande" msgid "All questions should have the same marks if the limit is set." msgstr "Alla frågor ska ha samma märken om gräns är angiven." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "Tillåt Gäst Åtkomst" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "Kursinnehåll" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Klara Kurser" msgid "Courses Mentored" msgstr "Kurser Mentorerade" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "Kurser borttagna" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "Inskickad {0}" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/tr.po b/lms/locale/tr.po index e086767c..ccad300a 100644 --- a/lms/locale/tr.po +++ b/lms/locale/tr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "Tüm Gönderiler" msgid "All questions should have the same marks if the limit is set." msgstr "Eğer bir sınır konulmuşsa tüm soruların puanları aynı olmalıdır." +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -523,7 +528,7 @@ msgstr "Rozet Resmi" #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json #: lms/lms/doctype/lms_live_class/lms_live_class.json msgid "Batch" -msgstr "Toplu İşlem" +msgstr "Parti" #. Label of the batch_confirmation_template (Link) field in DocType 'LMS #. Settings' @@ -1214,6 +1219,7 @@ msgstr "Kurs İçeriği" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "Tamamlanan Kurslar" msgid "Courses Mentored" msgstr "Mentorluk Yapılan Kurslar" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "Kurslar başarıyla silindi" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "Kaydedildi {0}" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/locale/zh.po b/lms/locale/zh.po index 814e096d..766432a0 100644 --- a/lms/locale/zh.po +++ b/lms/locale/zh.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" -"POT-Creation-Date: 2025-01-24 16:04+0000\n" -"PO-Revision-Date: 2025-01-28 12:17\n" +"POT-Creation-Date: 2025-02-07 16:03+0000\n" +"PO-Revision-Date: 2025-02-10 16:09\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Chinese Simplified\n" "MIME-Version: 1.0\n" @@ -240,6 +240,11 @@ msgstr "" msgid "All questions should have the same marks if the limit is set." msgstr "" +#. Label of the allow_guest_access (Check) field in DocType 'LMS Settings' +#: lms/lms/doctype/lms_settings/lms_settings.json +msgid "Allow Guest Access" +msgstr "" + #. Label of the allow_posting (Check) field in DocType 'Job Settings' #: lms/job/doctype/job_settings/job_settings.json msgid "Allow Job Posting From Website" @@ -1214,6 +1219,7 @@ msgstr "" #. Name of a role #: frontend/src/pages/ProfileRoles.vue:16 +#: lms/lms/doctype/course_chapter/course_chapter.json #: lms/lms/doctype/lms_course/lms_course.json #: lms/lms/doctype/lms_program/lms_program.json #: lms/lms/doctype/lms_question/lms_question.json @@ -1340,7 +1346,7 @@ msgstr "" msgid "Courses Mentored" msgstr "" -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 msgid "Courses deleted successfully" msgstr "" @@ -4917,7 +4923,7 @@ msgid "Submitted {0}" msgstr "" #: frontend/src/components/Assignment.vue:316 -#: frontend/src/components/BatchCourses.vue:150 +#: frontend/src/components/BatchCourses.vue:151 #: frontend/src/components/BatchOverlay.vue:135 #: frontend/src/components/BatchStudents.vue:302 #: frontend/src/components/CourseCardOverlay.vue:165 diff --git a/lms/patches.txt b/lms/patches.txt index d3f6ba5b..2fd46b79 100644 --- a/lms/patches.txt +++ b/lms/patches.txt @@ -98,4 +98,5 @@ lms.patches.v2_0.update_desk_access_for_lms_roles lms.patches.v2_0.update_quiz_submission_data lms.patches.v2_0.convert_quiz_duration_to_minutes lms.patches.v2_0.allow_guest_access #05-02-2025 -lms.patches.v2_0.migrate_batch_student_data #10-02-2025 \ No newline at end of file +lms.patches.v2_0.migrate_batch_student_data #10-02-2025 +lms.patches.v2_0.delete_old_enrollment_doctypes \ No newline at end of file diff --git a/lms/patches/v2_0/delete_old_enrollment_doctypes.py b/lms/patches/v2_0/delete_old_enrollment_doctypes.py new file mode 100644 index 00000000..8d694a90 --- /dev/null +++ b/lms/patches/v2_0/delete_old_enrollment_doctypes.py @@ -0,0 +1,6 @@ +import frappe + + +def execute(): + frappe.delete_doc("DocType", "Batch Student") + frappe.delete_doc("Notification", "Payment Completion Reminder") diff --git a/lms/templates/emails/payment_reminder.html b/lms/templates/emails/payment_reminder.html new file mode 100644 index 00000000..dd2847be --- /dev/null +++ b/lms/templates/emails/payment_reminder.html @@ -0,0 +1,19 @@ +{{ _('Hi') }} {{ billing_name }},
+{{ _('We noticed that you started enrolling in the') }} {{ type }} {{ title }} {{ _('but didn’t complete your payment') }}.
++ {{ _("We have a limited number of seats, and they won't be available for long!")}} +
++ {{ _("Don’t miss this opportunity to enhance your skills. Click below to complete your enrollment") }}: +
++ 👉 Complete Your Enrollment +
++ {{ _("If you have any questions or need assistance, feel free to reach out to our support team.") }} +
++ {{ __("Looking forward to seeing you enrolled!") }} +
+