From 91fa4f5c21733c060b7ecf9321d490e0f90136f9 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 24 Jun 2024 13:47:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86type=E6=94=B9=E4=B8=BAnumber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-gp-form.php                  | 2 +-
 application/views/mobile_first/ah-info-page-form.php           | 2 +-
 application/views/mobile_first/ah-inquiry-form.php             | 2 +-
 application/views/mobile_first/ah-lantern-festival-gp-form.php | 2 +-
 application/views/mobile_first/ah-lantern-form-info-page.php   | 2 +-
 application/views/mobile_first/ah-lantern-form.php             | 2 +-
 application/views/mobile_first/ah-new-year-countdown.php       | 2 +-
 application/views/mobile_first/ah-tour-list-form.php           | 2 +-
 application/views/mobile_first/ch-info-page-form.php           | 2 +-
 application/views/mobile_first/ch-inquiry-form.php             | 2 +-
 application/views/mobile_first/gh-info-page-form.php           | 2 +-
 application/views/mobile_first/gh-tour-form.php                | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php
index 9d1f274d..dfdc3635 100644
--- a/application/views/mobile_first/ah-gp-form.php
+++ b/application/views/mobile_first/ah-gp-form.php
@@ -323,7 +323,7 @@
     <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
 </select>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" value="" /> 
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" value="" /> 
     <div id="contact_errmsg" style="display: none">
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
     
diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index 02d26942..f3a9befa 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -481,7 +481,7 @@
     <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
 </select>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" value="" />
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" value="" />
     <div id="contact_errmsg" style="display: none">
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
 
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 7a5c85b1..6714579c 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -498,7 +498,7 @@
     <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
 </select>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" value="" />
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" value="" />
     <div id="contact_errmsg" style="display: none">
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
 
diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/ah-lantern-festival-gp-form.php
index 81a27a3f..0fdd84a6 100644
--- a/application/views/mobile_first/ah-lantern-festival-gp-form.php
+++ b/application/views/mobile_first/ah-lantern-festival-gp-form.php
@@ -305,7 +305,7 @@
     <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
 </select>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" value="" /> 
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" value="" /> 
     <div id="contact_errmsg" style="display: none">
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
    
diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php
index d680e9ed..7a9b8a08 100644
--- a/application/views/mobile_first/ah-lantern-form-info-page.php
+++ b/application/views/mobile_first/ah-lantern-form-info-page.php
@@ -384,7 +384,7 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
         </select>
         <input class="Inquiryphone" id="ticket_PhoneNo" name="PhoneNo"
-            placeholder="Phone number *" type="tel" value="" />
+            placeholder="Phone number *" type="number" value="" />
         <div id="ticket_contact_errmsg" style="display: none">
             <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>
         </div>
diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php
index 0abc70f1..171e4ad5 100644
--- a/application/views/mobile_first/ah-lantern-form.php
+++ b/application/views/mobile_first/ah-lantern-form.php
@@ -384,7 +384,7 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
         </select>
         <input class="Inquiryphone" id="ticket_PhoneNo" name="PhoneNo"
-            placeholder="Phone number *" type="tel" value="" />
+            placeholder="Phone number *" type="number" value="" />
         <div id="ticket_contact_errmsg" style="display: none">
             <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>
         </div>
diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 0c9817c6..e6103877 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -393,7 +393,7 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
         </select>
         <input class="Inquiryphone" id="ticket_PhoneNo" name="PhoneNo"
-            placeholder="Phone number *" type="tel" value="" />          
+            placeholder="Phone number *" type="number" value="" />          
         <div id="ticket_contact_errmsg" style="display: none">
             <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>
         </div>
diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index dd126da8..83ff5518 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -486,7 +486,7 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
 				</select>
 				<input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
-					placeholder="Phone number *" type="tel" value="" />
+					placeholder="Phone number *" type="number" value="" />
 				<div id="contact_errmsg" style="display: none">
 					<div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>
 				</div>
diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index d8fb4b1d..9fb9e87f 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -520,7 +520,7 @@ margin-top: 5px;font-size: 18px;
           <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
           <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
         </select>
-        <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" />
+        <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" />
         <span id="phone_errmsg" style="display: none"><span class="requiredArea">Please enter your phone
             number.</span></span>
 
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index f99a8738..4975a0b5 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -432,7 +432,7 @@
                 <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
                 <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
             </select>
-            <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="tel" />
+            <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number *" type="number" />
             <span id="phone_errmsg" style="display: none"><span class="requiredArea">Please enter your phone
                     number.</span></span>
 
diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index ae7c3318..3b33978c 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -513,7 +513,7 @@
             <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
             <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+358</option>
           </select>
-          <input class="Inquiryphone" name="PhoneNo" placeholder="Phone number *" type="text">
+          <input class="Inquiryphone" name="PhoneNo" placeholder="Phone number *" type="number">
           <span id="phone_errmsg" style="display: none"><span class="requiredArea">Please enter your phone
               number.</span></span>
 
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index 4cad8709..aee5e531 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -512,7 +512,7 @@
             <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
             <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
           </select>
-          <input class="Inquiryphone" name="PhoneNo" id="PhoneNo" placeholder="Phone number *" type="text">
+          <input class="Inquiryphone" name="PhoneNo" id="PhoneNo" placeholder="Phone number *" type="number">
         </p>
         <div id="contact_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>

From ae1395684fa265e9a9bf858ac69dbf3955997aef Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Fri, 28 Jun 2024 08:36:59 +0800
Subject: [PATCH 2/4] test meta

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

diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php
index 305a4c1e..2d5c961e 100644
--- a/application/controllers/infofix.php
+++ b/application/controllers/infofix.php
@@ -174,6 +174,7 @@ class infofix extends CI_Controller
       $meta->im_value = str_ireplace($oldStr, $newStr, $meta->im_value);
       $this->infoMetas_model->update($is_id, 'AMP_JSON', $meta->im_value);
     }
+    echo json_encode($meta);
 
     // amp_body_pc
     $meta = $this->infoMetas_model->get($ic_id, 'AMP_BODY_PC');
@@ -183,7 +184,7 @@ class infofix extends CI_Controller
     }
 
     echo json_encode($keyArr);
-
+    
   }
 
 }

From 67a4e3dc99a59304d4d00d8aa8ad7c854e6aaeed Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Fri, 28 Jun 2024 08:39:21 +0800
Subject: [PATCH 3/4] fix meta

---
 application/controllers/infofix.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php
index 2d5c961e..3fb58f76 100644
--- a/application/controllers/infofix.php
+++ b/application/controllers/infofix.php
@@ -171,16 +171,15 @@ class infofix extends CI_Controller
     // amp_json
     $meta = $this->infoMetas_model->get($ic_id, 'AMP_JSON');
     if (!empty($meta)) {
-      $meta->im_value = str_ireplace($oldStr, $newStr, $meta->im_value);
-      $this->infoMetas_model->update($is_id, 'AMP_JSON', $meta->im_value);
+      $meta = str_ireplace($oldStr, $newStr, $meta);
+      $this->infoMetas_model->update($is_id, 'AMP_JSON', $meta);
     }
-    echo json_encode($meta);
 
     // amp_body_pc
     $meta = $this->infoMetas_model->get($ic_id, 'AMP_BODY_PC');
     if (!empty($meta)) {
-      $meta->im_value = str_ireplace($oldStr, $newStr, $meta->im_value);
-      $this->infoMetas_model->update($is_id, 'AMP_BODY_PC', $meta->im_value);
+      $meta = str_ireplace($oldStr, $newStr, $meta);
+      $this->infoMetas_model->update($is_id, 'AMP_BODY_PC', $meta);
     }
 
     echo json_encode($keyArr);

From 0f4ac7007149a640fc0509d57f0eeadf03c7b405 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Fri, 28 Jun 2024 08:42:48 +0800
Subject: [PATCH 4/4] fix icid

---
 application/controllers/infofix.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php
index 3fb58f76..016ed03d 100644
--- a/application/controllers/infofix.php
+++ b/application/controllers/infofix.php
@@ -172,14 +172,14 @@ class infofix extends CI_Controller
     $meta = $this->infoMetas_model->get($ic_id, 'AMP_JSON');
     if (!empty($meta)) {
       $meta = str_ireplace($oldStr, $newStr, $meta);
-      $this->infoMetas_model->update($is_id, 'AMP_JSON', $meta);
+      $this->infoMetas_model->update($ic_id, 'AMP_JSON', $meta);
     }
 
     // amp_body_pc
     $meta = $this->infoMetas_model->get($ic_id, 'AMP_BODY_PC');
     if (!empty($meta)) {
       $meta = str_ireplace($oldStr, $newStr, $meta);
-      $this->infoMetas_model->update($is_id, 'AMP_BODY_PC', $meta);
+      $this->infoMetas_model->update($ic_id, 'AMP_BODY_PC', $meta);
     }
 
     echo json_encode($keyArr);