From 0318bd0b5bba881c72b4cebe82f022f1b621fcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 5 Nov 2021 14:31:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B8=B8=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/chinatravel-pc.php | 1 -
 application/views/mobile_first/chinatravel.php    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php
index 7ea2bc55..2eeeae84 100644
--- a/application/views/mobile_first/chinatravel-pc.php
+++ b/application/views/mobile_first/chinatravel-pc.php
@@ -147,7 +147,6 @@
         <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>
diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php
index f0a332a7..e171c7a3 100644
--- a/application/views/mobile_first/chinatravel.php
+++ b/application/views/mobile_first/chinatravel.php
@@ -144,7 +144,6 @@
         <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>

From 6f220aa7229bc59dc199ee7e2b66b06f54c5bf12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 5 Nov 2021 16:32:27 +0800
Subject: [PATCH 2/6] fix

---
 application/views/mobile_first/chinatravel-pc.php | 1 -
 application/views/mobile_first/chinatravel.php    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php
index 2eeeae84..80c165d4 100644
--- a/application/views/mobile_first/chinatravel-pc.php
+++ b/application/views/mobile_first/chinatravel-pc.php
@@ -146,7 +146,6 @@
         <div class="booking">
         <div class="bookingtitle">
           <div class="booking-top">
-            <p>Tour Code: <?php echo $productCode ?></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>
diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php
index e171c7a3..a8c16d4d 100644
--- a/application/views/mobile_first/chinatravel.php
+++ b/application/views/mobile_first/chinatravel.php
@@ -143,7 +143,6 @@
         <div class="booking">
         <div class="bookingtitle">
           <div class="booking-top">
-            <p>Tour Code: <?php echo $productCode ?></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>

From 97b1f410011c8d19e26fc89b34b6b0dd2e78281a Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 8 Nov 2021 09:57:53 +0800
Subject: [PATCH 3/6] =?UTF-8?q?GH=20=E5=BA=95=E9=83=A8=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php  | 6 ++++++
 application/views/mobile_first/gh-pc.php | 1 +
 application/views/mobile_first/gh.php    | 1 +
 3 files changed, 8 insertions(+)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 0e3c1cc4..d116c5ba 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -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和移动只需要查一次，减少数据库负担
diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php
index eb7c80c7..6877daa9 100644
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@@ -184,6 +184,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
diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php
index 1b090980..12062094 100644
--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@@ -145,6 +145,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

From 98551cb98a05db8365121c7c6e3cf77be9ce0f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 8 Nov 2021 14:09:25 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/infoContents_model.php                       | 2 +-
 application/models/infoStructures_model.php                     | 2 +-
 application/models/information_model.php                        | 2 +-
 .../third_party/recommend/models/infoRecommends_model.php       | 2 +-
 application/third_party/recommend/models/infoTips_model.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php
index 1d882814..6e32a53a 100644
--- a/application/models/infoContents_model.php
+++ b/application/models/infoContents_model.php
@@ -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) {
diff --git a/application/models/infoStructures_model.php b/application/models/infoStructures_model.php
index ea567fd5..c00d3605 100644
--- a/application/models/infoStructures_model.php
+++ b/application/models/infoStructures_model.php
@@ -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);
     }
 
 
diff --git a/application/models/information_model.php b/application/models/information_model.php
index a25db8a9..72dfb67d 100644
--- a/application/models/information_model.php
+++ b/application/models/information_model.php
@@ -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() {
diff --git a/application/third_party/recommend/models/infoRecommends_model.php b/application/third_party/recommend/models/infoRecommends_model.php
index ea6504b7..ebd60a8a 100644
--- a/application/third_party/recommend/models/infoRecommends_model.php
+++ b/application/third_party/recommend/models/infoRecommends_model.php
@@ -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() {
diff --git a/application/third_party/recommend/models/infoTips_model.php b/application/third_party/recommend/models/infoTips_model.php
index 4745e170..18344f65 100644
--- a/application/third_party/recommend/models/infoTips_model.php
+++ b/application/third_party/recommend/models/infoTips_model.php
@@ -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() {

From 2aacf8d269cbbc56f4ad72c78f487b58162ec2cf Mon Sep 17 00:00:00 2001
From: hainatravel <lmr@hainatravel.com>
Date: Mon, 8 Nov 2021 14:16:21 +0800
Subject: [PATCH 5/6] Update .gitignore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

database.php设置为不用版本管理，方便部署各站点自己的数据库
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 47901456..3d65119b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 */paypal_activities/*
 /author/document/*
 /application/libraries/composer
+/application/config/database.php

From e9dae04eaacf2ef8bfcb47879aa40edac6535f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 8 Nov 2021 14:23:06 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3d65119b..87794a8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /author/document/*
 /application/libraries/composer
 /application/config/database.php
+
+