Skip to content

T
TimeOutAdmin
Commit 1f179eea by Jansa Jose
Options

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

parents 57aadde1 d4334952
Showing with 4 additions and 4 deletions
application/models/Organizer_model.php
...@@ -868,7 +868,7 @@ class Organizer_model extends CI_Model { ...@@ -868,7 +868,7 @@ class Organizer_model extends CI_Model {
public function getCountryCode(){ public function getCountryCode(){
try{ try{
$sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status='1'"; $sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status=1";
$ctryData = $this->db->query($sql); $ctryData = $this->db->query($sql);
if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){ if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
...@@ -879,7 +879,7 @@ class Organizer_model extends CI_Model { ...@@ -879,7 +879,7 @@ class Organizer_model extends CI_Model {
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08'); $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08');
} }
return $res; return $res;
} }
public function getCheckerList($data){ public function getCheckerList($data){
try{ try{
......
application/views/Host/viewHostCategories.php
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<?= ($host->status == 1)?'Active':'De-activate' ?> <?= ($host->status == 1)?'Active':'De-activate' ?>
</th> </th>
<?php if(in_array('2',$pAccess)||in_array('3',$pAccess)||in_array('4',$pAccess)){?> <td class="center"> <?php if(in_array('2',$pAccess)||in_array('3',$pAccess)||in_array('4',$pAccess)){?> <td class="center">
<?php if(in_array('2',$pAccess)){ ?> <?php if(in_array('NILL',$pAccess)){ ?>
<a class="btn btn-sm btn-primary" <a class="btn btn-sm btn-primary"
href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>"> href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>">
<i class="fa fa-fw fa-edit"></i>Edit <i class="fa fa-fw fa-edit"></i>Edit
......
application/views/Staff/staffForm.php
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<div class="col-md-5"> <div class="col-md-5">
<input type="radio" class="required padLeft10" data-parsley-trigger="change" <input type="radio" class="required padLeft10" data-parsley-trigger="change"
required value="5" name="user_type"> required value="5" name="user_type">
<label class="padLeft10">Customer</label> <label class="padLeft10">Customer Care</label>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment