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

application/controllers/information.php

@@ -1277,9 +1277,16 @@ class Information extends CI_Controller
             $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.asiahighlights.com/js/flatpickr.js"></script>', $template);            
             $inquiry_form_template = $this->load->view(
                 $template_path . '-inquiry-form', 
-                array('meta_product_code' => $meta_product_code, 'ic_seo_title' => $information->ic_seo_title), 
+                array('meta_product_code' => $meta_product_code, 'information' => $information), 
                 true);
             $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
+
+            // GP 表单
+            $gp_form_content = $this->load->view(
+                $template_path . '-gp-form', 
+                array('meta_product_code' => $meta_product_code, 'information' => $information), 
+                true);
+            $information->ic_content = str_replace('<!--@GP-FORM@-->', $gp_form_content, $information->ic_content);
         }
         // why-us 相关的标签        
         $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true);
@@ -1295,16 +1302,18 @@ class Information extends CI_Controller
         $information->ic_content = str_replace('<!--@INFO-PAGE-FORM@-->', $info_page_form_content, $information->ic_content);
 
         // 水灯节表单
-        $lantern_form_content = $this->load->view($template_path . '-lantern-form', false, true);
+        $lantern_form_content = $this->load->view(
+            $template_path . '-lantern-form', 
+            array('information' => $information), 
+            true);
         $information->ic_content = str_replace('<!--@LANTERN-FORM@-->', $lantern_form_content, $information->ic_content);
         // 水灯节在信息页面表单
-        $lantern_form_info_page_content = $this->load->view($template_path . '-lantern-form-info-page', false, true);
+        $lantern_form_info_page_content = $this->load->view(
+            $template_path . '-lantern-form-info-page', 
+            array('information' => $information), 
+            true);
         $information->ic_content = str_replace('<!--@LANTERN-FORM-INFO-PAGE@-->', $lantern_form_info_page_content, $information->ic_content);
 
-        // GP 表单
-        $gp_form_content = $this->load->view($template_path . '-gp-form', false, true);
-        $information->ic_content = str_replace('<!--@GP-FORM@-->', $gp_form_content, $information->ic_content);
-
         // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。
         // HTLM: <div><!--@FEEDBACK_Siem Reap,Bangkok@--></div>
         // 解析结果：<!--@FEEDBACK_Siem Reap,Bangkok@-->; Siem Reap,Bangkok

application/views/mobile_first/ah-gp-form.php

@@ -623,7 +623,7 @@
    
     <button class="sendButton" id="submit_gp_form" type="button">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; ?>" />
+    <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>
     <h3 style="text-align: center;
     font-size: 20px;

application/views/mobile_first/ah-inquiry-form.php

@@ -600,7 +600,7 @@
    
    
     <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; ?>" />
+    <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>
     <h3 style="text-align: center;
     font-size: 20px;

application/views/mobile_first/ah-lantern-form-info-page.php

@@ -669,6 +669,7 @@
         <input name="totalprice" id="totalPriceHidden" type="hidden" value="10000" /> 
         <input name="product_sn" id="product_sn" type="hidden" value="13949" /> 
         <input name="cli_no" id="cli_no" type="hidden" value="YDFW-AH" /> 
+        <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
         <button class="sendButton" id="submit_ticket_button" name="submit_ticket_form"
             type="button">Proceed to Payment</button>
     </form>

application/views/mobile_first/ah-lantern-form.php

@@ -668,6 +668,7 @@
        
         <input name="totalprice" id="totalPriceHidden" type="hidden" value="10000" /> 
         <input name="cli_no" id="cli_no" type="hidden" value="ah-24"/> 
+        <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
         <button class="sendButton" id="submit_ticket_button" name="submit_ticket_form"
             type="button">Proceed to Payment</button>
     </form>