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

Browse Source
master
LMR 2 years ago
parent 2b26461811 5a68e26218
commit 7aa376e4ab
23 changed files with 1275 additions and 1430 deletions
Show Stats Download Patch File Download Diff File

13
application/controllers/information.php
Unescape Escape View File

@ -1199,7 +1199,9 @@ class Information extends CI_Controller
public function test_price() public function test_price()
{ {
$price_rule = '<div style="color: red;">#ah-8,st,2#</div><div style="color: red;">#ah-8,st,2#</div>'; $price_rule = '<div style="color: red;">#ah-23,st,2#</div>';
$price_item_array = $this->price_pregmatch($price_rule);
var_dump($price_item_array);
$price_tag_list = $this->parse_price_tag($price_rule); $price_tag_list = $this->parse_price_tag($price_rule);
var_dump($price_tag_list); var_dump($price_tag_list);
} }
@ -2285,8 +2287,7 @@ class Information extends CI_Controller
$dataform["TourCode"] = $productCode; $dataform["TourCode"] = $productCode;
$dataform["CLI_SN"] = $tourdata->clisn; $dataform["CLI_SN"] = $tourdata->clisn;
$dataform["TourName"] = $information->ic_title; $dataform["TourName"] = $information->ic_title;
$template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true);
$data["template_form_tourqi"] = $template_form_tourqi; //表单模板字符串
} }
@ -2374,6 +2375,12 @@ class Information extends CI_Controller
} }
} }
if ($meta_ct_page_type == "tourdetail") {
$dataform['device'] = $device;
$template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true);
$data["template_form_tourqi"] = $template_form_tourqi; //表单模板字符串
}
//两种设备分别调用两种模板 ，静态化 //两种设备分别调用两种模板 ，静态化
switch ($device) { switch ($device) {
case 'mobile': case 'mobile':

14
application/models/feedback_model.php
Unescape Escape View File

@ -16,9 +16,11 @@ class Feedback_model extends CI_Model {
$this->HT->query(" $this->HT->query("
select top 40 select top 40
tad_content, tai_customerid, tai_title, tai_getdate, tai_url tad_content, tai_customerid, tai_title, tai_getdate, tai_url
from Eva_TAInfo from Eva_TAInfo tai
left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join Eva_TADetail on TAD_TAI_SN=TAI_SN
left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN
where TAD_Content is not null where TAD_Content is not null
and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002
order by tai_getdate desc"); order by tai_getdate desc");
$feedback_result = $feedback_query->result(); $feedback_result = $feedback_query->result();
@ -51,9 +53,11 @@ class Feedback_model extends CI_Model {
$this->HT->query(" $this->HT->query("
select top 40 select top 40
tad_content, tai_customerid, tai_title, tai_getdate, tai_url tad_content, tai_customerid, tai_title, tai_getdate, tai_url
from Eva_TAInfo from Eva_TAInfo tai
left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join Eva_TADetail on TAD_TAI_SN=TAI_SN
left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN
where TAD_Content is not null where TAD_Content is not null
and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002
order by tai_getdate desc"); order by tai_getdate desc");
$feedback_result = $feedback_query->result(); $feedback_result = $feedback_query->result();
@ -66,11 +70,11 @@ class Feedback_model extends CI_Model {
$feedback_count = COUNT($feedback_list); $feedback_count = COUNT($feedback_list);
if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {
$feedback = [ $feedback = [
// 'title' => $feedback_row->tai_title, 'title' => $feedback_row->tai_title,
'customer' => $feedback_row->tai_customerid, 'customer' => $feedback_row->tai_customerid,
// 'content' => $feedback_row->tad_content, // 'content' => $feedback_row->tad_content,
// 'url' => $feedback_row->tai_url, 'url' => $feedback_row->tai_url,
// 'createdOn' => $createdOnString 'createdOn' => $createdOnString
]; ];
$feedback_list[] = $feedback; $feedback_list[] = $feedback;
$customer_id_list[] = $feedback_row->tai_customerid; $customer_id_list[] = $feedback_row->tai_customerid;

4
application/third_party/ctmobilefirst/models/api_model.php vendored
Unescape Escape View File

@ -93,7 +93,7 @@ class Api_model extends CI_Model {
$reust = ""; $reust = "";
//'新的GP没有设置以前的2-5人等价格，导致读不出价格。把Gp价格放前面计算 //'新的GP没有设置以前的2-5人等价格，导致读不出价格。把Gp价格放前面计算
$sql = "select top 1 CLI_SN,CLI_PackageClass from CustomerLineInfo $sql = "select top 1 CLI_SN,CLI_PackageClass from CustomerLineInfo
where CLI_NO=? and CLI_State=1005004 where CLI_NO=? and ( CLI_State = 1005003 or CLI_State=1005004) and CLI_Grade=7001
AND (CLI_DEI_SN= ? )"; AND (CLI_DEI_SN= ? )";
$query = $this->HT->query($sql,array($cli_no,$this->dei_sn)); $query = $this->HT->query($sql,array($cli_no,$this->dei_sn));
if (!$query->num_rows()>0){ if (!$query->num_rows()>0){
@ -137,7 +137,7 @@ class Api_model extends CI_Model {
CustomerLinePrice ON CustomerLineInfo.CLI_SN = CustomerLinePrice.CLP_CLI_SN INNER JOIN CustomerLinePrice ON CustomerLineInfo.CLI_SN = CustomerLinePrice.CLP_CLI_SN INNER JOIN
CustomerLineInfo2 ON CustomerLineInfo.CLI_SN = CustomerLineInfo2.CLI2_CLI_SN CustomerLineInfo2 ON CustomerLineInfo.CLI_SN = CustomerLineInfo2.CLI2_CLI_SN
where CLI_SN= ? and CLI2_LGC=? and (CLP_Area=1 or CLP_Area=2) where CLI_SN= ? and CLI2_LGC=? and (CLP_Area=1 or CLP_Area=2)
and CLI_State = 1005004 ORDER BY CLP_TwoToFiveAdultPrice"; and (CLI_State = 1005004 or CLI_State = 1005003) ORDER BY CLP_TwoToFiveAdultPrice";
$query = $this->HT->query($sql,array($CLI_SN,$this->CTLGC)); $query = $this->HT->query($sql,array($CLI_SN,$this->CTLGC));
if ($query->num_rows()>0){ if ($query->num_rows()>0){
$reust = $query->row()->CLP_TwoToFiveAdultPrice; $reust = $query->row()->CLP_TwoToFiveAdultPrice;

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

@ -8,12 +8,10 @@
<form action="/orders/quick_inquiry_save" method="post" novalidate="" id="info_page_form"> <form action="/orders/quick_inquiry_save" method="post" novalidate="" id="info_page_form">
<textarea id="form_additionalrequirements" name="additional_requirements" placeholder="E.g.: This is a big trip for anniversary, honeymoon, birthday celebration..." style="height:90px;"></textarea> <textarea id="form_additionalrequirements" name="additional_requirements" placeholder="E.g.: This is a big trip for anniversary, honeymoon, birthday celebration..." style="height:90px;"></textarea>
<div class="selectionBlock" style="margin-bottom: 0;"> <div class="selectionBlock">
<p style=" <h4 style="margin-bottom: 0;margin-top: 0; padding-bottom: 0;">
margin-bottom: 0px; How would you travel?
"> </h4>
<strong>Number in your group</strong>
</p>
<div id="group_error_msg" style="display: none"> <div id="group_error_msg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please select number in your group.</div> <div class="requiredArea" style="margin-top:-10px;">Please select number in your group.</div>
</div> </div>
@ -43,96 +41,167 @@
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style="margin-top: 0;margin-bottom: 0;"><strong>Adults number</strong></p>
<div class="peopleSelect"> <div class="kids_age">
<p style=" margin-top: 10px; <p style="margin-bottom: 0;">65+ yrs old</p>
margin-bottom: 10px;"><strong> <select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
Adults (≥18 years old) <option value="0">0</option>
</strong> </p> <option value="1">1</option>
<button class="minaddBtn reduceadult" id="minusAdult" type="button" <option value="2">2</option>
value="-">-</button> <option value="3">3</option>
<input class="number" type="text" value="2" id="adultNumber" name="adult"> <option value="4">4</option>
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button> <option value="5">5</option>
</div> <option value="6">6</option>
<div class="age_range"> <option value="7">7</option>
<p> <option value="8">8</option>
Adults' ages <option value="9">9</option>
</p> <option value="10">10</option>
<div class="checkYes" style="float:left;"> <option value="11">11</option>
<label for="65+"> <option value="12">12</option>
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+ <option value="13">13</option>
</label> <option value="14">14</option>
</div> <option value="15">15</option>
<div class="checkYes" style="float:left;"> <option value="16">16</option>
<label for="51-64"> <option value="17">17</option>
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64 <option value="18">18</option>
</label> <option value="19">19</option>
</div> <option value="20">20</option>
<div class="checkYes" style="float:left;"> <option value="21">21</option>
<label for="41-50"> <option value="22">22</option>
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50 <option value="23">23</option>
</label> <option value="24">24</option>
</div> <option value="25">25</option>
<div class="checkYes" style="float:left;"> <option value="26">26</option>
<label for="31-40"> <option value="27">27</option>
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40 <option value="28">28</option>
</label> <option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
<div class="checkYes" style="float:left;"> <div class="kids_age">
<label for="18-30"> <p style="margin-bottom: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 5px;font-size: 18px;">people</p>
</div> </div>
<div class="kids_age">
<p style="margin-bottom: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id="childrenBlock" style="display: none">
<p style=" margin-top: -10px; margin-bottom: 5px;"><strong>Children (age of children at time of trip)</strong></p> <p style="margin-top: 0;margin-bottom: 0;"><strong>Children number</strong></p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="4">4</option>
<option value="2">2 <option value="5">5</option>
</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
@ -605,21 +674,9 @@
$(function () { $(function () {
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -627,11 +684,6 @@
} else { } else {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
}
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
} }
}) })
}); });
@ -667,53 +719,6 @@
var tripLength = $('#tripLengthNumber').val(); var tripLength = $('#tripLengthNumber').val();
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
// Trip Length // Trip Length
$('#tripLengthPlus').click(function () { $('#tripLengthPlus').click(function () {
tripLength++; tripLength++;

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

@ -37,99 +37,169 @@
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style="margin-top: 0;margin-bottom: 0;"><strong>Adults number</strong></p>
<div class="kids_age">
<p style="margin-bottom: 0;">65+ yrs old</p>
<select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style=" <p style="
margin-bottom: 0; margin-top: 5px;font-size: 18px;
font-size: 22px; ">people</p>
margin-top: 20px;
">When you plan to take the trip:</p>
<div class="peopleSelect">
<p style="margin-top: 20px;"><strong>
Adults (≥18 years old)
</strong> </p>
<button class="minaddBtn reduceadult" id="minusAdult" type="button"
value="-">-</button>
<input class="number" type="text" value="2" id="adultNumber" name="adult">
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
</div>
<div class="age_range">
<p>
Adults' ages
</p>
<div class="checkYes" style="float:left;">
<label for="65+">
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="51-64">
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="41-50">
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="31-40">
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40
</label>
</div> </div>
<div class="checkYes" style="float:left;"> <div class="kids_age">
<label for="18-30"> <p style="margin-bottom: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age">
<p style="margin-bottom: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id="childrenBlock" style="display: none">
<p style="margin-top: 0;margin-bottom: 0;"><strong>Children</strong></p> <p style="margin-top: 0;margin-bottom: 0;"><strong>Children number</strong></p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="4">4</option>
<option value="2">2 <option value="5">5</option>
</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
@ -205,82 +275,7 @@
<div id="email_verify_errmsg" style="display: none"> <div id="email_verify_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please verify your email.</div> <div class="requiredArea" style="margin-top:-10px;">Please verify your email.</div>
</div> </div>
<!--<div class="selectionBlock">
<div class="peopleSelect">
<span class="formMemo">
Adults (≥12 years old)
</span>
<div class="numberBtn">
<input class="minaddBtn reduceadult" id="minusAdult" type="button" value="-">
<input class="number" type="text" id="adultNumber" readonly value="1" name="adultnumber">
<input class="minaddBtn addadult" id="plusAdult" type="button" value="+">
</div>
</div>
<div class="age_range">
<p>
Adults' ages
</p>
<div class="checkYes">
<label for="12-17">
<input type="checkbox" value="yes" name="adult age range 12 17" id="12-17" class="checkBorder">12-17
</label>
</div>
<div class="checkYes">
<label for="18-30">
<input type="checkbox" value="yes" name="adult age range 18 30" id="18-30" class="checkBorder">18-30
</label>
</div>
<div class="checkYes">
<label for="31-50">
<input type="checkbox" value="yes" name="adult age range 31 50" id="31-50" class="checkBorder">31-50
</label>
</div>
<div class="checkYes">
<label for="51-64">
<input type="checkbox" value="yes" name="adult age range 51 64" id="51-64" class="checkBorder">51-64
</label>
</div>
<div class="checkYes">
<label for="65+">
<input type="checkbox" value="yes" name="adult age range 65" id="65+" class="checkBorder">65+
</label>
</div>
</div>
<div class="peopleSelect">
<span class="formMemo">
Kids (2-11 years old)
</span>
<div class="numberBtn">
<input class="minaddBtn reducechild" id="minusKid" type="button" value="-">
<input class="kidNum" type="text" id="kidNumber" readonly value="0" name="kidnumber">
<input class="minaddBtn addchild" id="plusKid" type="button" value="+">
</div>
</div>
<div class="age_range">
<p>
Kids' ages
</p>
<div class="checkYes">
<label for="0">
<input type="checkbox" value="yes" name="kid age range 0 2" id="0" class="checkBorder">0-2
</label>
</div>
<div class="checkYes">
<label for="3">
<input type="checkbox" value="yes" name="kid age range 3 7" id="3" class="checkBorder">3-7
</label>
</div>
<div class="checkYes">
<label for="8">
<input type="checkbox" value="yes" name="kid age range 8 11" id="8" class="checkBorder">8-11
</label>
</div>
</div>
<div class="clear">
</div>
</div>-->
<select name="country_code" class="country_code"> <select name="country_code" class="country_code">
<option style="font-weight: 600;" value="United States +1">United States&nbsp; &nbsp;+1</option> <option style="font-weight: 600;" value="United States +1">United States&nbsp; &nbsp;+1</option>
<option style="font-weight: 600;" value="United Kingdom +44">United Kingdom&nbsp; &nbsp;+44</option> <option style="font-weight: 600;" value="United Kingdom +44">United Kingdom&nbsp; &nbsp;+44</option>
@ -567,15 +562,6 @@ margin-bottom: 10px;
<button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="button">Inquire Now</button> <input name="product_code" 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="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" /> <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
</form> </form>
<!--
<h3 style="text-align: center;
font-size: 20px;
line-height: 22px;">For a quick conversation, simply reach us via WhatsApp:</h3>
<div class="contactwechat"><img alt="Asia Highlights' wechat code" height="100px" src="https://data.asiahighlights.com/image/about/asia-highlights-whatsapp-code.jpg" width="100px" >
<div class="wechatinfo"><span class="wechatred">+8615807734776</span><br>
Email: <span class="wechatred">contact@asiahighlights.com</span></div>
</div>
-->
</div> </div>
<script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/flatpickr-4.6.1.min.js"></script> <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/flatpickr-4.6.1.min.js"></script>
@ -691,21 +677,8 @@ function validateQuickInquiryForm() {
$(function () { $(function () {
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -713,11 +686,6 @@ function validateQuickInquiryForm() {
} else { } else {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
}
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
} }
}) })
}); });
@ -751,51 +719,6 @@ function validateQuickInquiryForm() {
} }
}) })
}); });
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
}) })
</script> </script>
<style> <style>

