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

application/models/Organizer_model.php

@@ -868,7 +868,7 @@ class Organizer_model extends CI_Model {
 
     public function getCountryCode(){
     	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);
     		if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');

application/views/Host/viewHostCategories.php

@@ -68,7 +68,7 @@
                         <?= ($host->status == 1)?'Active':'De-activate' ?>
                       </th>
                       <?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" 
                                href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>">
                               <i class="fa fa-fw fa-edit"></i>Edit

application/views/Staff/staffForm.php

@@ -64,7 +64,7 @@
                       <div class="col-md-5">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="5" name="user_type">
-                        <label class="padLeft10">Customer</label>
+                        <label class="padLeft10">Customer Care</label>
                       </div>
                     </div> 
                   </div>