From 9e210dbe9ae565dce3ebf7494038c6ecfbe6a7ba Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 1 Jun 2022 12:31:16 +0800
Subject: [PATCH 1/4] f

---
 application/controllers/info_amp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 014e6d84..e3b2b50e 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -519,8 +519,9 @@ class Info_amp extends CI_Controller
     {
         $json = $this->input->get_post('json');
         $icid = $this->input->get_post('icid');
+        $action = $this->input->get_post('action') ? '_' . $this->input->get_post('action') : '';
         if ($json && $icid) {
-            $code = $this->Logs_model->backup_meta($icid, $json, 'AMP_HISTORY');
+            $code = $this->Logs_model->backup_meta($icid, $json, 'AMP_HISTORY' . $action);
             echo json_encode(array(
                 "succ" => true,
                 "info" => $this->Logs_model->pick_backup_meta($code)

From bb45c2ee334360c8862fa07f9d29567e0a5b2f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 2 Jun 2022 10:42:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=88=86=E5=88=B0infomation=5Fct=E8=BF=99=E8=BE=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/infoaccessmanage_model.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/models/infoaccessmanage_model.php b/application/models/infoaccessmanage_model.php
index 70e95b82..82ce2e41 100644
--- a/application/models/infoaccessmanage_model.php
+++ b/application/models/infoaccessmanage_model.php
@@ -5,7 +5,8 @@ class infoAccessmanage_model extends CI_Model
     function __construct()
     {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
+        $this->HT229 = $this->load->database('HT', TRUE);
     }
 
     //获取用户结构列表
@@ -19,7 +20,7 @@ class infoAccessmanage_model extends CI_Model
                          iam_author
                 FROM     infoaccessmanage 
                          INNER JOIN infoStructures is1 ON iam_is_id = is1.is_id
-                         LEFT JOIN OperatorInfo ON iam_author=OPI_Code
+                         LEFT JOIN tourmanager.dbo.OperatorInfo ON iam_author=OPI_Code
                 ORDER BY is1.is_level ASC,
                          is1.is_sort ASC, 
                          is1.is_path ASC";
@@ -408,7 +409,7 @@ class infoAccessmanage_model extends CI_Model
             $undefined_sql="AND OPI_Code NOT IN (SELECT iam_author FROM infoaccessmanage)";
         }
         $sql = "SELECT * FROM  OperatorInfo WHERE DeleteFlag=0 $undefined_sql";
-        $query = $this->HT->query($sql);
+        $query = $this->HT229->query($sql);
         return $query->result();
     }
 

From 4eeba374596c2fa2eac301b969b531903334eb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 2 Jun 2022 10:45:54 +0800
Subject: [PATCH 3/4] fix

---
 application/models/infoaccessmanage_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/infoaccessmanage_model.php b/application/models/infoaccessmanage_model.php
index 82ce2e41..6efcf0f2 100644
--- a/application/models/infoaccessmanage_model.php
+++ b/application/models/infoaccessmanage_model.php
@@ -428,7 +428,7 @@ class infoAccessmanage_model extends CI_Model
 
             $undefined_sql.=" AND a_id NOT IN ($authors)";
         }
-        $sql = "SELECT * FROM  infoAuthors $undefined_sql";
+        $sql = "SELECT * FROM  tourmanager.dbo.infoAuthors $undefined_sql";
         $query = $this->HT->query($sql);
         return $query->result();
     }

From b1bfb01a661d5e63fb1bc727d455864c373289ea Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 8 Jun 2022 09:55:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E4=B8=80=E6=A0=8F?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-inquiry-form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 7a5c4a2a..185540ae 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -4,7 +4,7 @@
 <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.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px" >
+    <div class="contactwechat"><img alt="Asia Highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px" >
     <div class="wechatinfo"><span class="wechatred">+86 15807734776</span><br>
     Email: <span class="wechatred">contact@asiahighlights.com</span></div>
     </div>
@@ -25,7 +25,7 @@
     <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date" readonly="readonly" type="text" value="" />
     <div id="starting_date_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date</div> </div>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Any other way to reach you (optional)" type="tel" value="" /> 
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number or other contact info" type="tel" value="" /> 
     <textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food..." style="height:100px;"></textarea>
     <button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="ic_title" type="hidden" value="<?php echo $ic_seo_title; ?>" />