117
application/views/mobile_first/ah-pc.php
Unescape Escape View File

@ -55,53 +55,7 @@
alt="Asiahighlights logo" class="asiahighlightslogo img-responsive"></a> alt="Asiahighlights logo" class="asiahighlightslogo img-responsive"></a>
<div class="p_topnavigation"> <div class="p_topnavigation">
<ul class="pctopnavi"> <ul class="pctopnavi">
<li class="dropdown"><a href="/japan/tours" class="p_topnavilink">Japan</a> <li class="dropdown"><a href="/tours" class="p_topnavilink">Tours</a></li>
<div class=" dropdown-content">
<div class="inspirationinfo">
<div class="inspirationlist vacationtype">
<span class="inspirationtitle">Itinerary Ideas</span>
<div class="listtour">
<ul class="inspiration">
<li><a href="/japan/tours/tokyo-highlights">5 Days</a></li>
<li><a href="/japan/tours/tokyo-kyoto-osaka">7 Days</a></li>
<li><a href="/japan/tours/tokyo-hakone-kyoto-hiroshima-osaka">8 Days</a></li>
<li><a href="/japan/tours/japan-highlights">9 Days</a></li>
<li><a href="/japan/tours/tokyo-yokohama-hakone-kyoto-nara-osaka">10 Days</a></li>
<li><a href="/japan/tours/traditional-japan">11 Days</a></li>
<li><a href="/japan/tours/classic-japan">12 Days</a></li>
</ul>
<ul class="inspiration">
<li><a href="/japan/tours/family-vacation">14 Days</a></li>
<li><a href="/japan/tours/japan-china-discovery">16 Days</a></li>
<li><a href="/japan/tours/summer-family-vacation">17 Days</a></li>
<li><a href="/japan/tours/nara-tokyo-hakone-nagoya-kyoto-osaka">18 Days</a></li>
<li><a href="/japan/tours/tokyo-kyoto-nara-osaka-hiroshima-fukuoka">21 Days</a></li>
<li><a href="/japan/3-week-itineraries">3 Weeks</a></li>
</ul>
</div>
</div>
<div class="inspirationlist vacationtype">
<span class="inspirationtitle">Trip Plan</span>
<div class="listtour">
<ul class="inspiration">
<li><a href="/japan/plan-a-trip">Bucket List Trip</a></li>
<li><a href="/japan/how-to-plan-a-family-trip-to-japan">Family Trip</a></li>
<li><a href="/japan/plan-a-cherry-blossom-trip">Cherry Blossom Trip</a></li>
<li><a href="/japan/planning-a-summer-trip">Summer Trip</a></li>
<li><a href="/japan/plan-a-winter-trip">Winter Trip</a></li>
</ul>
<ul class="inspiration">
<li><a href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">Japan-South
Korea Trip</a></li>
<li><a href="/asia/plan-a-trip-to-china-and-japan">Japan-China Trip</a></li>
<li><a href="/asia/plan-a-trip-to-japan-and-thailand">Japan-Thailand
Trip</a></li>
</ul>
</div>
</div>
</div>
</div>
</li>
<li class="dropdown"><a href="/southeast-asia/tours/thailand-cambodia-and-vietnam" <li class="dropdown"><a href="/southeast-asia/tours/thailand-cambodia-and-vietnam"
class="p_topnavilink" id="thailand_vietnam_cambodia_pc">Thailand-Vietnam-Cambodia</a> class="p_topnavilink" id="thailand_vietnam_cambodia_pc">Thailand-Vietnam-Cambodia</a>
<div class=" dropdown-content"> <div class=" dropdown-content">
@ -217,74 +171,7 @@
</div> </div>
</div> </div>
</li> </li>
<li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a> <li class="dropdown"><a class="p_topnavilink" href="/itinerary-ideas">Itinerary Ideas</a></li>
<div class=" dropdown-content">
<div class="inspirationinfo">
<div class="inspirationlist topthings">
<span class="inspirationtitle">7-12 Days Itinerary</span>
<div class="listtour">
<ul class="inspiration">
<li><a href="/japan/1-week-itinerary">1 Week in Japan</a></li>
<li><a href="/vietnam/7-days-itinerary">1 Week in Vietnam</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/8-day-china-itinerary.htm"
target="_blank">8 Days in China</a></li>
<li><a href="/japan/10-day-itineraries">10 Days in Japan</a></li>
<li><a href="/vietnam/10-days-itinerary">10 Days in Vietnam</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm"
target="_blank">10 Days in China</a></li>
<li><a href="/japan/12-day-itineraries">12 Days in Japan</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/12-days-china-itinerary.htm"
target="_blank">12 Days in China</a></li>
</ul>
</div>
</div>
<div class="inspirationlist topthings">
<span class="inspirationtitle">2-Week Itinerary</span>
<div class="listtour">
<ul class="inspiration">
<li><a href="/southeast-asia/2-weeks-itinerary ">Southeast Asia</a></li>
<li><a href="/japan/2-week-itineraries">Japan</a></li>
<li><a href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">
Japan and South Korea</a></li>
<li><a href="/thailand/2-weeks-in-thailand">Thailand</a></li>
<li><a href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
<li><a href="/india/2-week-itinerary">India</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm"
target="_blank">China</a></li>
</ul>
</div>
</div>
<div class="inspirationlist topthings">
<span class="inspirationtitle">3-Week Itinerary</span>
<ul class="inspiration">
<li><a href="/southeast-asia/3-weeks-itinerary">Southeast Asia</a></li>
<li><a href="/japan/3-week-itineraries">Japan</a></li>
<li><a href="/vietnam/3-weeks-itinerary">Vietnam</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm"
target="_blank">China</a></li>
<li><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam">Thailand,
Cambodia, Vietnam</a></li>
<li><a href="/asia/tours/china-and-vietnam">China, Vietnam</a></li>
<li><a href="/asia/tours/china-nepal-and-india">China, Nepal, India</a></li>
<li><a href="/asia/tours/china-laos-thailand">China, Laos, Thailand</a></li>
</ul>
</div>
<div class="inspirationlist topthings">
<span class="inspirationtitle">4-Week Itinerary</span>
<ul class="inspiration">
<li><a href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm"
target="_blank">China</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="dropdown"><a href="/about-us" class="p_topnavilink">About Us</a> <li class="dropdown"><a href="/about-us" class="p_topnavilink">About Us</a>
<div class=" dropdown-content"> <div class=" dropdown-content">
<div class="inspirationinfo"> <div class="inspirationinfo">

