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

hotfix/paypal-note
candice 3 years ago
commit c15f27a308

@ -1207,6 +1207,9 @@ class Information extends CI_Controller
if (empty($meta_product_code)) { if (empty($meta_product_code)) {
$addthis_widget = $this->load->view($template_path . '-add-this', false, true); $addthis_widget = $this->load->view($template_path . '-add-this', false, true);
$template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template); $template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
$breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true);
$information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
} else { } else {
$template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.asiahighlights.com/js/flatpickr.js"></script>', $template); $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.asiahighlights.com/js/flatpickr.js"></script>', $template);
$inquiry_form_template = $this->load->view( $inquiry_form_template = $this->load->view(

@ -20,6 +20,7 @@ class Information_model extends CI_Model {
function __construct() { function __construct() {
parent::__construct(); parent::__construct();
$this->HT = $this->load->database('INFORMATION', TRUE); $this->HT = $this->load->database('INFORMATION', TRUE);
$this->HT229 = $this->load->database('HT', TRUE);
} }
function init() { function init() {
@ -440,7 +441,7 @@ class Information_model extends CI_Model {
. " ) \n" . " ) \n"
. "ORDER BY \n" . "ORDER BY \n"
. " lsi2.LSI2_SN DESC"; . " lsi2.LSI2_SN DESC";
$query = $this->HT->query($sql, array($this->config->item('site_lgc'), $this->config->item('site_lgc'), $city_id)); $query = $this->HT229->query($sql, array($this->config->item('site_lgc'), $this->config->item('site_lgc'), $city_id));
return $query->result(); return $query->result();
} }

@ -0,0 +1,6 @@
<div class="infocategory" style="display: none">
<a href="/">Home</a>
<?php foreach ($breadcrumb_data as $index => $item) {?>
<a href="<?php echo $item['ic_url'] ?>" data-index="<?php echo $index ?>" data-is-id="<?php echo $item['is_id'] ?>"><?php echo $item['ic_url_title'] ?></a>
<?php }?>
</div>
Loading…
Cancel
Save