Skip to content

T
TimeOutAdmin
Commit 82e1bfbf by Tobin
Options

Merge branch 'master' into 'live_production'

Master See merge request !63
parents 198beb18 41671532
Showing with 44 additions and 21 deletions
application/models/Api_model.php
......@@ -597,7 +597,7 @@ class Api_model extends CI_Model {
$page_limit = ($page - 1) * $per_page;
if($count > $page_limit) {
$result = $this->db->query("SELECT events.event_id, events.event_name,events.event_name_ar,events.event_discription AS event_description,events.event_discription_ar,events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,`event_gallery`.`media_url`,favourite.status AS fav_status, GROUP_CONCAT(DISTINCT tags.tag_name) AS tag,
$result = $this->db->query("SELECT events.event_id, events.event_name,events.event_name_ar,events.event_discription AS event_description,venue.location,venue.venue_name, events.event_discription_ar,events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,`event_gallery`.`media_url`,favourite.status AS fav_status, GROUP_CONCAT(DISTINCT tags.tag_name) AS tag,
GROUP_CONCAT(DISTINCT tags.tag_name_ar) AS tag_ar FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id AND event_date_time.date >= DATE_FORMAT(NOW(),'%Y-%m-%d') INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`media_type` = 0 LEFT JOIN booking on booking.event_id = events.event_id LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id = ".$user_id." AND favourite.status = 1 LEFT JOIN event_tags ON events.event_id = event_tags.event_id LEFT JOIN tags on tags.tag_id = event_tags.tag_id WHERE events.status = 1 GROUP BY events.event_id LIMIT ".$page_limit.",".$per_page)->result();
if(count($result)>0){
......@@ -636,6 +636,8 @@ class Api_model extends CI_Model {
'event_name_ar'=>$rs->event_name_ar,
'event_description'=>$rs->event_description,
'event_description_ar'=>$rs->event_discription_ar,
'venue_name'=>$rs->venue_name,
'venue_location'=>$rs->location,
'media_url'=>$rs->media_url,
'fav_status'=>$rs->fav_status,
'price'=>$price,
......@@ -899,10 +901,7 @@ class Api_model extends CI_Model {
if($count > $page_limit) {
$result = $this->db->query("
SELECT events.event_id, AVG(review.rate) AS rate,
MAX(booking.id) AS attendees, events.event_name, events.event_name_ar,
events.event_discription AS event_description,events.event_discription_ar,events.seat_pricing,
events.custom_seat_layout, venue.layout, venue.layout_details,
SELECT events.event_id, events.event_name, venue.venue_name, venue.location, events.event_name_ar,events.event_discription AS event_description,events.event_discription_ar,events.seat_pricing,events.custom_seat_layout, venue.layout, venue.layout_details,
`event_gallery`.`media_url`,favourite.status AS fav_status,
GROUP_CONCAT(DISTINCT tags.tag_name) AS tag, GROUP_CONCAT(DISTINCT tags.tag_name_ar) AS tag_ar
FROM events
......@@ -914,12 +913,24 @@ class Api_model extends CI_Model {
LEFT JOIN favourite ON favourite.event_id=events.event_id AND favourite.user_id='$user_id' AND favourite.status=1
LEFT JOIN event_tags ON events.event_id=event_tags.event_id
LEFT JOIN tags on tags.tag_id = event_tags.tag_id
LEFT JOIN review ON events.event_id=review.event_id
WHERE events.status=1 $where GROUP BY events.event_id ORDER BY attendees DESC LIMIT ". $page_limit.", ".$per_page)->result();
WHERE events.status=1 $where GROUP BY events.event_id ORDER BY events.event_id DESC LIMIT ". $page_limit.", ".$per_page)->result();
if(count($result)>0){
$resultData = array();
foreach ($result as $rs) {
$sql = "SELECT AVG(review.rate) AS rate
FROM review WHERE event_id=$rs->event_id";
$rating = $this->db->query($sql)->row_array();
$rate = isset($rating['rate'])&&!empty($rating['rate'])?
$rating['rate']:'0.0';
$sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking
WHERE status IN (1,2) AND event_id=$rs->event_id";
$atten = $this->db->query($sql)->row_array();
$atte = isset($atten['attend'])&&!empty($atten['attend'])?
$atten['attend']:'0';
if($rs->layout!=''){
if($rs->custom_seat_layout!=''){
$pricelist = json_decode($rs->custom_seat_layout, TRUE);
......@@ -940,12 +951,14 @@ class Api_model extends CI_Model {
'event_name_ar'=>$rs->event_name_ar,
'event_description'=>$rs->event_description,
'event_description_ar'=>$rs->event_discription_ar,
'venue_name'=>$rs->venue_name,
'venue_location'=>$rs->location,
'media_url'=>$rs->media_url,
'fav_status'=>$rs->fav_status,
'price'=>$price,
'event_id'=>$rs->event_id,
'attendees'=>$rs->attendees,
'rate'=>$rs->rate,
'attendees'=>$atte,
'rate'=>$rate,
'tag'=>$tags,
'tag_ar'=>$tags_ar
);
......@@ -1148,6 +1161,9 @@ class Api_model extends CI_Model {
$result->seat_class = $ticketDetls->color;
}
}
$this->db->insert('checker_bookings',
array('checker_id'=>$data['checker_id'],'booking_id'=>$data['qr_pin'],
'checked_time'=>date('Y-m-d H:i:s')));
$res = array('status'=>1,'data'=>$result);
} else {
......
application/models/Validation_app_model.php
......@@ -4,7 +4,8 @@ class Validation_app_model extends CI_Model {
public $validation_array = array(
'login'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),)),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty')),
'language'=>array('required'=>array('code'=>'ER05','message'=>'Language is null or empty'))),
'check_email_availability'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')
),
......@@ -13,16 +14,14 @@ class Validation_app_model extends CI_Model {
),
),
'registration'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')
),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')),
'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone no is null or empty'),
'phone'=>array('code'=>'ER08', 'message'=>'Invalid Phone no'),
),
'name'=>array('required'=>array('code'=>'ER04', 'message'=>'Name is null or empty'),
),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),
)
),
'password'=>array('required'=>array('code'=>'ER04','message'=>'Password is null or empty')),
'password'=>array('required'=>array('code'=>'ER04','message'=>'Password is null or empty'))),
'get_events_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
......
application/models/Webservice_model.php
......@@ -62,6 +62,9 @@ class Webservice_model extends CI_Model {
'is_phone_verified'=>$result->is_phone_verified === 'true'? true: false,
'is_location_updated'=>$result->is_location_updated === 'true'? true: false,
);
$this->db->update('customer',array('language'=>$data['language']),
array('customer_id'=>$result->user_id));
$response = array('user'=>$resultArray,'auth_token'=>$auth_token);
$this->generateAuth($result->user_id,$auth_token);
$res = array('status'=>1,'data'=>$response);
......@@ -369,7 +372,7 @@ class Webservice_model extends CI_Model {
/******************* END PAGINATION *********************/
$result = $this->db->query("SELECT events.seat_pricing,events.custom_seat_layout,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id, events.event_name AS name,events.event_name_ar AS name_ar,`event_gallery`.`media_url` AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees, $cat_field AS category, CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating, venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id ".$case." LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`media_type` = 0 LEFT JOIN booking ON booking.event_id = events.event_id LEFT JOIN event_category ON events.category_id = event_category.cat_id LEFT JOIN review ON review.event_id = events.event_id INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id = ".$user_id." AND favourite.status = 1 WHERE events.status = 1 ".$where." GROUP BY events.event_id LIMIT ". $page_limit.", ".$per_page)->result();
$result = $this->db->query("SELECT events.seat_pricing,events.custom_seat_layout,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id, events.event_name AS name,events.event_name_ar AS name_ar,`event_gallery`.`media_url` AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees, $cat_field AS category, CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating, venue.venue_name, venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id ".$case." LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`media_type` = 0 LEFT JOIN booking ON booking.event_id = events.event_id LEFT JOIN event_category ON events.category_id = event_category.cat_id LEFT JOIN review ON review.event_id = events.event_id INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id = ".$user_id." AND favourite.status = 1 WHERE events.status = 1 ".$where." GROUP BY events.event_id LIMIT ". $page_limit.", ".$per_page)->result();
$response = array();
foreach ($result as $key=>$rs) {
......@@ -393,7 +396,7 @@ class Webservice_model extends CI_Model {
'category'=>$rs->category,
'name'=>($lang == 'en')?$rs->name:$rs->name_ar,
'rating'=>(!empty($rs->rating))?$rs->rating:'0',
'location'=>$rs->location,
'location'=>$rs->venue_name.', '.$rs->location,
'rate'=>$price,
'is_editors_choice'=>$rs->is_editors_choice,
'is_favorite'=>$rs->is_favorite === 'true'? true: false,
......@@ -1391,7 +1394,8 @@ class Webservice_model extends CI_Model {
$data = array('android_version_code'=>$settings['android_version'],
'ios_version_code'=>$settings['ios_version'],
'android_playstore_link'=>$settings['android_playstore_url'],
'ios_playstore_link'=>$settings['ios_playstore_url']);
'ios_playstore_link'=>$settings['ios_playstore_url'],
'is_force_update'=>($settings['force_update'])?true:false);
$res = array('status'=>1,'data'=>$data);
}else {
......
application/views/Booking/viewBooking.php
......@@ -44,7 +44,7 @@
<th width="130px;">Scheduled On</th>
<th width="50px;">Amount</th>
<th width="50px;">Status</th>
<th width="150px;">Action</th>
<th width="40px;">Action</th>
</tr>
</thead>
<tbody>
......@@ -75,9 +75,9 @@
<a class="btn btn-sm btn-info" id="viewBooking" booking_id="<?= encode_param($booking->booking_id) ?>">
<i class="fa fa-fw fa-eye"></i>View
</a>
<a class="btn btn-sm btn-danger" status="2" onclick="confirmDelete(jQuery(this),'Booking/changeStatus',{'booking_id':'<?= encode_param($booking->booking_id) ?>'})">
<!-- <a class="btn btn-sm btn-danger" status="2" onclick="confirmDelete(jQuery(this),'Booking/changeStatus',{'booking_id':'<?= encode_param($booking->booking_id) ?>'})">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
</a> -->
<?php } ?>
</td>
</tr>
......
application/views/Settings/viewSettings.php
......@@ -124,6 +124,10 @@
<label>Android Playstore URL</label>
<input type="text" name="android_playstore_url" class="form-control required" placeholder="Enter Android Playstore URL" value="<?= $data['android_playstore_url'] ?>">
</div>
<div class="form-group col-xs-6">
<label>Force Update App</label>
<input type="text" name="force_update" class="form-control required" placeholder="Force Update App (0/1)" value="<?=$data['force_update']?>" data-parsley-pattern="^[0,1]+$">
</div>
</div>
</div>
<div class="box-footer" style="padding-left:46%">
......
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