47
application/views/mobile_first/ah-recommends-tour.php
Unescape Escape View File

@ -1,12 +1,11 @@
<div class="infopage_ad_content"> <div class="infopage_ad_content">
<?php if (!empty($recommands['Content Tour A']) || !empty($recommands['Content Tour B']) || !empty($recommands['Content Tour C']) || !empty($recommands['Content Tour D'])) { ?> <?php if (!empty($recommands['Content Tour A']) || !empty($recommands['Content Tour B']) || !empty($recommands['Content Tour C']) || !empty($recommands['Content Tour D'])) { ?>
<div class="content_article_title">You might be interested in:</div> <div class="content_article_title">Explore similar itineraries:</div>
<?php if (!empty($recommands['Content Tour A'])) { ?> <?php if (!empty($recommands['Content Tour A'])) { ?>
<div class="infopage_ad"> <div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour A']->ic_url; ?>"> <img <a href="<?php echo $recommands['Content Tour A']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy" src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour A']->mobile_photo; ?>" originalsrc="<?php echo $recommands['Content Tour A']->desktop_photo; ?>"
class="img-responsive" class="img-responsive"
alt="<?php echo $recommands['Content Tour A']->ic_title; ?>"></a> alt="<?php echo $recommands['Content Tour A']->ic_title; ?>"></a>
@ -23,7 +22,7 @@
<div class="infopage_ad"> <div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour B']->ic_url; ?>"> <img <a href="<?php echo $recommands['Content Tour B']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy" src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour B']->mobile_photo; ?>" originalsrc="<?php echo $recommands['Content Tour B']->desktop_photo; ?>"
class="img-responsive" class="img-responsive"
alt="<?php echo $recommands['Content Tour B']->ic_title; ?>"></a> alt="<?php echo $recommands['Content Tour B']->ic_title; ?>"></a>
@ -41,7 +40,7 @@
<div class="infopage_ad"> <div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour C']->ic_url; ?>"> <img <a href="<?php echo $recommands['Content Tour C']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy" src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour C']->mobile_photo; ?>" originalsrc="<?php echo $recommands['Content Tour C']->desktop_photo; ?>"
class="img-responsive" class="img-responsive"
alt="<?php echo $recommands['Content Tour C']->ic_title; ?>"></a> alt="<?php echo $recommands['Content Tour C']->ic_title; ?>"></a>
@ -58,7 +57,7 @@
<div class="infopage_ad"> <div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour D']->ic_url; ?>"> <img <a href="<?php echo $recommands['Content Tour D']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy" src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour D']->mobile_photo; ?>" originalsrc="<?php echo $recommands['Content Tour D']->desktop_photo; ?>"
class="img-responsive" class="img-responsive"
alt="<?php echo $recommands['Content Tour D']->ic_title; ?>"></a> alt="<?php echo $recommands['Content Tour D']->ic_title; ?>"></a>
@ -71,41 +70,5 @@
</div> </div>
<?php } ?> <?php } ?>
<?php if (!empty($recommands['Content Tour E'])) { ?>
<div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour E']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour E']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Content Tour E']->ic_title; ?>"></a>
<div class="content_article_name"><a
href="<?php echo $recommands['Content Tour E']->ic_url; ?>"> <?php echo $recommands['Content Tour E']->ic_title; ?> </a>
</div>
<div class="content_article_button"><a
href="<?php echo $recommands['Content Tour E']->ic_url; ?>"></a>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Content Tour F'])) { ?>
<div class="infopage_ad">
<a href="<?php echo $recommands['Content Tour F']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Content Tour F']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Content Tour F']->ic_title; ?>"></a>
<div class="content_article_name"><a
href="<?php echo $recommands['Content Tour F']->ic_url; ?>"> <?php echo $recommands['Content Tour F']->ic_title; ?> </a>
</div>
<div class="content_article_button"><a
href="<?php echo $recommands['Content Tour F']->ic_url; ?>"></a>
</div>
</div>
<?php } ?>
<?php } ?> <?php } ?>
</div> </div>

