Skip to content

T
TimeOutAdmin
Commit 91865518 by Tobin
Options

dc

parent eb0c9bb3
Showing with 63 additions and 29 deletions
application/controllers/Category.php
...@@ -67,9 +67,13 @@ class Category extends CI_Controller { ...@@ -67,9 +67,13 @@ class Category extends CI_Controller {
$err = 1; $err = 1;
$errMsg = 'Provide a Category Icon'; $errMsg = 'Provide a Category Icon';
} else if($err == 0 && (!isset($_FILES) || empty($_FILES) || } else if($err == 0 && (!isset($_FILES) || empty($_FILES) ||
!isset($_FILES['category_image_ar']) || empty($_FILES['category_image_ar']))){ !isset($_FILES['category_image_ar'])||empty($_FILES['category_image_ar']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Mobile Category Icon'; $errMsg = 'Provide a Mobile Category Icon';
} else if($err == 0 && (!isset($_FILES) || empty($_FILES) ||
!isset($_FILES['category_banner'])||empty($_FILES['category_banner']))){
$err = 1;
$errMsg = 'Provide a Category Banner Image';
} }
if($err == 0){ if($err == 0){
...@@ -95,6 +99,16 @@ class Category extends CI_Controller { ...@@ -95,6 +99,16 @@ class Category extends CI_Controller {
$upload_data = $this->upload->data(); $upload_data = $this->upload->data();
$_POST['category_image_ar'] = $config['upload_path']."/".$upload_data['file_name']; $_POST['category_image_ar'] = $config['upload_path']."/".$upload_data['file_name'];
} }
$config['file_name'] = time()."_".$_FILES['category_banner']['name'];
$this->upload->initialize($config);
if(!$this->upload->do_upload('category_banner')){
$err = 1;
$errMsg = $this->upload->display_errors();
}else{
$upload_data = $this->upload->data();
$_POST['category_banner'] = $config['upload_path']."/".$upload_data['file_name'];
}
} }
if($err == 1){ if($err == 1){
...@@ -174,6 +188,13 @@ class Category extends CI_Controller { ...@@ -174,6 +188,13 @@ class Category extends CI_Controller {
$upload_data = $this->upload->data(); $upload_data = $this->upload->data();
$_POST['category_image_ar'] = $config['upload_path']."/".$upload_data['file_name']; $_POST['category_image_ar'] = $config['upload_path']."/".$upload_data['file_name'];
} }
$config['file_name'] = time()."_".$_FILES['category_banner']['name'];
$this->upload->initialize($config);
if($this->upload->do_upload('category_banner')){
$upload_data = $this->upload->data();
$_POST['category_banner'] = $config['upload_path']."/".$upload_data['file_name'];
}
} }
if($err == 1){ if($err == 1){
......
application/models/Api_model.php
...@@ -199,7 +199,9 @@ class Api_model extends CI_Model { ...@@ -199,7 +199,9 @@ class Api_model extends CI_Model {
function category() { function category() {
try { try {
$rs = $this->db->select('cat_id,category,category_ar,category_description,category_image,category_image_ar')->where('status',1)->get('event_category')->result(); $rs = $this->db->select('cat_id,category,category_ar,category_description,
category_image,category_image_ar,category_banner')
->where('status',1)->get('event_category')->result();
if(count($rs) > 0) { if(count($rs) > 0) {
$res = array('status'=>1,'data'=>$rs); $res = array('status'=>1,'data'=>$rs);
} else { } else {
......
application/models/Webservice_model.php
...@@ -347,22 +347,31 @@ class Webservice_model extends CI_Model { ...@@ -347,22 +347,31 @@ class Webservice_model extends CI_Model {
/******************* END PAGINATION *********************/ /******************* END PAGINATION *********************/
$result = $this->db->query("SELECT events.seat_pricing,venue.location_lat AS latitude,venue.location_lng AS longitude,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.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(); $response = array();
$lang = $this->getUserLang($user_id); $lang = $this->getUserLang($user_id);
foreach ($result as $key=>$rs) { foreach ($result as $key=>$rs) {
if($rs->layout!=''){
$pricelist = json_decode($rs->seat_pricing, TRUE); if($rs->custom_seat_layout!=''){
$price = $pricelist['price']; $pricelist = json_decode($rs->custom_seat_layout, TRUE);
$price = min(array_column($pricelist, 'price'));
} else {
$pricelist = json_decode($rs->layout_details, TRUE);
$price = min(array_column($pricelist, 'price'));
}
} else {
$pricelist = json_decode($rs->seat_pricing, TRUE);
$price = $pricelist['price'];
}
$resData = array( $resData = array(
'id' => "$key", 'id' => "$key",
'event_id'=>$rs->event_id, 'event_id'=>$rs->event_id,
'image'=>$rs->image, 'image'=>$rs->image,
'attendees'=>$rs->attendees, 'attendees'=>(!empty($rs->attendees))?$rs->attendees:'0',
'category'=>$rs->category, 'category'=>$rs->category,
'name'=>($lang == 'en')?$rs->name:$rs->name_ar, 'name'=>($lang == 'en')?$rs->name:$rs->name_ar,
'rating'=>$rs->rating, 'rating'=>(!empty($rs->rating))?$rs->rating:'0',
'location'=>$rs->location, 'location'=>$rs->location,
'rate'=>$price, 'rate'=>$price,
'is_editors_choice'=>$rs->is_editors_choice, 'is_editors_choice'=>$rs->is_editors_choice,
...@@ -1250,11 +1259,12 @@ class Webservice_model extends CI_Model { ...@@ -1250,11 +1259,12 @@ class Webservice_model extends CI_Model {
try { try {
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$cat_feild = '';
$lang = $this->getUserLang($user_id); $lang = $this->getUserLang($user_id);
if($lang == 'en'){ if($lang == 'en'){
$cat_feild = 'events.event_name AS event_name'; $cat_field = 'events.event_name AS event_name';
}else{ }else{
$cat_feild = 'events.event_name_ar AS event_name'; $cat_field = 'events.event_name_ar AS event_name';
} }
$result = $this->db->query("SELECT IF(review.event_id = '','false','true') AS is_last_booking_rated, booking.id AS booking_id, events.event_id AS event_id,$cat_field, `event_gallery`.`media_url` AS event_image,UNIX_TIMESTAMP(event_date_time.date) AS date, booking.amount AS amount FROM events 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 RIGHT JOIN event_date_time ON event_date_time.id = booking.event_date_id LEFT JOIN venue ON venue.id = events.venue_id LEFT JOIN customer ON customer.customer_id = booking.customer_id LEFT JOIN review ON review.event_id = booking.event_id WHERE booking.customer_id = ".$user_id." ORDER BY booking.id DESC LIMIT 1")->row_array(); $result = $this->db->query("SELECT IF(review.event_id = '','false','true') AS is_last_booking_rated, booking.id AS booking_id, events.event_id AS event_id,$cat_field, `event_gallery`.`media_url` AS event_image,UNIX_TIMESTAMP(event_date_time.date) AS date, booking.amount AS amount FROM events 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 RIGHT JOIN event_date_time ON event_date_time.id = booking.event_date_id LEFT JOIN venue ON venue.id = events.venue_id LEFT JOIN customer ON customer.customer_id = booking.customer_id LEFT JOIN review ON review.event_id = booking.event_id WHERE booking.customer_id = ".$user_id." ORDER BY booking.id DESC LIMIT 1")->row_array();
if(count($result)>0){ if(count($result)>0){
......
application/views/Category/categoryAddForm.php
...@@ -31,23 +31,27 @@ ...@@ -31,23 +31,27 @@
<form role="form" action="<?= base_url($url) ?>" method="post" <form role="form" action="<?= base_url($url) ?>" method="post"
class="validate" data-parsley-validate="" enctype="multipart/form-data"> class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Category Name (English)</label> <label>Category Name (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$"
name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>" placeholder="Category Name"> name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>" placeholder="Category Name (English)">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div>
<div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label>Category Name (Arabic)</label> <label>Category Name (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="category_ar" required placeholder="Category Name" data-parsley-minlength="2" name="category_ar" required placeholder="Category Name (Arabic)"
value="<?= (isset($categoryData->category_ar))?$categoryData->category_ar:''?>"> value="<?= (isset($categoryData->category_ar))?$categoryData->category_ar:''?>">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group">
<label>Category Description</label>
<textarea type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="category_description" required placeholder="Category Description" style="height:150px;"><?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -62,20 +66,6 @@ ...@@ -62,20 +66,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label>Category Description</label>
<textarea type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="category_description" required placeholder="Category Description" style="height:76px;"><?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Category Icon (Arabic)</label> <label>Category Icon (Arabic)</label>
<div class="col-md-12" style="padding-bottom:10px;"> <div class="col-md-12" style="padding-bottom:10px;">
...@@ -87,6 +77,17 @@ ...@@ -87,6 +77,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label>Category Banner Image</label>
<div class="col-md-12" style="padding-bottom:10px;">
<div class="col-md-3">
<img id="category_banner_image" src="<?= (isset($categoryData->category_banner))?base_url($categoryData->category_banner):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="category_banner" type="file" accept="image/*" onchange="setImg(this,'category_banner_image');" />
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
......
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