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

hotfix/paypal-note
赵鹏 2 years ago
commit fd5a0e1666

@ -139,30 +139,32 @@
When would you travel? When would you travel?
</h4> </h4>
<div id="date_error_msg" style="display: none"> <div id="date_error_msg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Select your travel date and trip length (days).</div> <div class="requiredArea" style="margin-top:-10px;">Select your travel data.</div>
</div> </div>
<div class="travel_group"> <div class="travel_group date_select">
<input type="radio" value="exact travel dates" id="exact" name="trip_date"> <input type="radio" value="exact travel dates" id="exact" name="trip_date">
<label for="exact" class="family"> <label for="exact" class="family">
I have exact travel dates. I have exact travel dates.
</label> </label>
</div> </div>
<div class="travel_group"> <div class="travel_group date_select">
<input type="radio" value="approximate travel dates" id="approximate" name="trip_date"> <input type="radio" value="approximate travel dates" id="approximate" name="trip_date">
<label for="approximate" class="couple"> <label for="approximate" class="couple">
I have approximate travel dates. I have approximate travel dates.
</label> </label>
</div> </div>
<div class="travel_group"> <div class="travel_group date_select">
<input type="radio" value="haven't decided travel dates" id="yet" name="trip_date"> <input type="radio" value="haven't decided travel dates" id="yet" name="trip_date">
<label for="yet" class="solo"> <label for="yet" class="solo">
I haven't decided my travel dates. I haven't decided my travel dates.
</label> </label>
</div> </div>
<div class="trip_date_length" id="tripDateBlock" style="display: none"> <div class="trip_date_length" id="tripDateBlock" style="display: none">
<p>Select your travel date and trip length (days).</p> <p style="clear: both;margin-bottom: 10px;" id="trip_date_tip">Select your travel date.</p>
<div id="dateSelectionBlock"> <div id="dateSelectionBlock">
<div id='flatpickrBlock'>
<input class="InquiryCalendar datepicker" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" type="text" value="" /> <input class="InquiryCalendar datepicker" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" type="text" value="" />
</div>
<input type="month" id="expectedMonth" name="expected_month" placeholder="Select your expected travel date."> <input type="month" id="expectedMonth" name="expected_month" placeholder="Select your expected travel date.">
</div> </div>
</div> </div>
@ -566,13 +568,6 @@ document.addEventListener('DOMContentLoaded', () => {
disableMobile: true, disableMobile: true,
minDate: "today" 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_button = document.getElementById("quick_inquiry_button");
var quick_inquiry_form = document.getElementById("quick_inquiry_form"); var quick_inquiry_form = document.getElementById("quick_inquiry_form");
@ -706,9 +701,11 @@ function validateQuickInquiryForm() {
}); });
var $tripDateBlock = $('#tripDateBlock'); var $tripDateBlock = $('#tripDateBlock');
var $expectedDate = $('#starting_date'); var $expectedDate = $('#flatpickrBlock');
var $expectedMonth = $('#expectedMonth'); var $expectedMonth = $('#expectedMonth');
var $dateSelectionBlock = $('#dateSelectionBlock'); var $dateSelectionBlock = $('#dateSelectionBlock');
var $tripDateTip = $('#trip_date_tip');
$('input[name="trip_date"]').each((i, tripDateEle) => { $('input[name="trip_date"]').each((i, tripDateEle) => {
$(tripDateEle).click(function (e) { $(tripDateEle).click(function (e) {
$expectedDate.val(''); $expectedDate.val('');
@ -720,12 +717,15 @@ function validateQuickInquiryForm() {
$dateSelectionBlock.show(); $dateSelectionBlock.show();
$expectedMonth.hide(); $expectedMonth.hide();
$expectedDate.show(); $expectedDate.show();
$tripDateTip.show();
} else if (selectedTripDate.id === 'approximate') { } else if (selectedTripDate.id === 'approximate') {
$dateSelectionBlock.show(); $dateSelectionBlock.show();
$expectedDate.hide(); $expectedDate.hide();
$expectedMonth.show(); $expectedMonth.show();
$tripDateTip.show();
} else if (selectedTripDate.id === 'yet') { } else if (selectedTripDate.id === 'yet') {
$dateSelectionBlock.hide(); $dateSelectionBlock.hide();
$tripDateTip.hide();
} }
}) })
}); });
@ -775,4 +775,12 @@ function validateQuickInquiryForm() {
} }
}); });
}) })
</script> </script>
<style>
.date_select {width: 27.5% !important;}
@media (max-width: 750px){
.date_select {
width: 93% !important;
}
}
</style>

@ -114,7 +114,7 @@
<ul class="inspiration" style="width:280px;"> <ul class="inspiration" style="width:280px;">
<li><a href="/tours">Top Asia Tours</a></li> <li><a href="/tours">Top Asia Tours</a></li>
<li><a href="/southeast-asia/tours">Southeast Asia</a></li> <li><a href="/southeast-asia">Southeast Asia</a></li>
<li><a href="/indian-continent/tours/india-nepal-sri-lanka-bhutan">India, Nepal, <li><a href="/indian-continent/tours/india-nepal-sri-lanka-bhutan">India, Nepal,
Sri Lanka, Bhutan</a></li> Sri Lanka, Bhutan</a></li>
<li><a href="/caucasus-central-asia/tours">Caucasus and Central Asia</a></li> <li><a href="/caucasus-central-asia/tours">Caucasus and Central Asia</a></li>

@ -123,7 +123,7 @@
<!-- destinations --> <!-- destinations -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="destinations"> <ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tours">Top Asia Tours</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/tours">Top Asia Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/tours">Southeast Asia</a> <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia">Southeast Asia</a>
</li> </li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/indian-continent/tours/india-nepal-sri-lanka-bhutan">India, Nepal, Sri Lanka, Bhutan</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/indian-continent/tours/india-nepal-sri-lanka-bhutan">India, Nepal, Sri Lanka, Bhutan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/caucasus-central-asia/tours">Caucasus and <li class="menu__item" role="menuitem"><a class="menu__link" href="/caucasus-central-asia/tours">Caucasus and

Loading…
Cancel
Save