From 16adc76d7b0a3b5683c684069ba830a8527349ed Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 3 Jan 2024 14:01:07 +0800
Subject: [PATCH] =?UTF-8?q?GH=E5=92=8CCH=E7=BD=91=E7=AB=99=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=BA=BF=E8=B7=AF=E4=BB=B7=E6=A0=BC=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 28 +++++++++++++++++++--
 application/models/PrimeLinePrice_model.php |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index a314fdd2..56ec1131 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -940,6 +940,17 @@ class Information extends CI_Controller
       $information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
     }
 
+    // CH: 1; AH: 28; GH : 33
+    $price_tag_list = $this->parse_price_tag($information->ic_content, 1);
+
+    foreach ($price_tag_list as $price_tag) {
+      $information->ic_content = str_replace(
+        $price_tag['placeholder'],
+        $price_tag['price_number'],
+        $information->ic_content
+      );
+    }
+
     //---day tours--- 20210922 zp
     //本地 278035929
     //网前 278008224
@@ -1332,10 +1343,12 @@ class Information extends CI_Controller
     }
   }
 
+  // <div>#ah-mtc-3,st,2#</div>
+  // CH: 1; AH: 28; GH : 33
   public function test_price()
   {
-    $price_rule = base64_decode($this->input->get('price_rule')); //'<div">#ah-mtc-3,st,2#</div>';
-    $dept_sn = $this->input->get('dept_sn'); //'<div">#ah-mtc-3,st,2#</div>';
+    $price_rule = base64_decode($this->input->get('price_rule'));
+    $dept_sn = $this->input->get('dept_sn');
     $price_item_array = $this->price_pregmatch($price_rule);
     echo 'price_item_array: ';
     var_dump($price_item_array);
@@ -1713,6 +1726,17 @@ class Information extends CI_Controller
       );
       $information->ic_content = str_replace('<!--@TOUR-FORM-TAG@-->', $tour_form_content, $information->ic_content);
     }
+    
+    // CH: 1; AH: 28; GH : 33
+    $price_tag_list = $this->parse_price_tag($information->ic_content, 33);
+
+    foreach ($price_tag_list as $price_tag) {
+      $information->ic_content = str_replace(
+        $price_tag['placeholder'],
+        $price_tag['price_number'],
+        $information->ic_content
+      );
+    }
 
     // 动态加载反馈标签，每个城市三十条反馈。
     // HTLM: <div><!--@FEEDBACK-30_Bangkok@--></div>
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index 7df81b79..bca97522 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -8,7 +8,7 @@ class PrimeLinePrice_model extends CI_Model {
     var $cli_grade = 7001; //(标准7001、豪华7002、经济7003）
     var $price_date = false; //查询价格日期区间
     var $orderby = false;
-    // AH: 28
+    // CH: 1; AH: 28; GH : 33
     var $DEI_SN = 28;
 
     function __construct() {