118
application/views/mobile_first/ah.php
Unescape Escape View File

@ -77,8 +77,8 @@
<div class="menu__wrap"> <div class="menu__wrap">
<ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All"> <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours" data-submenu="submenu-7" <li class="menu__item" role="menuitem"><a class="menu__link" href="/tours" data-submenu="submenu-7"
aria-owns="submenu-7">Japan</a></li> aria-owns="submenu-7">Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" id="thailand_vietnam_cambodia_mobile" <li class="menu__item" role="menuitem"><a class="menu__link" id="thailand_vietnam_cambodia_mobile"
data-submenu="submenu-6" aria-owns="submenu-6">Thailand-Vietnam-Cambodia</a></li> data-submenu="submenu-6" aria-owns="submenu-6">Thailand-Vietnam-Cambodia</a></li>
@ -92,29 +92,15 @@
aria-owns="submenu-12">Middle East</a></li> aria-owns="submenu-12">Middle East</a></li>
<li class="menu__item" role="menuitem" style="margin-bottom: 50px;"><a class="menu__link" <li class="menu__item" role="menuitem" style="margin-bottom: 50px;"><a class="menu__link"
data-submenu="submenu-13" aria-owns="submenu-13">Central Asia</a></li> data-submenu="submenu-13" aria-owns="submenu-13">Central Asia</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/itinerary-ideas">Itinerary Ideas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4"
aria-owns="submenu-4">1-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2"
aria-owns="submenu-2">10-12 Days Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5"
aria-owns="submenu-5">2-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3"
aria-owns="submenu-3">3-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8"
aria-owns="submenu-8">4-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us">About Us</a></li>
<li class="menu__item" role="menuitem"><a href="/reviews" data-submenu="submenu-9" aria-owns="submenu-9" <li class="menu__item" role="menuitem"><a href="/reviews" data-submenu="submenu-9" aria-owns="submenu-9"
class="menu__link">Reviews</a></li> class="menu__link">Reviews</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us">About Us</a></li>
</ul> </ul>
<!-- 4-weeks-itinerary --> <!-- 4-weeks-itinerary -->
<ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu"
aria-label="4-weeks-itinerary">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/4-weeks-itinerary">Southeast
Asia</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm" target="_blank">China</a></li>
</ul>
<!-- Thailand-Vietnam-Cambodia --> <!-- Thailand-Vietnam-Cambodia -->
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu" <ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu"
aria-label="Thailand_Vietnam_Cambodia"> aria-label="Thailand_Vietnam_Cambodia">
@ -206,98 +192,6 @@
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tours/kyrgyzstan-tajikistan-uzbekistan">Five <li class="menu__item" role="menuitem"><a class="menu__link" href="/tours/kyrgyzstan-tajikistan-uzbekistan">Five
Stans</a></li> Stans</a></li>
</ul> </ul>
<!-- Best-time -->
<ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="Best-time">
<li class="menu__item" role="menuitem"><a
href="https://www.chinahighlights.com/travelguide/8-day-china-itinerary.htm" class="menu__link"
target="_blank">8 Days in China</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">10 Days in
Japan</a></li>
<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">10 Days in
Vietnam</a></li>
<li class="menu__item" role="menuitem"><a
href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank"
class="menu__link">10 Days in China</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/12-day-itineraries" class="menu__link">12 Days in
Japan</a></li>
<li class="menu__item" role="menuitem"><a
href="https://www.chinahighlights.com/travelguide/12-days-china-itinerary.htm" class="menu__link"
target="_blank">12 Days in China</a></li>
</ul>
<!-- festival -->
<ul data-menu="submenu-3" id="submenu-3" class="menu__level" tabindex="-1" role="menu" aria-label="festival">
<li class="menu__item" role="menuitem"><a href="/southeast-asia/3-weeks-itinerary" class="menu__link">Southeast
Asia</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/3-week-itineraries" class="menu__link">Japan</a></li>
<li class="menu__item" role="menuitem"><a href="/vietnam/3-weeks-itinerary" class="menu__link">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a
href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm" target="_blank"
class="menu__link">China</a></li>
<li class="menu__item" role="menuitem"><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam"
class="menu__link">Thailand, Cambodia, Vietnam</a></li>
<li class="menu__item" role="menuitem"><a href="/asia/tours/china-and-vietnam" class="menu__link">China,
Vietnam</a></li>
<li class="menu__item" role="menuitem"><a href="/asia/tours/china-nepal-and-india" class="menu__link">China,
Nepal, India</a></li>
<li class="menu__item" role="menuitem"><a href="/asia/tours/china-laos-thailand" class="menu__link">China, Laos,
Thailand</a></li>
</ul>
<!-- top things to do -->
<ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="topthingstodo">
<li class="menu__item" role="menuitem"><a href="/japan/1-week-itinerary" class="menu__link">Japan</a></li>
<li class="menu__item" role="menuitem"><a href="/vietnam/7-days-itinerary" class="menu__link">Vietnam</a></li>
</ul>
<ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="vacation">
<li class="menu__item" role="menuitem"><a href="/southeast-asia/2-weeks-itinerary" class="menu__link">Southeast
Asia</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/2-week-itineraries">Japan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="/south-korea">South Korea</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/2-weeks-in-thailand">Thailand</a>
</li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/india/2-week-itinerary">India</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm" target="_blank">China</a>
</li>
</ul>
<ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="japan">
<li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-highlights" class="menu__link">5 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-kyoto-osaka" class="menu__link">7 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-hakone-kyoto-hiroshima-osaka" class="menu__link">8 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/japan-highlights" class="menu__link">9 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-yokohama-hakone-kyoto-nara-osaka" class="menu__link">10 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/traditional-japan" class="menu__link">11 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/classic-japan" class="menu__link">12 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/family-vacation" class="menu__link">14 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/japan-china-discovery" class="menu__link">16 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/summer-family-vacation" class="menu__link">17 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/nara-tokyo-hakone-nagoya-kyoto-osaka" class="menu__link">18 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-kyoto-nara-osaka-hiroshima-fukuoka" class="menu__link">21 Days</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/3-week-itineraries" class="menu__link">3 Weeks</a></li>
<br><br>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-trip">Bucket List Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="/japan/how-to-plan-a-family-trip-to-japan">Family Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-cherry-blossom-trip">Cherry
Blossom Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/planning-a-summer-trip">Summer
Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-winter-trip">Winter Trip</a>
</li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">Japan-South Korea Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="/asia/plan-a-trip-to-china-and-japan">Japan-China Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link"
href="/asia/plan-a-trip-to-japan-and-thailand">Japan-Thailand Trip</a></li>
</ul>
<ul data-menu="submenu-9" id="submenu-9" class="menu__level" tabindex="-1" role="menu" aria-label="reviews"> <ul data-menu="submenu-9" id="submenu-9" class="menu__level" tabindex="-1" role="menu" aria-label="reviews">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews" id="all_reviews_mobile">Asia <li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews" id="all_reviews_mobile">Asia

286
application/views/mobile_first/ch-info-page-form.php
Unescape Escape View File

