diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 30262bd8..f0c9ee1a 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -1102,56 +1102,54 @@ ready(el => { const nationality = el('nationality'); const selectedCountry = nationality.options[nationality.selectedIndex]; const qualifyCountry = selectedCountry.getAttribute('data-qualify'); - console.log(selectedCountry.value); - console.log(qualifyCountry); if (qualifyCountry == null || qualifyCountry != 'enable') { console.log("You don't qualify to enjoy China's 72-hour or 144-hour visa-free policy."); validateSuccess = false; - error_refusal.show(); - } - - const arrivalDate = new Date(arrivalDateVal); - const departureDate = new Date(departureDateVal); - const expiryDate = new Date(expiryDateVal); - const diffExpiryDate = calcDiffInDays(arrivalDate, expiryDate); - console.log(diffExpiryDate); - if (isNaN(diffExpiryDate) || diffExpiryDate <= 90) { - console.log('Your passport must be valid for more than 3 months at the time of entry into China.'); - validateSuccess = false; - error_3months.show(); - } + error_eligible.show(); + } else { + const arrivalDate = new Date(arrivalDateVal); + const departureDate = new Date(departureDateVal); + const expiryDate = new Date(expiryDateVal); + const diffExpiryDate = calcDiffInDays(arrivalDate, expiryDate); + console.log(diffExpiryDate); + if (isNaN(diffExpiryDate) || diffExpiryDate <= 90) { + console.log('Your passport must be valid for more than 3 months at the time of entry into China.'); + validateSuccess = false; + error_3months.show(); + } - const diffInDays = calcDiffInDays(arrivalDate, departureDate); - console.log(diffInDays); - if (isNaN(diffInDays) || diffInDays > 6) { - console.log('Your passport nationality is not eligible for the 72/144-hour visa exemption program.'); - validateSuccess = false; - error_72hours.show(); - } - - const airportOrRailwayStation = el('airport_or_railway_station'); - const selectedOption = airportOrRailwayStation.options[airportOrRailwayStation.selectedIndex]; - const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72'); - const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144'); + const diffInDays = calcDiffInDays(arrivalDate, departureDate); + console.log(diffInDays); + if (isNaN(diffInDays) || diffInDays > 6) { + console.log('Your passport nationality is not eligible for the 72/144-hour visa exemption program.'); + validateSuccess = false; + error_72hours.show(); + } - if (diffInDays > 0 && diffInDays <= 3 && indexOf72 !== -1) { - validateSuccess = true; - qualify_72hours.show(); - } else { - validateSuccess = false; - qualify_72hours.hide(); - error_72hours.show(); - } + const airportOrRailwayStation = el('airport_or_railway_station'); + const selectedOption = airportOrRailwayStation.options[airportOrRailwayStation.selectedIndex]; + const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72'); + const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144'); - if (diffInDays > 3 && diffInDays <= 6 && indexOf144 !== -1) { - validateSuccess = true; - qualify_144hours.show(); - } else { - validateSuccess = false; - qualify_144hours.hide(); - error_72hours.show(); - } + if (diffInDays > 0 && diffInDays <= 3 && indexOf72 !== -1) { + validateSuccess = true; + qualify_72hours.show(); + } else { + validateSuccess = false; + qualify_72hours.hide(); + error_72hours.show(); + } + if (diffInDays > 0 && diffInDays <= 6 && indexOf144 !== -1) { + validateSuccess = true; + qualify_144hours.show(); + } else { + validateSuccess = false; + qualify_144hours.hide(); + error_72hours.show(); + } + } + result_box.show(); if (validateSuccess) { tip_box.show();