Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hainatravel/information-system into master

Browse Source 
# Conflicts:
#	application/views/mobile_first/ch-info-page-form.php
hotfix/paypal-note
candice 3 years ago
parent b0b16094b9 b858dd45a2
commit 646077744b
4 changed files with 139 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
application/third_party/wwwlog/controllers/index.php vendored
Unescape Escape View File

@ -60,6 +60,7 @@ class Index extends CI_Controller
and request_uri NOT like '%.png'
and request_uri NOT like '%.gif'
and request_uri NOT like '%.css'
and request_uri NOT like '%.webp'
and request_uri NOT like '%.js'
and request_uri NOT like '%.woff'
and request_uri NOT like '%.ttf'

18
application/views/mobile_first/ah-gp-form.php
Unescape Escape View File

@ -1,3 +1,4 @@
<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
<div class="tmbottom">
<h3 style="text-align: center; font-size: 20px; line-height: 22px;">Book this trip now. Your 1:1 travel consultant will reply within 1 working day.</h3>
<form action="https://www.asiahighlights.com/orders/quick_inquiry_save" method="post" novalidate="" id='gp_form'>
@ -728,9 +729,24 @@
const submitFormBtn = el('submit_gp_form');
const gp_form = el('gp_form');
submitFormBtn.on('click', () => {
if (validateGPForm()) {
el('gp_form').submit();
if (typeof(grecaptcha) === "undefined") {
console.warn('grecaptcha is disabled.');
gp_form.submit();
} else {
grecaptcha.enterprise.ready(async () => {
const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
var el = document.createElement("input");
el.type = "hidden";
el.name = "__grecaptcha_token__";
el.value = token;
gp_form.appendChild(el);
gp_form.submit();
});
}
}
});

30
application/views/mobile_first/ah-info-page-form.php
Unescape Escape View File

@ -1,9 +1,11 @@
<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
<div class="tmbottom">
<h3 style="text-align: center; font-size: 20px; line-height: 22px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</h3>
<form action="/orders/quick_inquiry_save" method="post" novalidate="" onsubmit="return validateQuickInquiryForm()">
<form action="/orders/quick_inquiry_save" method="post" novalidate="" id="info_page_form">
<textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea>
<input class="FullName" id="realname" name="name" placeholder="Your name *" required="" type="text" value="" />
<div id="realname_errmsg" style="display: none">
@ -599,7 +601,7 @@
</div>
<button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="YDFW-AH"/>
<button class="sendButton" id="info_page_button" name="booking_form_inquiry_list" type="button">Inquire Now</button> <input name="cli_no" type="hidden" value="YDFW-AH"/>
<input name="ic_title" type="hidden" value="YDFW-AH" />
</form>
<h3 style="text-align: center; font-size: 20px; line-height: 22px;">For a quick conversation, simply reach us via WhatsApp:</h3>
@ -620,6 +622,30 @@ document.addEventListener('DOMContentLoaded', () => {
disableMobile: true,
minDate: "today"
});
var info_page_button = document.getElementById("info_page_button");
var info_page_form = document.getElementById("info_page_form");
info_page_button.addEventListener('click', function(event) {
var validateResult = validateQuickInquiryForm();
if (validateResult) {
if (typeof(grecaptcha) === "undefined") {
console.warn('grecaptcha is disabled.');
info_page_form.submit();
} else {
grecaptcha.enterprise.ready(async () => {
const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
var el = document.createElement("input");
el.type = "hidden";
el.name = "__grecaptcha_token__";
el.value = token;
info_page_form.appendChild(el);
info_page_form.submit();
});
}
}
});
});
function validateQuickInquiryForm() {

96
application/views/mobile_first/ah-inquiry-form.php
Unescape Escape View File

@ -1,8 +1,7 @@
<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
<div class="tmbottom">
<h3 style="text-align: center; font-size: 20px; line-height: 22px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</h3>
<form action="/orders/quick_inquiry_save" method="post" novalidate="" onsubmit="return validateQuickInquiryForm()">
<form action="/orders/quick_inquiry_save" method="post" novalidate="" id="quick_inquiry_form">
<textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)"></textarea>
<input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date *" readonly="readonly" type="text" value="" />
<div id="starting_date_errmsg" style="display: none">
@ -599,7 +598,7 @@
</div>
<button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="button">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
</form>
<h3 style="text-align: center;
@ -610,3 +609,92 @@
Email: <span class="wechatred">contact@asiahighlights.com</span></div>
</div>
</div>
<script src="https://data.chinahighlights.com/js/flatpickr-4.6.1.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', () => {
flatpickr("#starting_date", {
dateFormat: "Y-m-d",
altInput: true,
altFormat: "F j, Y",
disableMobile: true,
minDate: "today"
});
flatpickr("#ending_date", {
dateFormat: "Y-m-d",
altInput: true,
altFormat: "F j, Y",
disableMobile: true,
minDate: "today"
});
var quick_inquiry_button = document.getElementById("quick_inquiry_button");
var quick_inquiry_form = document.getElementById("quick_inquiry_form");
quick_inquiry_button.addEventListener('click', function(event) {
var validateResult = validateQuickInquiryForm();
if (validateResult) {
if (typeof(grecaptcha) === "undefined") {
console.warn('grecaptcha is disabled.');
quick_inquiry_form.submit();
} else {
grecaptcha.enterprise.ready(async () => {
const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
var el = document.createElement("input");
el.type = "hidden";
el.name = "__grecaptcha_token__";
el.value = token;
quick_inquiry_form.appendChild(el);
quick_inquiry_form.submit();
});
}
}
});
});
function validateQuickInquiryForm() {
var result = true;
var realnameVal = document.getElementById("realname").value;
var emailVal = document.getElementById("email").value;
var startingDateVal = document.getElementById("starting_date").value;
var contactVal = document.getElementById("PhoneNo").value;
var realnameErrEl = document.getElementById("realname_errmsg");
var emailErrEl = document.getElementById("email_errmsg");
var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
var startingDateErrEl = document.getElementById("starting_date_errmsg");
var contactErrEl = document.getElementById("contact_errmsg");
realnameErrEl.style.display = 'none';
emailErrEl.style.display = 'none';
emailVerifyErrEl.style.display = 'none';
startingDateErrEl.style.display = 'none';
contactErrEl.style.display = 'none';
if (realnameVal === '') {
realnameErrEl.style.display = '';
result = false;
}
if (emailVal === '') {
emailErrEl.style.display = '';
result = false;
} else {
var emailPattern = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
if (!emailPattern.test(emailVal)) {
emailVerifyErrEl.style.display = '';
result = false;
}
}
if (startingDateVal === '') {
startingDateErrEl.style.display = '';
result = false;
}
if (contactVal === '') {
contactErrEl.style.display = '';
result = false;
}
return result;
}
</script>
Write Preview
Loading…
Cancel
Save