@ -44,99 +44,171 @@
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style="margin-bottom: 10px;"><strong>Adults number</strong></p>
<div class="kids_age">
<p style="margin-bottom: 0;">65+ yrs old</p>
<select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<div class="peopleSelect"> </select>
<p style=" margin-top: 20px; <p style="
text-align: left; margin-top: 5px;font-size: 18px;
font-size: 22px; ">people</p>
font-weight: 400;">
Adults (≥18 years old)
</p>
<button class="minaddBtn reduceadult" id="minusAdult" type="button"
value="-">-</button>
<input class="number" type="text" value="2" id="adultNumber" name="adult">
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
</div>
<div class="age_range">
<p>
Adults' ages
</p>
<div class="checkYes" style="float:left;">
<label for="65+">
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="51-64">
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="41-50">
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="31-40">
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40
</label>
</div> </div>
<div class="checkYes" style="float:left;"> <div class="kids_age">
<label for="18-30"> <p style="margin-bottom: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age">
<p style="margin-bottom: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id="childrenBlock" style="display: none">
<p style="margin-top: 0; <p style="margin-bottom: 10px;"><strong>Children number</strong></p>
font-size: 22px; text-align:left;">Children</p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="4">4</option>
<option value="2">2 <option value="5">5</option>
</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
@ -605,21 +677,9 @@
$(function () { $(function () {
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -627,11 +687,6 @@
} else { } else {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
}
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
} }
}) })
}); });
@ -665,53 +720,6 @@
var tripLength = $('#tripLengthNumber').val(); var tripLength = $('#tripLengthNumber').val();
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
// Trip Length // Trip Length
$('#tripLengthPlus').click(function () { $('#tripLengthPlus').click(function () {
tripLength++; tripLength++;

290
application/views/mobile_first/ch-inquiry-form.php
Unescape Escape View File

@ -38,104 +38,171 @@
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style=" margin-bottom: 10px;"><strong>Adults number</strong></p>
<div class="kids_age">
<p style="margin-bottom: 0;">65+ yrs old</p>
<select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style=" <p style="
margin-bottom: -25px; margin-top: 5px;font-size: 18px;
font-size: 22px; ">people</p>
margin-top: 80px;
text-align: left;
">When you plan to take the trip:</p>
<div class="peopleSelect">
<p style=" margin-top: 20px;
text-align: left;
font-size: 22px;
font-weight: 400;">
Adults (≥18 years old)
</p>
<button class="minaddBtn reduceadult" id="minusAdult" type="button"
value="-">-</button>
<input class="number" type="text" value="2" id="adultNumber" name="adult">
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
</div>
<div class="age_range">
<p>
Adults' ages
</p>
<div class="checkYes" style="float:left;">
<label for="65+">
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="51-64">
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
</label>
</div>
<div class="checkYes" style="float:left;">
<label for="41-50">
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
</label>
</div> </div>
<div class="checkYes" style="float:left;"> <div class="kids_age">
<label for="31-40"> <p style="margin-bottom: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
</div> <option value="1">1</option>
<div class="checkYes" style="float:left;"> <option value="2">2</option>
<label for="18-30"> <option value="3">3</option>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <option value="4">4</option>
</label> <option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age">
<p style="margin-bottom: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 5px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id="childrenBlock" style="display: none">
<p style="margin-top: 0; <p style="margin-bottom: 10px;"><strong>Children number</strong></p>
font-size: 22px; text-align:left;">Children</p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="4">4</option>
<option value="2">2 <option value="5">5</option>
</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0</option>
</option> <option value="1">1</option>
<option value="1">1 <option value="2">2</option>
</option> <option value="3">3</option>
<option value="2">2 <option value="4">4</option>
</option> <option value="5">5</option>
<option value="3">3
</option>
<option value="4">4
</option>
</select> </select>
<p style="
margin-top: 10px;font-size: 18px;
">people</p>
</div> </div>
</div> </div>
@ -568,21 +635,9 @@ document.addEventListener('DOMContentLoaded', () => {
$(function () { $(function () {
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -590,60 +645,9 @@ document.addEventListener('DOMContentLoaded', () => {
} else { } else {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
}
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
} }
}) })
}); });
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
}) })
</script> </script>
<style type="text/css"> <style type="text/css">

108
application/views/mobile_first/chinatravel-form-tourqi.php
View File

File diff suppressed because one or more lines are too long

244
application/views/mobile_first/gh-info-page-form.php
Unescape Escape View File

