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
hotfix/paypal-note
LiaoYijun 3 years ago
parent 739ba0b43b c7303b2019
commit 26747accef
7 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File

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

@ -170,7 +170,7 @@ class Api_model extends CI_Model {
FROM dbo.BIZ_PackageInfo P1 FROM dbo.BIZ_PackageInfo P1
INNER JOIN dbo.BIZ_PackageInfo2 p2 ON P1.PAG_SN = p2.PAG2_PAG_SN INNER JOIN dbo.BIZ_PackageInfo2 p2 ON P1.PAG_SN = p2.PAG2_PAG_SN
INNER JOIN dbo.CItyInfo2 ON P1.PAG_CII_SN = dbo.CItyInfo2.CII2_CII_SN AND dbo.CItyInfo2.CII2_LGC = 1 INNER JOIN dbo.CItyInfo2 ON P1.PAG_CII_SN = dbo.CItyInfo2.CII2_CII_SN AND dbo.CItyInfo2.CII2_LGC = 1
WHERE (p2.PAG2_LGC = 104) WHERE 1=2 and (p2.PAG2_LGC = 104)
AND (p1.pag_dei_sn = 17) AND (p1.pag_dei_sn = 17)
AND (p2.PAG2_Check = 2) AND (p2.PAG2_Check = 2)
AND (PAG_Code not in( AND (PAG_Code not in(

2
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -330,7 +330,7 @@
//ah跳转测试页面 //ah跳转测试页面
function goto_ahtest_page() { function goto_ahtest_page() {
var site_url = 'https://www.asiahighlights.com/index.php/information/detail/?no_cache=true&static_html_url='; var site_url = 'https://proxy-www.asiahighlights.com';
$('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val());
return true; return true;
} }

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

@ -172,11 +172,11 @@
<!--@CUSTOM-CONENT@--> <!--@CUSTOM-CONENT@-->
</div> </div>
<div class="right_brand_info"> <div class="right_brand_info">
<h2 >Why Travel with Asia Highlights</h2> <h2 >Why Travel with Asia Highlights During the Pandemic</h2>
<ul > <ul >
<li class="tailormade"><strong >Tailor-made experience:</strong> All of your ideas/needs will be carefully considered to create your ideal trip.</li> <li class="tailormade"><strong >Tailor-made experience:</strong> All of your ideas/needs will be carefully considered to create your ideal trip.</li>
<li class="worryfree" ><strong >Worry-free planning: </strong>Every step of your trip, you will be looked after by your 1:1 travel consultant based in Asia.</li> <li class="worryfree" ><strong >Worry-free planning: </strong>Your 1:1 travel consultant in Asia will take all the uncertainty out of your planning, helping you navigate any travel restrictions. </li>
<li class="norisk" ><strong >No-risk booking:</strong> We refund as much as we can and adapt flexibly to unexpected changes.</li> <li class="norisk" ><strong >No-risk booking:</strong> 100% refund policy! (up to 14 days before departure)</li>
</ul> </ul>
</div> </div>
<!--@TIPS-RIGHT@--> <!--@TIPS-RIGHT@-->

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

@ -169,14 +169,7 @@
<div id="main_content_mobile"> <div id="main_content_mobile">
<!--@CUSTOM-CONENT@--> <!--@CUSTOM-CONENT@-->
<div class="right_brand_info">
<h2 >Why Travel with Asia Highlights</h2>
<ul >
<li class="tailormade"><strong >Tailor-made experience:</strong> All of your ideas/needs will be carefully considered to create your ideal trip.</li>
<li class="worryfree" ><strong >Worry-free planning: </strong>Every step of your trip, you will be looked after by your 1:1 travel consultant based in Asia.</li>
<li class="norisk" ><strong >No-risk booking:</strong> We refund as much as we can and adapt flexibly to unexpected changes.</li>
</ul>
</div>
<!--@TIPS-RIGHT@--> <!--@TIPS-RIGHT@-->
</div> </div>

2
application/views/mobile_first/ch-pc.php
Unescape Escape View File

@ -274,7 +274,7 @@ Corporate Number: 914503003486045699
</div> </div>
<div class="bottommembers"> <div class="bottommembers">
<div class="memberIcons"> <div class="memberIcons">
<img width="253" height="67" src="https://data.chinahighlights.com/image/aboutus/member/member-icons.png"> <img width="68" height="67" src="https://data.chinahighlights.com/image/aboutus/member/member-icons-2022-pata.png">
</div> </div>
</div> </div>
</div> </div>

13
application/views/mobile_first/gh-pc.php
Unescape Escape View File

@ -191,24 +191,21 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!--PC底部--> <!--PC底部-->
<div class="all_width_content"> <div class="all_width_content">
<div class="form_content_bg"></div> <div class="form_content_bg"></div>
<div class="form_content"> <div class="form_content">
<div class="formtitle"> <div class="formtitle">
<h2>Why Travel with Global Highlights</h2> <h2>Why Travel with Global Highlights During the Pandemic</h2>
<ul> <ul>
<li><strong>Tailor-made experience:</strong> All of your ideas/needs will be carefully <li><strong>Tailor-made experience:</strong> All of your ideas/needs will be carefully considered to create your ideal trip.</li>
considered to create your ideal trip.</li> <li><strong>Worry-free planning: </strong>Your 1:1 travel consultant will take all the uncertainty out of your planning, helping you navigate any travel restrictions. </li>
<li><strong>Worry-free planning: </strong>Every step of your trip, you will be looked <li><strong>24-7 support on your trip:</strong> We're only a call away.</li>
after by your 1:1 travel consultant based in Asia.</li>
<li><strong>No-risk booking:</strong> We refund as much as we can and adapt flexibly to
unexpected changes.</li>
</ul> </ul>
</div> </div>
<div class="ghwhyus"> <div class="ghwhyus">
<div class="contactwechat"><a id="scrollAnchor"></a> <div class="contactwechat"><a id="scrollAnchor"></a>
<img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px"> <img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px">
<div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span> <div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span>
Email: contact@globalhighlights.com
</div> </div>
</div> </div>
<p class="contactus">Or send an inquiry below</p> <p class="contactus">Or send an inquiry below</p>

12
application/views/mobile_first/gh.php
Unescape Escape View File

@ -160,20 +160,18 @@ aria-label="festival">
<div class="form_content"> <div class="form_content">
<div class="formtitle"> <div class="formtitle">
<h2>Why Travel with Global Highlights</h2> <h2>Why Travel with Global Highlights During the Pandemic</h2>
<ul> <ul>
<li><strong>Tailor-made experience:</strong> All of your ideas/needs will be carefully <li><strong>Tailor-made experience:</strong> All of your ideas/needs will be carefully considered to create your ideal trip.</li>
considered to create your ideal trip.</li> <li><strong>Worry-free planning: </strong>Your 1:1 travel consultant will take all the uncertainty out of your planning, helping you navigate any travel restrictions. </li>
<li><strong>Worry-free planning: </strong>Every step of your trip, you will be looked <li><strong>24-7 support on your trip:</strong> We're only a call away.</li>
after by your 1:1 travel consultant based in Asia.</li>
<li><strong>No-risk booking:</strong> We refund as much as we can and adapt flexibly to
unexpected changes.</li>
</ul> </ul>
</div> </div>
<div class="ghwhyus"> <div class="ghwhyus">
<div class="contactwechat"> <a id="scrollAnchor"></a> <div class="contactwechat"> <a id="scrollAnchor"></a>
<img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px"> <img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px">
<div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span> <div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span>
Email: contact@globalhighlights.com
</div> </div>
</div> </div>
<p class="contactus">Or send an inquiry below</p> <p class="contactus">Or send an inquiry below</p>

Write Preview
Loading…
Cancel
Save