Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	application/views/mobile_first/ah-inquiry-form.php
hotfix/paypal-note
LiaoYijun 3 years ago
parent a6c6422a23 b1bfb01a66
commit 21fcb258fb
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
application/controllers/info_amp.php
Unescape Escape View File

@ -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)

9
application/models/infoaccessmanage_model.php
Unescape Escape View File

@ -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();
}
@ -427,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();
}

4
application/views/mobile_first/ah-inquiry-form.php
Unescape Escape View File

@ -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="" />
<div id="contact_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please enter your phone number or other contact info.</div> </div>

Write Preview
Loading…
Cancel
Save