@ -11,9 +11,7 @@
<textarea id="additionalrequirements" name="additional_requirements" <textarea id="additionalrequirements" name="additional_requirements"
placeholder="E.g.: This is a big trip for anniversary, honeymoon, birthday celebration..." style="margin-bottom:20px;"></textarea> placeholder="E.g.: This is a big trip for anniversary, honeymoon, birthday celebration..." style="margin-bottom:20px;"></textarea>
<div class="selectionBlock" style="margin-bottom: 0;"> <div class="selectionBlock" style="margin-bottom: 0;">
<p style=" <p style="margin-bottom: 0px;">
margin-bottom: 0px;
">
<strong>Number in your group</strong> <strong>Number in your group</strong>
</p> </p>
<div id="group_error_msg" style="display: none"> <div id="group_error_msg" style="display: none">
@ -45,84 +43,167 @@
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style="margin-bottom: 5px;"><strong>Adults number</strong></p>
<div class="peopleSelect"> <div class="kids_age" >
<p style=" margin-top: 10px; <p style="margin-bottom: 5px; margin-top: 0;">65+ yrs old</p>
margin-bottom: 10px;"><strong> <select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
Adults (≥18 years old) <option value="0">0</option>
</strong> </p> <option value="1">1</option>
<button class="minaddBtn reduceadult" id="minusAdult" type="button" <option value="2">2</option>
value="-">-</button> <option value="3">3</option>
<input class="number" type="text" value="2" id="adultNumber" name="adult"> <option value="4">4</option>
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button> <option value="5">5</option>
</div> <option value="6">6</option>
<div class="age_range"> <option value="7">7</option>
<p> <option value="8">8</option>
Adults' ages <option value="9">9</option>
</p> <option value="10">10</option>
<div class="checkYes" style="float:left; width: auto; margin-right: 30px;"> <option value="11">11</option>
<label for="65+"> <option value="12">12</option>
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+ <option value="13">13</option>
</label> <option value="14">14</option>
</div> <option value="15">15</option>
<div class="checkYes" style="float:left; width: auto; margin-right: 30px;"> <option value="16">16</option>
<label for="51-64"> <option value="17">17</option>
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64 <option value="18">18</option>
</label> <option value="19">19</option>
</div> <option value="20">20</option>
<div class="checkYes" style="float:left; width: auto; margin-right: 30px;"> <option value="21">21</option>
<label for="41-50"> <option value="22">22</option>
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50 <option value="23">23</option>
</label> <option value="24">24</option>
</div> <option value="25">25</option>
<div class="checkYes" style="float:left; width: auto; margin-right: 30px;"> <option value="26">26</option>
<label for="31-40"> <option value="27">27</option>
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40 <option value="28">28</option>
</label> <option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="checkYes" style="float:left; width: auto; margin-right: 30px;"> <div class="kids_age">
<label for="18-30"> <p style="margin-bottom: 5px; margin-top: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age" >
<p style="margin-bottom: 5px; margin-top: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="
margin-top: 10px;
">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id='childrenBlock' style="display: none">
<p style=" margin-bottom: 0;"><strong>Children (age of children at time of trip)</strong></p> <p style="margin-bottom: 5px;"><strong>Children number (age of children at time of trip)</strong></p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
</option> </option>
<option value="2">2 <option value="2">2
</option> </option>
<option value="3">3 <option value="3">3
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
</option> </option>
<option value="2">2 <option value="2">2
</option> </option>
<option value="3">3 <option value="3">3
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
@ -133,7 +214,9 @@
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
</div> </div>
@ -149,19 +232,19 @@
<div class="travel_group date_select" > <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="updatedestination" style="font-size: 18px;"> <label for="exact" class="updatedestination" style="font-size: 18px;">
Exact travel dates Exact dates
</label> </label>
</div> </div>
<div class="travel_group date_select" > <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="updatedestination" style="font-size: 18px;"> <label for="approximate" class="updatedestination" style="font-size: 18px;">
Approximate travel dates Approximate dates
</label> </label>
</div> </div>
<div class="travel_group date_select" > <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="updatedestination" style="font-size: 18px;"> <label for="yet" class="updatedestination" style="font-size: 18px;">
Not decided travel dates Undecided dates
</label> </label>
</div> </div>
@ -621,21 +704,9 @@
$(function () { $(function () {
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -643,11 +714,6 @@
} else { } else {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
}
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
} }
}) })
}); });
@ -680,54 +746,6 @@
}); });
var tripLength = $('#tripLengthNumber').val(); var tripLength = $('#tripLengthNumber').val();
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
// Trip Length // Trip Length
$('#tripLengthPlus').click(function () { $('#tripLengthPlus').click(function () {
tripLength++; tripLength++;

241
application/views/mobile_first/gh-tour-form.php
Unescape Escape View File

@ -37,83 +37,165 @@
</label> </label>
</div> </div>
<div id="adultBlock" style="display: none"> <div id="adultBlock" style="display: none">
<p style="margin-bottom: 5px;"><strong>Adults number</strong></p>
<div class="peopleSelect"> <div class="kids_age" >
<p style="margin-top: 20px;"><strong> <p style="margin-bottom: 5px; margin-top: 0;">65+ yrs old</p>
Adults (≥18 years old) <select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
</strong> </p> <option value="0">0</option>
<button class="minaddBtn reduceadult" id="minusAdult" type="button" <option value="1">1</option>
value="-">-</button> <option value="2">2</option>
<input class="number" type="text" value="2" id="adultNumber" name="adult"> <option value="3">3</option>
<button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button> <option value="4">4</option>
</div> <option value="5">5</option>
<div class="age_range"> <option value="6">6</option>
<p> <option value="7">7</option>
Adults' ages <option value="8">8</option>
</p> <option value="9">9</option>
<div class="checkYes" style="float:left;"> <option value="10">10</option>
<label for="65+"> <option value="11">11</option>
<input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+ <option value="12">12</option>
</label> <option value="13">13</option>
</div> <option value="14">14</option>
<div class="checkYes" style="float:left;"> <option value="15">15</option>
<label for="51-64"> <option value="16">16</option>
<input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64 <option value="17">17</option>
</label> <option value="18">18</option>
</div> <option value="19">19</option>
<div class="checkYes" style="float:left;"> <option value="20">20</option>
<label for="41-50"> <option value="21">21</option>
<input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50 <option value="22">22</option>
</label> <option value="23">23</option>
</div> <option value="24">24</option>
<div class="checkYes" style="float:left;"> <option value="25">25</option>
<label for="31-40"> <option value="26">26</option>
<input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40 <option value="27">27</option>
</label> <option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="checkYes" style="float:left;"> <div class="kids_age" >
<label for="18-30"> <p style="margin-bottom: 5px; margin-top: 0;">41-64 yrs old</p>
<input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30 <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
</label> <option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age" >
<p style="margin-bottom: 5px; margin-top: 0;">18-40 yrs old</p>
<select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
</select>
<p style="margin-top: 10px;">people</p>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="childrenBlock" style="display: none"> <div id='childrenBlock' style="display: none">
<p style="margin-top: 0;margin-bottom: 0;"><strong>Children</strong></p> <p style="margin-bottom: 5px;"><strong>Children number (age of children at time of trip)</strong></p>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">10-17 yrs old</p> <p style="margin-bottom: 5px;">10-17 yrs old</p>
<select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs"> <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
</option> </option>
<option value="2">2 <option value="2">2
</option> </option>
<option value="3">3 <option value="3">3
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">3-9 yrs old</p> <p style="margin-bottom: 5px;">3-9 yrs old</p>
<select class="kids_number" id="childrenNumber" name="children_3_9_yrs"> <select class="kids_number" id="childrenNumber" name="children_3_9">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
</option> </option>
<option value="2">2 <option value="2">2
</option> </option>
<option value="3">3 <option value="3">3
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
<div class="kids_age"> <div class="kids_age">
<p style="margin-bottom: 5px;">0-2 yrs old</p> <p style="margin-bottom: 5px;">0-2 yrs old</p>
<select class="kids_number" id="infantNumber" name="infant_0_2_yrs"> <select class="kids_number" id="infantNumber" name="infant_0_2">
<option value="0">0 <option value="0">0
</option> </option>
<option value="1">1 <option value="1">1
@ -124,7 +206,9 @@
</option> </option>
<option value="4">4 <option value="4">4
</option> </option>
<option value="5">5</option>
</select> </select>
<p style="margin-top: 10px;">people</p>
</div> </div>
</div> </div>
</div> </div>
@ -138,19 +222,19 @@
<div class="travel_group date_select"> <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">
Exact travel dates Exact dates
</label> </label>
</div> </div>
<div class="travel_group date_select"> <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">
Approximate travel dates Approximate dates
</label> </label>
</div> </div>
<div class="travel_group date_select"> <div class="travel_group date_select">
<input type="radio" value="Undecided travel dates" id="yet" name="trip_date"> <input type="radio" value="Undecided travel dates" id="yet" name="trip_date">
<label for="yet" class="solo"> <label for="yet" class="solo">
Undecided travel dates Undecided 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">
@ -168,23 +252,22 @@
<h4 style="margin-top: 0; margin-bottom: 0;font-weight: 400;"> <h4 style="margin-top: 0; margin-bottom: 0;font-weight: 400;">
What's your hotel choice? What's your hotel choice?
</h4> </h4>
<div class="travel_group date_select"> <div class="travel_group date_select">
<input type="radio" value="Luxury (5 stars & up)" id="Luxury" name="hotel"> <input type="radio" value="Luxury (5 stars & up)" id="Luxury" name="hotel">
<label for="Luxury" class="family"> <label for="Luxury" class="family">
Luxury <em>(5 stars & up)</em> Luxury<br> <em>(5 stars & up)</em>
</label> </label>
</div> </div>
<div class="travel_group date_select"> <div class="travel_group date_select">
<input type="radio" value="Handpicked Comfort (4-5 stars)" id="Handpicked" name="hotel"> <input type="radio" value="Handpicked Comfort (4-5 stars)" id="Handpicked" name="hotel">
<label for="Handpicked" class="couple"> <label for="Handpicked" class="couple">
Handpicked Comfort <em>(4-5 stars)</em> Handpicked Comfort<br> <em>(4-5 stars)</em>
</label> </label>
</div> </div>
<div class="travel_group date_select"> <div class="travel_group date_select">
<input type="radio" value="Standard (3 stars)" id="Standard" name="hotel"> <input type="radio" value="Standard (3 stars)" id="Standard" name="hotel">
<label for="Standard" class="solo"> <label for="Standard" class="solo">
Standard <em>(3 stars)</em> Standard<br> <em>(3 stars)</em>
</label> </label>
</div> </div>
</div> </div>
@ -494,22 +577,10 @@ $(function () {
var selectedExpectedDate = ''; var selectedExpectedDate = '';
var $adultBlock = $('#adultBlock'); var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { $(groupEle).click(function (e) {
$teenagerNumberInput.val(0);
$childrenNumberInput.val(0);
$infantNumberInput.val(0);
var currentTarget = e.currentTarget; var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); $adultBlock.show();
@ -518,11 +589,6 @@ $(function () {
$adultBlock.show(); $adultBlock.show();
$childrenBlock.hide(); $childrenBlock.hide();
} }
if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1);
}
}) })
}); });
@ -556,51 +622,6 @@ $(function () {
}) })
}); });
//成人
$('#plusAdult').click(function () {
adultNumber++;
$adultNumberInput.val(adultNumber);
});
$('#minusAdult').click(function () {
if (adultNumber > 1) {
adultNumber--;
$adultNumberInput.val(adultNumber);
}
});
// 青少年
$('#plusTeenager').click(function () {
teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber);
});
$('#minusTeenager').click(function () {
if (teenagerNumber > 0) {
teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber);
}
});
// 儿童
$('#plusChildren').click(function () {
childrenNumber++;
$childrenNumberInput.val(childrenNumber);
});
$('#minusChildren').click(function () {
if (childrenNumber > 0) {
childrenNumber--;
$childrenNumberInput.val(childrenNumber);
}
});
// 婴儿
$('#plusInfant').click(function () {
infantNumber++;
$infantNumberInput.val(infantNumber);
});
$('#minusInfant').click(function () {
if (infantNumber > 0) {
infantNumber--;
$infantNumberInput.val(infantNumber);
}
});
function validateQuickInquiryForm() { function validateQuickInquiryForm() {
var result = true; var result = true;
var realnameVal = document.getElementById("realname").value; var realnameVal = document.getElementById("realname").value;

2
application/views/mobile_first/shanghai.php
Unescape Escape View File

@ -50,7 +50,7 @@
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4" hhref="/shanghai-side-trips/">Side Trips</a><a class="menu__link" href="/shanghai-side-trips/">Side Trips</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4" hhref="/shanghai-side-trips/">Side Trips</a><a class="menu__link" href="/shanghai-side-trips/">Side Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-5" href="/shanghai-travel-guide/">Shanghai Guide</a><a class="menu__link" href="/shanghai-travel-guide/">Shanghai Guide</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-5" href="/shanghai-travel-guide/">Shanghai Guide</a><a class="menu__link" href="/shanghai-travel-guide/">Shanghai Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6" href="/shanghai-train-schedule/">Trains</a><a class="menu__link" href="/shanghai-train-schedule/">Trains</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6" href="/shanghai-train-schedule/">Trains</a><a class="menu__link" href="/shanghai-train-schedule/">Trains</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/forms/customize">Create My Trip</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/forms/customize.html">Create My Trip</a></li>
</ul> </ul>
<!-- Water Town Tours --> <!-- Water Town Tours -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="water-town-tours"> <ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="water-town-tours">

1
webht/third_party/pay/config/wxpay.php vendored
Unescape Escape View File

@ -27,3 +27,4 @@ $config['cht']["app_id"] = "wxd6c8dd69af5128cd";
$config['cht']["mch_id"] = "1353239702"; $config['cht']["mch_id"] = "1353239702";
$config['cht']["key"] = "aada7476b3fecc2c6e33a7c765298516"; $config['cht']["key"] = "aada7476b3fecc2c6e33a7c765298516";
$config['cht']["app_secret"] = ""; $config['cht']["app_secret"] = "";
// wx5d01021a6d515098 花梨鹰小程序

5
webht/third_party/pay/controllers/AlipayTradeService.php vendored
Unescape Escape View File

@ -583,6 +583,11 @@ class AlipayTradeService extends CI_Controller
//订单号 //订单号
$orderid_info = analysis_orderid($parent_note->ALI_orderId); $orderid_info = analysis_orderid($parent_note->ALI_orderId);
$orderid_info = json_decode($orderid_info); $orderid_info = json_decode($orderid_info);
//查不到订单信息
if (empty($orderid_info)) {
$this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
return false;
}
//根据订单号查找外联信息 //根据订单号查找外联信息
$advisor_info = $this->Alipay_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); $advisor_info = $this->Alipay_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick);
//查不到订单信息 //查不到订单信息

