Changed required values, add clientside validation
diff --git a/erpnext/crm/doctype/appointment/appointment.json b/erpnext/crm/doctype/appointment/appointment.json
index 22df5c6..9dfcc57 100644
--- a/erpnext/crm/doctype/appointment/appointment.json
+++ b/erpnext/crm/doctype/appointment/appointment.json
@@ -35,14 +35,12 @@
{
"fieldname": "customer_phone_number",
"fieldtype": "Data",
- "label": "Phone Number",
- "reqd": 1
+ "label": "Phone Number"
},
{
"fieldname": "customer_skype",
"fieldtype": "Data",
- "label": "Skype ID",
- "reqd": 1
+ "label": "Skype ID"
},
{
"fieldname": "customer_details",
@@ -95,7 +93,7 @@
"fieldtype": "Column Break"
}
],
- "modified": "2019-09-23 10:57:04.876506",
+ "modified": "2019-09-24 11:44:21.228104",
"modified_by": "Administrator",
"module": "CRM",
"name": "Appointment",
diff --git a/erpnext/www/book-appointment/index.html b/erpnext/www/book-appointment/index.html
index 2e03213..1f6dd2e 100644
--- a/erpnext/www/book-appointment/index.html
+++ b/erpnext/www/book-appointment/index.html
@@ -45,16 +45,14 @@
</div>
<div class="row justify-content-center mt-3">
<div class="col-md-4 align-items-center">
- <input class="form-control mt-3" type="text" name="customer_name" id="customer_name" placeholder="Your Name"
- required>
- <input class="form-control mt-3" type="tel" name="customer_number" id="customer_number"
- placeholder="Contact Number" required>
- <input class="form-control mt-3" type="text" name="customer_skype" id="customer_skype" placeholder="Skype"
- required>
- <input class="form-control mt-3"type="email" name="customer_email" id="customer_email"
- placeholder="Email Address">
+ <form id="customer-form" action='#'>
+ <input class="form-control mt-3" type="text" name="customer_name" id="customer_name" placeholder="Your Name (required)"required>
+ <input class="form-control mt-3" type="tel" name="customer_number" id="customer_number" placeholder="+910000000000">
+ <input class="form-control mt-3" type="text" name="customer_skype" id="customer_skype" placeholder="Skype">
+ <input class="form-control mt-3"type="email" name="customer_email" id="customer_email" placeholder="Email Address (required)"required>
<textarea class="form-control mt-3" name="customer_notes" id="customer_notes" cols="30" rows="10"
placeholder="Notes"></textarea>
+ </form>
<div class="row mt-3 ">
<div class="col-md"><button class="btn btn-dark form-control" onclick="initialise_select_date()">Go back</button></div>
<div class="col-md"><button class="btn btn-primary form-control " onclick="submit()" id="submit-button">Submit</button></div>
diff --git a/erpnext/www/book-appointment/index.js b/erpnext/www/book-appointment/index.js
index 345e614..6034f4e 100644
--- a/erpnext/www/book-appointment/index.js
+++ b/erpnext/www/book-appointment/index.js
@@ -195,7 +195,11 @@
}
async function submit() {
- // form validation here
+ let form = document.querySelector('#customer-form');
+ if(!form.checkValidity()){
+ form.reportValidity();
+ return;
+ }
get_form_data();
let appointment = (await frappe.call({
method: 'erpnext.www.book-appointment.index.create_appointment',
@@ -212,6 +216,7 @@
}
function get_form_data() {
+
contact = {};
contact.name = document.getElementById('customer_name').value;
contact.number = document.getElementById('customer_number').value;