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

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

Browse Source
hotfix/paypal-note
candice 4 years ago
parent aadc6be69e e9dae04eaa
commit 4d2ac026db
11 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape Escape View File

@ -11,3 +11,6 @@
*/paypal_activities/*
/author/document/*
/application/libraries/composer
/application/config/database.php

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

@ -979,6 +979,12 @@ class Information extends CI_Controller
array('information' => $information, 'author' => $author),
true);
$template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
$product_code = get_meta($information->ic_id, 'meta_product_code');
if (!empty($product_code)) {
// <input name="cli_no" type="hidden" value="cht-63">
$product_code_input = "<input name='cli_no' type='hidden' value='$product_code'>";
$template = str_replace('<!--@INPUT_PRODUCT_CODE@-->', $product_code_input, $template);
}
//信息推荐
$template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来，pc和移动只需要查一次，减少数据库负担

2
application/models/infoContents_model.php
Unescape Escape View File

@ -8,7 +8,7 @@ class InfoContents_model extends CI_Model
function __construct()
{
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->HT = $this->load->database('INFORMATION', TRUE);
}
public function add_use_ORM($table, $data) {

2
application/models/infoStructures_model.php
Unescape Escape View File

@ -8,7 +8,7 @@ class InfoStructures_model extends CI_Model
function __construct()
{
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->HT = $this->load->database('INFORMATION', TRUE);
}

2
application/models/information_model.php
Unescape Escape View File

@ -19,7 +19,7 @@ class Information_model extends CI_Model {
function __construct() {
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->HT = $this->load->database('INFORMATION', TRUE);
}
function init() {

2
application/third_party/recommend/models/infoRecommends_model.php vendored
Unescape Escape View File

@ -9,7 +9,7 @@ class infoRecommends_model extends CI_Model
function __construct()
{
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->HT = $this->load->database('INFORMATION', TRUE);
}
public function init() {

2
application/third_party/recommend/models/infoTips_model.php vendored
Unescape Escape View File

@ -9,7 +9,7 @@ class infoTips_model extends CI_Model
function __construct()
{
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->HT = $this->load->database('INFORMATION', TRUE);
}
public function init() {

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

@ -146,8 +146,6 @@
<div class="booking">
<div class="bookingtitle">
<div class="booking-top">
<p>Tour Code: <?php echo $productCode ?></p>
<p>Tour type: One Day Trips (Private Tour)</p>
</div>
<div class="bg-triangle"> <span class="bgarrow"></span>
<p class="text-center">from US $<span class="font36"><span class="js_getDayTripPrice" data="<?php echo $productCode ?>"></span></span> p/p</p>

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

@ -143,8 +143,6 @@
<div class="booking">
<div class="bookingtitle">
<div class="booking-top">
<p>Tour Code: <?php echo $productCode ?></p>
<p>Tour type: One Day Trips (Private Tour)</p>
</div>
<div class="bg-triangle"> <span class="bgarrow"></span>
<p class="text-center">from US $<span class="font36"><span class="js_getDayTripPrice" data="<?php echo $productCode ?>"></span></span> p/p</p>

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

@ -234,6 +234,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
<input name="nullemail" placeholder="Your alternative email?" type="hidden">
<input id="url" name="url" type="hidden">
<!--@INPUT_PRODUCT_CODE@-->
<input id="sourcetype" name="sourcetype" type="hidden" value="32113">
<button class="sendButton" type="submit">
Send My Inquiry

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

@ -195,6 +195,7 @@ aria-label="festival">
placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
<input name="nullemail" placeholder="Your alternative email?" type="hidden">
<input id="url" name="url" type="hidden">
<!--@INPUT_PRODUCT_CODE@-->
<input id="sourcetype" name="sourcetype" type="hidden" value="32113">
<button class="sendButton" type="submit">
Send My Inquiry

Write Preview
Loading…
Cancel
Save