41
webht/third_party/pay/controllers/PaymentService.php vendored
Unescape Escape View File

@ -72,18 +72,36 @@ class PaymentService extends CI_Controller {
$this->permission->is_admin(true); $this->permission->is_admin(true);
$data = array(); $data = array();
$data['date'] = date('Y-m-d'); $data['date'] = date('Y-m-d');
$data['method_code'] = '15016';
$data["method_name"] = $this->code_brandname['15016'];
$data['notelist'] = $this->note_model->sendfail_note(false); $data['notelist'] = $this->note_model->sendfail_note(false);
array_walk($data["notelist"], 'PaymentService::set_brandname'); array_walk($data["notelist"], 'PaymentService::set_brandname');
$this->load->view("payment_list",$data); $this->load->view("payment_list",$data);
return; return;
} }
private $wxpay_app = array(
"wx749246dd935ca07b" => "APP",
"wx5d01021a6d515098" => "HLY", // "花梨鹰小程序", // 交行收款码
"wxd6c8dd69af5128cd" => "", // "NATIVE",
"wx7e605820faf98a05" => "Trippest-NATIVE",
"0" => "unknown",
);
public function set_brandname(&$ele) public function set_brandname(&$ele)
{ {
$ele->brand_name = "none"; $ele->brand_name = "none";
if ($this->code_brandname[$ele->OPN_accountMethod]) { if ($this->code_brandname[$ele->OPN_accountMethod]) {
$ele->brand_name = $this->code_brandname[$ele->OPN_accountMethod]; $ele->brand_name = $this->code_brandname[$ele->OPN_accountMethod];
} }
$raw = json_decode($ele->OPN_rawContent);
$wx_app = isset($raw->app_id) ? $raw->app_id : '0';
$wx_app = $wx_app!=='0' ? $wx_app : (isset($raw->appid) ? $raw->appid : '0');
$ele->app_name = "";
if ($this->wxpay_app[$wx_app]) {
$ele->app_name = $this->wxpay_app[$wx_app];
}
} }
// https://www.mycht.cn/webht.php/apps/pay/paymentservice/test_new_function?coli_sn=WY211210012 // https://www.mycht.cn/webht.php/apps/pay/paymentservice/test_new_function?coli_sn=WY211210012
@ -158,6 +176,19 @@ class PaymentService extends CI_Controller {
$ssje = $old_ssje===NULL ? $ssje : $old_ssje; $ssje = $old_ssje===NULL ? $ssje : $old_ssje;
$currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->OPN_currency))); $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->OPN_currency)));
$currencyCode = mb_strtoupper(trim($currencyCode)); $currencyCode = mb_strtoupper(trim($currencyCode));
//根据订单号查找外联信息, 从临时表
$advisor_info_from_tmp = $this->account_model->get_order($orderid_info->orderid, false, 'M', $handpick);
/**
* 传统订单, 网站支付
* @author LYT
*/
if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') {
// $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'closed');
$this->note_model->set_invoice($item->OPN_SN, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype);
continue;
}
if ( empty($advisor_info)) { if ( empty($advisor_info)) {
// record fail // record fail
$this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail');
@ -273,6 +304,16 @@ class PaymentService extends CI_Controller {
$opi_email = 'contact@arachina.com'; $opi_email = 'contact@arachina.com';
$opi_firstname = 'contact@arachina.com'; $opi_firstname = 'contact@arachina.com';
} }
/**
* 已经记录的再次遇到就忽略了
* @author LYT
*/
if (empty($opi_email) && $item->OPN_accountStatus === 'recorded') {
$this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'closed');
continue;
}
//没有外联信息表示订单未分配 //没有外联信息表示订单未分配
if (empty($opi_email) || empty($opi_firstname)) { if (empty($opi_email) || empty($opi_firstname)) {
$this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail');

2
webht/third_party/pay/models/Online_payment_account_model.php vendored
Unescape Escape View File

@ -45,7 +45,7 @@ class Online_payment_account_model extends CI_Model {
$query = $this->HT->query($sql); $query = $this->HT->query($sql);
$result = $query->result(); $result = $query->result();
if ($handpick === TRUE) { if ($handpick === TRUE) {
$result = array($result[0]); $result = empty($result) ? [] : array($result[0]);
} }
} }

3
webht/third_party/pay/models/Online_payment_note_model.php vendored
Unescape Escape View File

@ -85,6 +85,9 @@ class Online_payment_note_model extends CI_Model {
$this->init_query(); $this->init_query();
$this->topnum = $num; $this->topnum = $num;
$this->search = $method===null ? "" : " AND OPN_accountMethod=$method "; $this->search = $method===null ? "" : " AND OPN_accountMethod=$method ";
// 1小时前
$date = date("Y-m-d H:i:s", time() - 3600);
$this->search .= $num !== false ? " AND OPN_noticeSendTime < '$date' " : '';
$this->send = " AND OPN_noticeSendStatus='sendfail' "; $this->send = " AND OPN_noticeSendStatus='sendfail' ";
return $this->query_note(); return $this->query_note();
} }

17
webht/third_party/pay/views/payment_list.php vendored
Unescape Escape View File

