fix: conflicts
diff --git a/erpnext/www/book_appointment/index.js b/erpnext/www/book_appointment/index.js
index 262e31b..377a3cc 100644
--- a/erpnext/www/book_appointment/index.js
+++ b/erpnext/www/book_appointment/index.js
@@ -181,10 +181,32 @@
navigate_to_page(2)
let date_container = document.getElementsByClassName('date-span')[0];
let time_container = document.getElementsByClassName('time-span')[0];
+ setup_search_params();
date_container.innerHTML = moment(window.selected_date).format("MMM Do YYYY");
time_container.innerHTML = moment(window.selected_time, "HH:mm:ss").format("LT");
}
+function setup_search_params() {
+ let search_params = new URLSearchParams(window.location.search);
+ let customer_name = search_params.get("name")
+ let customer_email = search_params.get("email")
+ let detail = search_params.get("details")
+ if (customer_name) {
+ let name_input = document.getElementById("customer_name");
+ name_input.value = customer_name;
+ name_input.disabled = true;
+ }
+ if(customer_email) {
+ let email_input = document.getElementById("customer_email");
+ email_input.value = customer_email;
+ email_input.disabled = true;
+ }
+ if(detail) {
+ let detail_input = document.getElementById("customer_notes");
+ detail_input.value = detail;
+ detail_input.disabled = true;
+ }
+}
async function submit() {
let button = document.getElementById('submit-button');
button.disabled = true;
diff --git a/erpnext/www/lms/program.py b/erpnext/www/lms/program.py
index 7badedc..d3b04c2 100644
--- a/erpnext/www/lms/program.py
+++ b/erpnext/www/lms/program.py
@@ -22,7 +22,7 @@
try:
return frappe.get_doc('Program', program_name)
except frappe.DoesNotExistError:
- frappe.throw(_("Program {0} does not exist.".format(program_name)))
+ frappe.throw(_("Program {0} does not exist.").format(program_name))
def get_course_progress(courses, program):
progress = {course.name: utils.get_course_progress(course, program) for course in courses}