Commit 50ed4466 by Tobin

dc

parent 465c39ed
...@@ -154,26 +154,27 @@ ...@@ -154,26 +154,27 @@
switch($userType){ switch($userType){
/* ADD => 1 EDIT => 2 DELETE => 3 CHANGE_STATUS => 4 */ /* ADD => 1 EDIT => 2 DELETE => 3 CHANGE_STATUS => 4 */
case 1: case 1:
// 'HotelCity'=>array(1,2,3,4),'HotelBooking'=>array(1,2,3,4),'FlightBooking'=>array(1,2,3,4)
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4), $menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4),
'CMS'=>array(1,2,3,4),'Event'=>array(1,2,3,4),'Organizer'=>array(1,2,3,4), 'CMS'=>array(1,2,3,4),'Event'=>array(1,2,3,4),'Organizer'=>array(1,2,3,4),
'Checker'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Staff'=>array(1,2,3,4), 'Checker'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Staff'=>array(1,2,3,4),
'Venue'=>array(1,2,3,4),'City'=>array(1,2,3,4),'Commission'=>array(1,2,3,4), 'Venue'=>array(1,2,3,4),'City'=>array(1,2,3,4),'Commission'=>array(1,2,3,4),
'Customer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),'Settings'=>array(1,2,3,4), 'Customer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),'Settings'=>array(1,2,3,4),
'Notification'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4), 'Notification'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4),
'Country'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4),'HotelBooking'=>array(1,2,3,4),'FlightBooking'=>array(1,2,3,4)); 'Country'=>array(1,2,3,4));
break; break;
case 2: case 2:
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(),'Host'=>array(1), $menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(),'Host'=>array(1),
'City'=>array(),'Category'=>array(),'Event'=>array(1,2,3,4), 'City'=>array(),'Category'=>array(),'Event'=>array(1,2,3,4),
'Checker'=>array(1,2,3,4),'Customer'=>array(), 'Checker'=>array(1,2,3,4),'Customer'=>array(),
'Booking'=>array(1,2,3,4),'Venue'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4)); 'Booking'=>array(1,2,3,4),'Venue'=>array(1,2,3,4));
break; break;
case 4: case 4:
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4), $menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4),
'City'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Venue'=>array(1,2,3,4), 'City'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Venue'=>array(1,2,3,4),
'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(1,2,3,4), 'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(1,2,3,4),
'Organizer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4), 'Organizer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),
'Notification'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4)); 'Notification'=>array(1,2,3,4));
break; break;
case 5: case 5:
$menus = array('Customer'=>array(),'Customer_Booking'=>array()); $menus = array('Customer'=>array(),'Customer_Booking'=>array());
......
...@@ -9,7 +9,8 @@ class Customer_model extends CI_Model { ...@@ -9,7 +9,8 @@ class Customer_model extends CI_Model {
$cond .= (!empty($customer_id))?" AND CUST.customer_id='$customer_id' ":""; $cond .= (!empty($customer_id))?" AND CUST.customer_id='$customer_id' ":"";
$sql = "SELECT CUST.customer_id,CUST.name,CUST.email,CUST.phone,CUST.email,CUST.gender, $sql = "SELECT CUST.customer_id,CUST.name,CUST.email,CUST.phone,CUST.email,CUST.gender,
CUST.dob,CUST.profile_city,CUST.reset_key,CUST.social_id,CUST.profile_image,USR.status CUST.dob,CUST.profile_city,CUST.reset_key,CUST.social_id,CUST.profile_image,
USR.status,CUST.profile_city AS city
FROM customer AS CUST FROM customer AS CUST
INNER JOIN users AS USR ON (USR.id=CUST.customer_id) INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
WHERE $cond"; WHERE $cond";
...@@ -17,7 +18,7 @@ class Customer_model extends CI_Model { ...@@ -17,7 +18,7 @@ class Customer_model extends CI_Model {
if(!empty($provider_id)){ if(!empty($provider_id)){
$sql = "SELECT CUST.customer_id,CUST.name,CUST.email,CUST.phone,CUST.email,CUST.gender, $sql = "SELECT CUST.customer_id,CUST.name,CUST.email,CUST.phone,CUST.email,CUST.gender,
CUST.dob,CUST.profile_city,CUST.reset_key,CUST.social_id, CUST.dob,CUST.profile_city,CUST.reset_key,CUST.social_id,
CUST.profile_image,USR.status CUST.profile_image,USR.status,CUST.profile_city AS city
FROM customer AS CUST FROM customer AS CUST
INNER JOIN users AS USR ON (USR.id=CUST.customer_id) INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
INNER JOIN booking AS BOK ON (BOK.customer_id=CUST.customer_id) INNER JOIN booking AS BOK ON (BOK.customer_id=CUST.customer_id)
......
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
<label>Title Short</label> <label>Title Short</label>
<input type="text" name="title_short" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title_short'] ?>"> <input type="text" name="title_short" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title_short'] ?>">
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6 hide">
<label>Country Code</label> <label>Country Code</label>
<input type="text" name="country_flag" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['country_flag'] ?>"> <input type="text" name="country_flag" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['country_flag'] ?>">
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6 hide">
<label>Currency</label> <label>Currency</label>
<input type="text" name="currency" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['currency'] ?>"> <input type="text" name="currency" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['currency'] ?>">
</div> </div>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<label>Google API Key</label> <label>Google API Key</label>
<input type="text" name="google_api_key" class="form-control required" placeholder="Enter Google API" value="<?= $data['google_api_key'] ?>"> <input type="text" name="google_api_key" class="form-control required" placeholder="Enter Google API" value="<?= $data['google_api_key'] ?>">
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6 hide">
<label>Commission Per Booking</label> <label>Commission Per Booking</label>
<input type="text" name="service_charge" class="form-control required" placeholder="Enter Service Charge" value="<?= $data['service_charge'] ?>"> <input type="text" name="service_charge" class="form-control required" placeholder="Enter Service Charge" value="<?= $data['service_charge'] ?>">
</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