@ -29,6 +29,9 @@
.modal {background-color: rgba(0,0,0,0.075);} .modal {background-color: rgba(0,0,0,0.075);}
.cht-color {background-color: #A31022;} .cht-color {background-color: #A31022;}
.trippest-color {background-color: #E83201;} .trippest-color {background-color: #E83201;}
.app-color {background-color: #EC3A4F;}
.hly-color {background-color: #009fe9;}
</style> </style>
<style type="text/css" media="screen and (max-width:767px)"> <style type="text/css" media="screen and (max-width:767px)">
.navbar-header h1 {display: block; font-size: 20px;} .navbar-header h1 {display: block; font-size: 20px;}
@ -201,10 +204,10 @@
<tr> <tr>
<th >#</th> <th >#</th>
<th >主题</th> <th >主题</th>
<th class="hidden-xs">付款人</th> <th width="260" class="hidden-xs">subject</th>
<th class="hidden-xs">交易号</th> <th width="280" class="hidden-xs">交易号</th>
<th>收单时间</th> <th width="150">收单时间</th>
<th class="hidden-xs">通知时间</th> <th width="150" class="hidden-xs">通知时间</th>
<th>状态[通知/记录]</th> <th>状态[通知/记录]</th>
</tr> </tr>
</thead> </thead>
@ -216,10 +219,14 @@
<td><?php echo $key+1; ?></td> <td><?php echo $key+1; ?></td>
<td><span class="brand_text <?php echo strtolower(str_replace(" ","",$item->brand_name))."-color"; ?>"><?php echo $item->brand_name; ?></span> <td><span class="brand_text <?php echo strtolower(str_replace(" ","",$item->brand_name))."-color"; ?>"><?php echo $item->brand_name; ?></span>
<span class="brand_text <?php echo strtolower(str_replace(" ","",$item->OPN_fundSource))."-color"; ?>"><?php echo $item->OPN_fundSource; ?></span> <span class="brand_text <?php echo strtolower(str_replace(" ","",$item->OPN_fundSource))."-color"; ?>"><?php echo $item->OPN_fundSource; ?></span>
<?php echo $item->OPN_orderId . ' / ' . $item->OPN_orderAmount . $item->OPN_currency; ?></td> <?php echo $item->OPN_orderId . ' / ' . $item->OPN_orderAmount . $item->OPN_currency; ?></td>
<td class="hidden-xs"> <td class="hidden-xs">
<span class="brand_text <?php echo strtolower(str_replace(" ","",$item->app_name))."-color"; ?>"><?php echo $item->app_name; ?></span>
<?php <?php
echo $item->OPN_payerEmail; echo $item->OPN_subject;
?> ?>
</td> </td>
<td class="hidden-xs"><?php echo $item->OPN_transactionId; ?></td> <td class="hidden-xs"><?php echo $item->OPN_transactionId; ?></td>

20
webht/third_party/paypal/controllers/index.php vendored
Unescape Escape View File

@ -835,7 +835,7 @@ class Index extends CI_Controller {
$is_webhook = true; $is_webhook = true;
} }
if (empty($pn_txn_id) && true === $is_webhook) { if (empty($pn_txn_id) && true === $is_webhook) {
$this->Note_model->update_send($item->pn_txn_id, 'send', $item->pn_sn); $this->Note_model->update_send($item->pn_txn_id, 'send-wh', $item->pn_sn);
continue; continue;
} }
@ -916,11 +916,10 @@ class Index extends CI_Controller {
$advisor_info_from_tmp = $this->Paypal_model->get_order($orderid_info->orderid, false, 'M', $handpick); $advisor_info_from_tmp = $this->Paypal_model->get_order($orderid_info->orderid, false, 'M', $handpick);
/** /**
* 传统订单, 网站支付 * 传统订单, 网站支付
* 已经录入, 后来重新生成订单号, 不再邮件通知了
* @author LYT * @author LYT
*/ */
if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') { if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') {
$this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn); // $this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn);
$this->Note_model->set_invoice($item->pn_txn_id, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype); $this->Note_model->set_invoice($item->pn_txn_id, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype);
continue; continue;
} }
@ -1068,6 +1067,19 @@ class Index extends CI_Controller {
//根据订单号查找外联信息 //根据订单号查找外联信息
$advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick);
//根据订单号查找外联信息, 从临时表
$advisor_info_from_tmp = $this->Paypal_model->get_order($orderid_info->orderid, false, 'M', $handpick);
/**
* 传统订单, 网站支付
* @author LYT
*/
if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') {
// $this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn);
$this->Note_model->set_invoice($item->pn_txn_id, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype);
continue;
}
//查不到订单信息 //查不到订单信息
if (empty($advisor_info)) { if (empty($advisor_info)) {
$this->Note_model->update_send($item->pn_txn_id, 'sendfail'); $this->Note_model->update_send($item->pn_txn_id, 'sendfail');
@ -1301,6 +1313,8 @@ class Index extends CI_Controller {
public function note_status_list($status) { public function note_status_list($status) {
$this->permission->is_admin(true); $this->permission->is_admin(true);
$data = array(); $data = array();
$data['date'] = $this->input->get('date');
empty($data['date']) ? $data['date'] = date('Y-m-d') : false;
$data['notelist'] = $this->Note_model->notestatus(200, $status); $data['notelist'] = $this->Note_model->notestatus(200, $status);
$this->load->view('n-header', $data); $this->load->view('n-header', $data);
$this->load->view('note_list'); $this->load->view('note_list');

12
webht/third_party/paypal/models/note_model.php vendored
Unescape Escape View File

@ -55,12 +55,13 @@ class Note_model extends CI_Model {
public function notestatus($topnum = 2, $status = '') { public function notestatus($topnum = 2, $status = '') {
$this->init(); $this->init();
$this->topnum = $topnum; $this->topnum = $topnum;
$sql = " AND pn_memo NOT LIKE '{\"id\":\"WH-%' ";
$x_status = strtolower($status) === 'reversal' ? 'revers' : $status; $x_status = strtolower($status) === 'reversal' ? 'revers' : $status;
$sql1 = in_array(strtolower($status), ["completed", 'pending']) ? " AND (pn_payment_status='$status' ) " : ""; $sql1 = in_array(strtolower($status), ["completed", 'pending']) ? " AND (pn_payment_status='$status' ) " : "";
$sql2 = in_array(strtolower($status), ["refunded", "reversal"]) ? " AND (pn_payment_status like '%$x_status%' ) " : ""; $sql2 = in_array(strtolower($status), ["refunded", "reversal"]) ? " AND (pn_payment_status like '%$x_status%' ) " : "";
$sql3 = in_array(strtolower($status), ["others"]) ? " AND (pn_payment_status='failed' OR pn_payment_status='denied' ) " : ""; $sql3 = in_array(strtolower($status), ["others"]) ? " AND (pn_payment_status='failed' OR pn_payment_status='denied' ) " : "";
$sql4 = in_array(strtolower($status), ["case"]) ? " AND (pn_memo like '{\"txn_type\":\"new_case\"%' AND pn_mc_gross = '0' ) " : ""; $sql4 = in_array(strtolower($status), ["case"]) ? " AND (pn_memo like '{\"txn_type\":\"new_case\"%' AND pn_mc_gross = '0' ) " : "";
$this->pn_send = $sql1 . $sql2 . $sql3 . $sql4; $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4 . $sql;
// $this->orderby=" ORDER BY pn_payment_date DESC, pn.pn_sn ASC "; // $this->orderby=" ORDER BY pn_payment_date DESC, pn.pn_sn ASC ";
$this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
return $this->get_list(); return $this->get_list();
@ -77,9 +78,12 @@ class Note_model extends CI_Model {
public function search_date($date) { public function search_date($date) {
$this->init(); $this->init();
$search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) "; $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) AND pn_memo NOT LIKE '{\"id\":\"WH-%' "; // {"id":"WH-
$this->search = $search_sql; $this->search = $search_sql;
$this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; // $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
$this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1 WHEN pn.pn_send = 'sendfail' THEN 2 ELSE 9 END ,pn.pn_sn DESC ";
// WHEN pn.pn_send = 'sendfail' THEN 2
return $this->get_list(); return $this->get_list();
} }
@ -179,7 +183,7 @@ class Note_model extends CI_Model {
{ {
$ele->fundsource = ""; $ele->fundsource = "";
$raw = json_decode($ele->pn_memo); $raw = json_decode($ele->pn_memo);
$business = isset($raw->business) ? $raw->business : '0'; $business = isset($raw->business) ? $raw->business : (isset($raw->receiver_email) ? $raw->receiver_email : '0');
if ($this->code_fundsource[$business]) { if ($this->code_fundsource[$business]) {
$ele->fundsource = $this->code_fundsource[$business]; $ele->fundsource = $this->code_fundsource[$business];
} }

2
webht/third_party/paypal/views/note_list.php vendored
Unescape Escape View File

@ -236,7 +236,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
$raw_content = json_decode($item->pn_memo); $raw_content = json_decode($item->pn_memo);
$show_record = '查看录入状态'; $show_record = '查看录入状态';
if ($item->pn_send == 'send' || substr($item->pn_send, 0, 5) == "send-") { if ($item->pn_send == 'send' || substr($item->pn_send, 0, 5) == "send-") {
$show_send = $item->pn_send; $show_send = $item->pn_send . " / " . str_ireplace('completed', '', $item->pn_payment_status);
} elseif ($item->pn_send == 'closeRecord') { } elseif ($item->pn_send == 'closeRecord') {
$show_send = $show_record = '已忽略'; $show_send = $show_record = '已忽略';
} else if (strtolower($item->pn_payment_status) == 'completed') { } else if (strtolower($item->pn_payment_status) == 'completed') {

Write Preview
Loading…
Cancel
Save