Skip to content

T
TimeOutAdmin
Commit 739e9062 by Tobin
Options

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

# Conflicts: # application/controllers/Api.php # application/models/Api_model.php
parents 1750c8ca 35e64468
Showing with 668 additions and 25 deletions
application/controllers/Api.php
...@@ -684,7 +684,7 @@ class Api extends CI_Controller { ...@@ -684,7 +684,7 @@ class Api extends CI_Controller {
public function getCheckerBookList(){ public function getCheckerBookList(){
$data = (array) json_decode(file_get_contents('php://input')); $data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Api_model->getCheckerBookList($data); $res = $this->Api_model->getOrganiserBookList($data);
if(isset($res['data']) && !empty($res['data'])){ if(isset($res['data']) && !empty($res['data'])){
$this->response($res['data']); $this->response($res['data']);
} }
......
application/controllers/Event.php
...@@ -400,11 +400,9 @@ class Event extends CI_Controller { ...@@ -400,11 +400,9 @@ class Event extends CI_Controller {
if($this->upload->do_upload('file')){ if($this->upload->do_upload('file')){
$iDat = $this->upload->data(); $iDat = $this->upload->data();
$path = $bPath.$iDat['file_name']; $path = $bPath.$iDat['file_name'];
if($extn != 'gif'){ if($extn != 'gif'){
$size = array('width'=>'720','height'=>'480'); $size = array('width'=>'720','height'=>'480');
$tFile = date('YmdHis').gettimeofday()['usec'].'_EVT_IMG_720x480.'.$extn; $tFile = date('YmdHis').gettimeofday()['usec'].'_EVT_IMG_720x480.'.$extn;
$resp = $this->imageResize($tFile,$size,$path); $resp = $this->imageResize($tFile,$size,$path);
if($resp['status'] == '1'){ if($resp['status'] == '1'){
$file = $tFile; $file = $tFile;
......
application/helpers/generals_helper.php
...@@ -156,25 +156,24 @@ ...@@ -156,25 +156,24 @@
case 1: case 1:
$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), 'Checker'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Staff'=>array(1,2,3,4),
'Venue'=>array(1,2,3,4),'Staff'=>array(1,2,3,4),'City'=>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), 'Customer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),'Settings'=>array(1,2,3,4),
'Commission'=>array(1,2,3,4),'Notification'=>array(1,2,3,4), 'Notification'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4),
'Settings'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4), 'Country'=>array(1,2,3,4),'HotelCity'=>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(),'Venue'=>array(1,2,3,4), 'City'=>array(),'Category'=>array(),'Promocode'=>array(1,2,3,4),
'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(), 'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(),
'Booking'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4)); 'Booking'=>array(1,2,3,4),'Venue'=>array(1,2,3,4),'HotelCity'=>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), 'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(1,2,3,4),
'Organizer'=>array(1,2,3,4),'Customer'=>array(1,2,3,4), 'Organizer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),
'Booking'=>array(1,2,3,4),'Notification'=>array(1,2,3,4)); 'Notification'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4));
break; break;
} }
return $menus; return $menus;
...@@ -305,6 +304,27 @@ ...@@ -305,6 +304,27 @@
$langArr['region_name'.$code] = $name; $langArr['region_name'.$code] = $name;
} }
break; break;
case 'HCTY':
$cond .= "hotel_city_id='$id'";
$sql = "SELECT * FROM translator_hotel_city WHERE $cond $orderBy";
$resp = $thisObj->db->query($sql)->result_array();
$regName = '';
if(empty($lngCode)){
$languages = getLanguages();
foreach ($languages AS $lang) {
$langArr['hotel_city_name_'.$lang] = '';
}
} else {
$langArr['hotel_city_name'] = '';
}
foreach ($resp AS $data) {
$code = (empty($lngCode))?'_'.$data['language_code']:'';
$regName = ($code=='en')?$data['hotel_city_name']:'';
$name = (!empty($data['hotel_city_name']))?$data['hotel_city_name']:$regName;
$langArr['hotel_city_name'.$code] = $name;
}
break;
case 'TAG': case 'TAG':
$cond .= "tag_id='$id'"; $cond .= "tag_id='$id'";
$sql = "SELECT * FROM translator_tag WHERE $cond $orderBy"; $sql = "SELECT * FROM translator_tag WHERE $cond $orderBy";
......
application/models/Api_model.php
...@@ -1768,11 +1768,17 @@ class Api_model extends CI_Model { ...@@ -1768,11 +1768,17 @@ class Api_model extends CI_Model {
if($count > 0){ if($count > 0){
$sql = "SELECT BOOK.bookId AS booking_id $sql = "SELECT BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK FROM checker_bookings AS CBOOK
INNER JOIN checker AS CHK ON (CHK.id=CBOOK.checker_id) INNER JOIN checker AS CHK ON (CHK.id=$checker_id)
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id) INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
<<<<<<< HEAD
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id AND INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id AND
EVT.provider_id=CHK.provider_id) EVT.provider_id=CHK.provider_id)
WHERE CBOOK.checker_id='$checker_id' AND BOOK.status='1'"; WHERE CBOOK.checker_id='$checker_id' AND BOOK.status='1'";
=======
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
WHERE EVT.provider_id=CHK.provider_id AND BOOK.status='1'";
pr($sql);
>>>>>>> 35e64468038d7469ca02c0914cd0daa42d2399e4
$count = $this->db->query($sql)->num_rows(); $count = $this->db->query($sql)->num_rows();
if($count > 0) { if($count > 0) {
...@@ -1816,6 +1822,4 @@ class Api_model extends CI_Model { ...@@ -1816,6 +1822,4 @@ class Api_model extends CI_Model {
} }
return $res; return $res;
} }
/*================ END : Checker API ================*/
} ?> } ?>
application/models/Validation_model.php
...@@ -403,7 +403,295 @@ class Validation_model extends CI_Model { ...@@ -403,7 +403,295 @@ class Validation_model extends CI_Model {
'message' => 'User Id is null or empty' 'message' => 'User Id is null or empty'
) )
) )
) ),
'getOrganizerEventList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
)
),
'getOrganizerEventDetails'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
),
'event_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event ID is null or empty'
)
)
),
'editOrganizerEventDetails'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
),
'event_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event ID is null or empty'
)
),
'event_name_en' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event name is null or empty'
)
),
'category' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Category is null or empty'
)
),
'maximum_seat_booking' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Maximum Seat Booking Filed is null or empty'
)
),
'payment_mode' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Payment Mode is null or empty'
)
),
'images' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Images is null or empty'
)
),
'event_desc_en' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event Description is null or empty'
)
),
'price' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Price Field is null or empty'
)
),
'capacity' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Capacity Field is null or empty'
)
),
'about_price_division_en' => array(
'required' => array(
'code' => 'ER18',
'message' => 'About Price Division is null or empty'
)
),
'show_type' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Show Type is null or empty'
)
),
'start_date' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Start Date is null or empty'
)
),
'end_date' => array(
'required' => array(
'code' => 'ER18',
'message' => 'End Date is null or empty'
)
),
'show_timing' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Show Timing is null or empty'
)
),
'tag' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Tag is null or empty'
)
)
),
'deleteOrganizerEvent'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
),
'event_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event ID is null or empty'
)
)
),
'deActivateOrganizerEvent'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
),
'event_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Event ID is null or empty'
)
)
),
'getVenueList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
)
),
'getVenueDetails'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
),
'venue_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Venue ID is null or empty'
)
)
),
'getCustomerList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
)
),
'getBookingList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer ID is null or empty'
)
)
),
'getBookingDetails'=>array(
'booking_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Booking ID is null or empty'
)
)
),
'organiserSignUp'=>array(
'username' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Username is null or empty'
)
),
'email_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Email Id is null or empty'
)
),
'contact_no' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Contact Number is null or empty'
)
),
'password' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Password is null or empty'
)
)
),
'signIn'=>array(
'email_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Email Id is null or empty'
)
),
'password' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Password is null or empty'
)
),
'user_type' => array(
'required' => array(
'code' => 'ER18',
'message' => 'User Type is null or empty'
)
),
),
'changePassword'=>array(
'new_password' => array(
'required' => array(
'code' => 'ER18',
'message' => 'New Password is null or empty'
)
),
'confirm_password' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Confirm Password is null or empty'
)
),
'user_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'User Id is null or empty'
)
),
'user_type' => array(
'required' => array(
'code' => 'ER18',
'message' => 'User Type is null or empty'
)
),
),
'checkerDeactivate'=>array(
'checker_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Checker Id is null or empty'
)
),
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer Id is null or empty'
)
)
),
'getTagList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Organizer Id is null or empty'
)
)
),
); );
public function _consruct(){ public function _consruct(){
......
application/views/Templates/left-menu.php
...@@ -168,16 +168,10 @@ ...@@ -168,16 +168,10 @@
</li> </li>
</ul> </ul>
</li> </li>
<?php } if(array_key_exists('Booking',$menus)){ ?>
<li>
<a href="<?= base_url('Booking/viewBookings') ?>">
<img src="<?=base_url("assets/images/m8.png") ?>">
<span>Booking Details</span></a>
</li>
<?php } if(array_key_exists('Promocode',$menus)){ ?> <?php } if(array_key_exists('Promocode',$menus)){ ?>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<img src="<?=base_url("assets/images/m8.png") ?>"> <img src="<?=base_url("assets/images/m2.png") ?>">
<span>Promocode Management</span> <span>Promocode Management</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
...@@ -196,6 +190,18 @@ ...@@ -196,6 +190,18 @@
</li> </li>
</ul> </ul>
</li> </li>
<?php } if(array_key_exists('Booking',$menus)){ ?>
<li>
<a href="<?= base_url('Booking/viewBookings') ?>">
<img src="<?=base_url("assets/images/m8.png") ?>">
<span>Booking Details</span></a>
</li>
<?php } if(array_key_exists('HotelCity',$menus)){ ?>
<li>
<a href="<?= base_url('HotelCity/listHotelCity') ?>">
<img src="<?=base_url("assets/images/m4.png") ?>">
<span>Hotel Cities</span></a>
</li>
<?php } if(array_key_exists('',$menus)){ ?> <?php } if(array_key_exists('',$menus)){ ?>
<li><a href="<?= base_url('Provider/getProviderPayDetails') ?>"> <li><a href="<?= base_url('Provider/getProviderPayDetails') ?>">
<img src="<?=base_url("assets/images/m2.png") ?>"> <img src="<?=base_url("assets/images/m2.png") ?>">
......
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