Skip to content

T
TimeOutAdmin
Commit 661b0b46 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !27
parents 6b91a11c 73d6668f
Showing with 191 additions and 71 deletions
application/controllers/Category.php
...@@ -58,11 +58,16 @@ class Category extends CI_Controller { ...@@ -58,11 +58,16 @@ class Category extends CI_Controller {
!isset($_FILES['category_image']) || empty($_FILES['category_image']))){ !isset($_FILES['category_image']) || empty($_FILES['category_image']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Icon'; $errMsg = 'Provide a Category Icon';
} else if($err == 0 && (!isset($_FILES) || empty($_FILES) ||
!isset($_FILES['category_image_mob']) || empty($_FILES['category_image_mob']))){
$err = 1;
$errMsg = 'Provide a Mobile Category Icon';
} }
if($err == 0){ if($err == 0){
$config = set_upload_service("assets/uploads/services");
$this->load->library('upload'); $this->load->library('upload');
$config = set_upload_service("assets/uploads/services");
$config['file_name'] = time()."_".$_FILES['category_image']['name']; $config['file_name'] = time()."_".$_FILES['category_image']['name'];
$this->upload->initialize($config); $this->upload->initialize($config);
if(!$this->upload->do_upload('category_image')){ if(!$this->upload->do_upload('category_image')){
...@@ -72,8 +77,18 @@ class Category extends CI_Controller { ...@@ -72,8 +77,18 @@ class Category extends CI_Controller {
$upload_data = $this->upload->data(); $upload_data = $this->upload->data();
$_POST['category_image'] = $config['upload_path']."/".$upload_data['file_name']; $_POST['category_image'] = $config['upload_path']."/".$upload_data['file_name'];
} }
$config['file_name'] = time()."_".$_FILES['category_image_mob']['name'];
$this->upload->initialize($config);
if(!$this->upload->do_upload('category_image_mob')){
$err = 1;
$errMsg = $this->upload->display_errors();
}else{
$upload_data = $this->upload->data();
$_POST['category_image_mob'] = $config['upload_path']."/".$upload_data['file_name'];
}
} }
if($err == 1){ if($err == 1){
$flashMsg['message'] = $errMsg; $flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
...@@ -132,14 +147,22 @@ class Category extends CI_Controller { ...@@ -132,14 +147,22 @@ class Category extends CI_Controller {
} }
if($err == 0){ if($err == 0){
$config = set_upload_service("assets/uploads/services");
$this->load->library('upload'); $this->load->library('upload');
$config = set_upload_service("assets/uploads/services");
$config['file_name'] = time()."_".$_FILES['category_image']['name']; $config['file_name'] = time()."_".$_FILES['category_image']['name'];
$this->upload->initialize($config); $this->upload->initialize($config);
if($this->upload->do_upload('category_image')){ if($this->upload->do_upload('category_image')){
$upload_data = $this->upload->data(); $upload_data = $this->upload->data();
$_POST['category_image'] = $config['upload_path']."/".$upload_data['file_name']; $_POST['category_image'] = $config['upload_path']."/".$upload_data['file_name'];
} }
$config['file_name'] = time()."_".$_FILES['category_image_mob']['name'];
$this->upload->initialize($config);
if($this->upload->do_upload('category_image_mob')){
$upload_data = $this->upload->data();
$_POST['category_image_mob'] = $config['upload_path']."/".$upload_data['file_name'];
}
} }
if($err == 1){ if($err == 1){
......
application/controllers/Checker.php
...@@ -98,9 +98,30 @@ class Checker extends CI_Controller { ...@@ -98,9 +98,30 @@ class Checker extends CI_Controller {
redirect(base_url('Checker/viewCheckers')); redirect(base_url('Checker/viewCheckers'));
} }
$checker_id = decode_param($checker_id); $checker_id = decode_param($checker_id);
$status = $this->Checker_model->changeStatus($checker_id,$status); $resp = $this->Checker_model->changeStatus($checker_id,$status);
if(!$status){ if(!$resp){
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
} else {
if($status == 1){
$this->load->model('Api_model');
$checkerData = $this->db->get_where('checker',array('id'=>$checker_id))->row();
if(!empty($checkerData)){
$subject = "Your Checker Account is now activated";
$email_id = $checkerData->username;
$template = getNotifTemplate();
$message .= "<html>
<body>
Your Checker Account for the username
<strong>".$checkerData->username."</strong> is now activated.<br>
".$template['checker_activation_mail']."
</body>
</html>";
$this->Api_model->send_mail($subject,$email_id,$message);
}
}
} }
redirect(base_url('Checker/viewCheckers')); redirect(base_url('Checker/viewCheckers'));
} }
......
application/controllers/Event.php
...@@ -51,6 +51,9 @@ class Event extends CI_Controller { ...@@ -51,6 +51,9 @@ class Event extends CI_Controller {
} }
function createEvent(){ function createEvent(){
ini_set("memory_limit", "-1");
set_time_limit(0);
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error'); $flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST)){ if(!isset($_POST) || empty($_POST)){
...@@ -214,6 +217,9 @@ class Event extends CI_Controller { ...@@ -214,6 +217,9 @@ class Event extends CI_Controller {
} }
function updateEvent($event_id=''){ function updateEvent($event_id=''){
ini_set("memory_limit", "-1");
set_time_limit(0);
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error'); $flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($event_id) || empty($event_id = decode_param($event_id)) || if(empty($event_id) || empty($event_id = decode_param($event_id)) ||
......
application/controllers/Provider.php
...@@ -60,9 +60,28 @@ class Provider extends CI_Controller { ...@@ -60,9 +60,28 @@ class Provider extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Provider/viewProviders')); redirect(base_url('Provider/viewProviders'));
} }
$status = $this->Provider_model->changeStatus($provider_id,$status); $resp = $this->Provider_model->changeStatus($provider_id,$status);
if(!$status){ if(!$resp){
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
} else {
if($status == 1){
$this->load->model('Api_model');
$providerData = $this->Provider_model->getProviderData($provider_id,'0,1');
$subject = "Your Organizer Account is now activated";
$email_id = $providerData->email;
$template = getNotifTemplate();
$message .= "<html>
<body>
Your Organizer Account for the username
<strong>".$providerData->username."</strong> is now activated.<br>
".$template['provider_activation_mail']."
</body>
</html>";
$this->Api_model->send_mail($subject,$email_id,$message);
}
} }
redirect(base_url('Provider/viewProviders')); redirect(base_url('Provider/viewProviders'));
} }
......
application/models/Api_model.php
...@@ -65,17 +65,24 @@ class Api_model extends CI_Model { ...@@ -65,17 +65,24 @@ class Api_model extends CI_Model {
$data['phone'] = '966'.$data['phone']; $data['phone'] = '966'.$data['phone'];
} }
$customer_data = array( $customer_data = array('customer_id'=>$id,'phone'=>$data['phone'],
'customer_id'=>$id, 'email'=>$data['email_id'],'name'=>$data['name']);
'phone'=>$data['phone'],
'email'=>$data['email_id'],
'name'=>$data['name']
);
$this->db->insert('customer', $customer_data); $this->db->insert('customer', $customer_data);
$subject = "New account created successfully"; $subject = "New account created successfully";
$email_id = $data['email_id']; $email_id = $data['email_id'];
$message = "Hi,\n\r Welcome to TimeOut.\r\n Please use username: ".$email_id." and Password: ".$temp_password." for access your account";
$template = getNotifTemplate();
$message .= "<html>
<body>
Hi,\n\r Welcome to TimeOut. \r\n Please use username:
".$email_id." and Password: ".$temp_password."
for access your account <br>
".$template['registration_mail']."
</body>
</html>";
$this->send_mail($subject,$email_id,$message); $this->send_mail($subject,$email_id,$message);
$this->db->select('customer.name,customer.dob,customer.phone,customer.email,customer.profile_image AS image,customer.gender,users.id AS userId, customer.city,customer.dob'); $this->db->select('customer.name,customer.dob,customer.phone,customer.email,customer.profile_image AS image,customer.gender,users.id AS userId, customer.city,customer.dob');
$this->db->where('users.id',$id); $this->db->where('users.id',$id);
...@@ -117,7 +124,8 @@ class Api_model extends CI_Model { ...@@ -117,7 +124,8 @@ class Api_model extends CI_Model {
$ci->email->cc('[email protected]'); $ci->email->cc('[email protected]');
$ci->email->subject($subject); $ci->email->subject($subject);
$ci->email->message($message); $ci->email->message($message);
if($attach!=null) { $ci->email->set_mailtype('html');
if($attach != null) {
$ci->email->attach($attach); $ci->email->attach($attach);
} }
return $ci->email->send(); return $ci->email->send();
...@@ -130,10 +138,17 @@ class Api_model extends CI_Model { ...@@ -130,10 +138,17 @@ class Api_model extends CI_Model {
$unique_id = uniqid().time(); $unique_id = uniqid().time();
$this->db->where('email',$data['email_id'])->update('customer',array('reset_key'=>$unique_id)); $this->db->where('email',$data['email_id'])->update('customer',array('reset_key'=>$unique_id));
$subject = "TimeOut: Forgot Password"; $subject = "TimeOut: Forgot Password";
// $baseUrl = "http://localhost:4200/"; $url = 'https://projects.nuvento.com/forgot/?reset_key='.$unique_id;
$baseUrl = "https://projects.nuvento.com/";
$url = $baseUrl.'forgot/?reset_key='.$unique_id; $template = getNotifTemplate();
$message = "Please use mentioned link for reset your password: ".$url; $message = "<html>
<body>
<p>Please use mentioned link for reset your password: ".$url."</p>
<br>
".$template['forgot_mail']."
</body>
</html>";
$email = $data['email_id']; $email = $data['email_id'];
$result = $this->send_mail($subject,$email,$message); $result = $this->send_mail($subject,$email,$message);
if($result){ if($result){
......
application/models/Event_model.php
...@@ -185,8 +185,14 @@ class Event_model extends CI_Model { ...@@ -185,8 +185,14 @@ class Event_model extends CI_Model {
if(!empty($eventData)){ if(!empty($eventData)){
$status = $this->db->insert_batch('event_gallery',$eventData); $status = $this->db->insert_batch('event_gallery',$eventData);
} }
return $status; $primaryImg = $this->db->get_where('event_gallery',array('event_id'=>$event_id,'media_type'=>'0'));
if(empty($primaryImg) || ($primaryImg->num_rows() <= 0)){
$this->db->query("UPDATE `event_gallery`
SET `media_type`=0
WHERE `event_id`='".$event_id."' ORDER BY id LIMIT 1");
}
return $status;
} }
public function updateEvents($event_id = '', $eventData = array()){ public function updateEvents($event_id = '', $eventData = array()){
......
application/models/Provider_model.php
...@@ -10,17 +10,17 @@ class Provider_model extends CI_Model { ...@@ -10,17 +10,17 @@ class Provider_model extends CI_Model {
return 0; return 0;
$userNameChk = $this->db->query("SELECT * FROM users $userNameChk = $this->db->query("SELECT * FROM users
WHERE status!='2' AND username='".$provider_data['username']."'"); WHERE user_type='2' AND status!='2' AND username='".$provider_data['username']."'");
if(!empty($userNameChk) && $userNameChk->num_rows() > 0) return 4; if(!empty($userNameChk) && $userNameChk->num_rows() > 0) return 4;
$emailChk = $this->db->query("SELECT * FROM provider AS PRV $emailChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id) INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.status!='2' AND PRV.email='".$provider_data['email']."'"); WHERE USR.user_type='2' AND USR.status!='2' AND PRV.email='".$provider_data['email']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0) return 2; if(!empty($emailChk) && $emailChk->num_rows() > 0) return 2;
$phoneChk = $this->db->query("SELECT * FROM provider AS PRV $phoneChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id) INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.status!='2' AND PRV.phone='".$provider_data['phone']."'"); WHERE USR.user_type='2' AND USR.status!='2' AND PRV.phone='".$provider_data['phone']."'");
if(!empty($phoneChk) && $phoneChk->num_rows() > 0) return 3; if(!empty($phoneChk) && $phoneChk->num_rows() > 0) return 3;
$status = $this->db->insert('users', $status = $this->db->insert('users',
...@@ -65,19 +65,19 @@ class Provider_model extends CI_Model { ...@@ -65,19 +65,19 @@ class Provider_model extends CI_Model {
return 0; return 0;
$userIdChk = $this->db->query("SELECT * FROM provider AS PRV $userIdChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id = PRV.provider_id) INNER JOIN users AS USR ON (USR.id = PRV.provider_id)
WHERE USR.status!='2' AND USR.id!='".$provider_id."' AND WHERE USR.user_type='2' AND USR.status!='2' AND USR.id!='".$provider_id."' AND
USR.username='".$provider_data['username']."'"); USR.username='".$provider_data['username']."'");
if(!empty($userIdChk) && $userIdChk->num_rows() > 0) { return 4; } if(!empty($userIdChk) && $userIdChk->num_rows() > 0) { return 4; }
$emailChk = $this->db->query("SELECT * FROM provider AS PRV $emailChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id = PRV.provider_id) INNER JOIN users AS USR ON (USR.id = PRV.provider_id)
WHERE USR.status!='2' AND USR.id!='".$provider_id."' AND WHERE USR.user_type='2' AND USR.status!='2' AND USR.id!='".$provider_id."' AND
PRV.email='".$provider_data['email']."'"); PRV.email='".$provider_data['email']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0) { return 2; } if(!empty($emailChk) && $emailChk->num_rows() > 0) { return 2; }
$phoneChk = $this->db->query("SELECT * FROM provider AS PRV $phoneChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id = PRV.provider_id) INNER JOIN users AS USR ON (USR.id = PRV.provider_id)
WHERE USR.status!='2' AND USR.id!='".$provider_id."' AND WHERE USR.user_type='2' AND USR.status!='2' AND USR.id!='".$provider_id."' AND
PRV.phone='".$provider_data['phone']."'"); PRV.phone='".$provider_data['phone']."'");
if(!empty($phoneChk) && $phoneChk->num_rows() > 0) { return 3; } if(!empty($phoneChk) && $phoneChk->num_rows() > 0) { return 3; }
......
application/models/Webservice_model.php
...@@ -145,7 +145,7 @@ class Webservice_model extends CI_Model { ...@@ -145,7 +145,7 @@ class Webservice_model extends CI_Model {
$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) {
$settingsDetails = $this->db->query("SELECT faq_en AS faq,contact_number FROM privacy_policy")->row_array(); $settingsDetails = $this->db->query("SELECT faq_en AS faq,contact_number FROM privacy_policy")->row_array();
$userDetails = $this->db->query("SELECT customer.name AS name, customer.profile_image AS profile_photo,(CASE customer.gender WHEN 1 THEN '0' WHEN 2 THEN '1' ELSE '3' END) AS gender, customer.email, customer.dob, customer.city AS city_name, users.notification_status, users.email_status FROM customer INNER JOIN users ON users.id = customer.customer_id WHERE customer.customer_id = ".$user_id." AND users.status = 1 ")->row_array(); $userDetails = $this->db->query("SELECT customer.name AS name, customer.profile_image AS profile_photo,customer.gender AS gender, customer.email, customer.dob, customer.city AS city_name, users.notification_status, users.email_status FROM customer INNER JOIN users ON users.id = customer.customer_id WHERE customer.customer_id = ".$user_id." AND users.status = 1 ")->row_array();
if(count($settingsDetails)>0 && count($userDetails)){ if(count($settingsDetails)>0 && count($userDetails)){
$resultData = array(); $resultData = array();
$resultData = array_merge($settingsDetails, $userDetails); $resultData = array_merge($settingsDetails, $userDetails);
...@@ -166,7 +166,7 @@ class Webservice_model extends CI_Model { ...@@ -166,7 +166,7 @@ class Webservice_model extends CI_Model {
function discover($data) { function discover($data) {
try { try {
$per_page = 10; $per_page = 4;
$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) {
$where = ''; $where = '';
...@@ -214,9 +214,12 @@ class Webservice_model extends CI_Model { ...@@ -214,9 +214,12 @@ class Webservice_model extends CI_Model {
if(isset($data['filters'])){ if(isset($data['filters'])){
$filtersElement = json_decode($data['filters'], true); $filtersElement = json_decode($data['filters'], true);
$locality_id = $filtersElement['cities']; $locality_id_Array = $filtersElement['cities'];
$dateId = $filtersElement['date']; $locality_id = preg_replace("/[^a-zA-Z 0-9]+/", "", $locality_id_Array);
$categoryId = $filtersElement['category']; $dateId_Array = $filtersElement['date'];
$dateId = preg_replace("/[^a-zA-Z 0-9]+/", "", $dateId_Array);
$categoryId_Array = $filtersElement['category'];
$categoryId = preg_replace("/[^a-zA-Z 0-9]+/", "", $categoryId_Array);
if($categoryId!=''){ if($categoryId!=''){
$where = ' AND events.category_id='.$categoryId; $where = ' AND events.category_id='.$categoryId;
...@@ -310,7 +313,7 @@ class Webservice_model extends CI_Model { ...@@ -310,7 +313,7 @@ class Webservice_model extends CI_Model {
'location'=>$rs->location, 'location'=>$rs->location,
'rate'=>$price, 'rate'=>$price,
'is_editors_choice'=>$rs->is_editors_choice, 'is_editors_choice'=>$rs->is_editors_choice,
'is_favorite'=>$rs->is_favorite, 'is_favorite'=>$rs->is_favorite === 'true'? true: false,
'latitude'=>$rs->latitude, 'latitude'=>$rs->latitude,
'longitude'=>$rs->longitude 'longitude'=>$rs->longitude
...@@ -376,7 +379,7 @@ class Webservice_model extends CI_Model { ...@@ -376,7 +379,7 @@ class Webservice_model extends CI_Model {
if($user_id > 0) { if($user_id > 0) {
$event_id = $data['event_id']; $event_id = $data['event_id'];
$this->db->query("SET SESSION group_concat_max_len = 20000"); $this->db->query("SET SESSION group_concat_max_len = 20000");
$rs = $this->db->query("SELECT IF(favourite.is_favorite = 0,'false','true') AS is_favorite,events.event_id, AVG(review.rate) AS rate, MAX(booking.id) AS attendees, events.event_name,events.event_discription AS event_description,events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,venue.venue_name,venue.venue_details,venue.location,venue.location_lat AS lat,venue.location_lng AS lng,venue.venue_name AS address_name,venue.location AS address, GROUP_CONCAT(DISTINCT `event_gallery`.`media_url`) AS media_url,IF(favourite.status = 1,'true','false') AS fav_status, GROUP_CONCAT(DISTINCT tags.tag_name) AS tag, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time, events.max_booking FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`status` != 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 LEFT JOIN review ON events.event_id = review.event_id WHERE events.event_id = ".$event_id." GROUP BY events.event_id, event_date_time.event_id")->row(); $rs = $this->db->query("SELECT IF(host_categories.show_layout = 0,'false','true') AS is_layout,IF(events.has_payment = 0,'false','true') AS is_payment_required,IF(favourite.is_favorite = 1,'true','false') AS is_favorite,events.event_id, AVG(review.rate) AS rate, MAX(booking.id) AS attendees, events.event_name,events.event_discription AS event_description,events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,venue.venue_name,venue.venue_details,venue.location,venue.location_lat AS lat,venue.location_lng AS lng,venue.venue_name AS address_name,venue.location AS address, GROUP_CONCAT(DISTINCT `event_gallery`.`media_url`) AS media_url,IF(favourite.status = 1,'true','false') AS fav_status, GROUP_CONCAT(DISTINCT tags.tag_name) AS tag, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time, events.max_booking FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`status` != 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 LEFT JOIN review ON events.event_id = review.event_id INNER JOIN host_categories ON venue.host_cat_id = host_categories.host_cat_id WHERE events.event_id = ".$event_id." GROUP BY events.event_id, event_date_time.event_id")->row();
if(count($rs)>0){ if(count($rs)>0){
$resultData = array(); $resultData = array();
$event_layout = ''; $event_layout = '';
...@@ -460,6 +463,8 @@ class Webservice_model extends CI_Model { ...@@ -460,6 +463,8 @@ class Webservice_model extends CI_Model {
'total_attendees'=>$rs->attendees == ''? '0': $rs->attendees, 'total_attendees'=>$rs->attendees == ''? '0': $rs->attendees,
'layout_image'=>$rs->layout, 'layout_image'=>$rs->layout,
'is_favorite'=>$rs->is_favorite === 'true'? true: false, 'is_favorite'=>$rs->is_favorite === 'true'? true: false,
'is_payment_required'=>$rs->is_payment_required === 'true'? true: false,
'is_layout'=>$rs->is_layout === 'true'? true: false,
'photos'=>$media_url, 'photos'=>$media_url,
'time'=>$time_spec[0]['time'], 'time'=>$time_spec[0]['time'],
'date'=>$time_spec[0]['date'], 'date'=>$time_spec[0]['date'],
...@@ -554,17 +559,21 @@ class Webservice_model extends CI_Model { ...@@ -554,17 +559,21 @@ class Webservice_model extends CI_Model {
function add_favorites($data) { function add_favorites($data) {
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) {
$res_count = $this->db->where('event_id',$data['event_id'])->where('user_id',$user_id)->get('favourite')->result(); $res_count = $this->db->where('event_id',$data['event_id'])->where('user_id',$user_id)->get('favourite')->num_rows();
$favoriteList = array('user_id'=>$user_id, 'event_id'=>$data['event_id'], 'is_favorite'=>$data['is_favorite']); $favoriteList = array('user_id'=>$user_id, 'event_id'=>$data['event_id'], 'is_favorite'=>$data['is_favorite']);
if($res_count > 0) {
if(count($res_count) > 0) { $data=array('event_id'=>$data['event_id'], 'is_favorite'=>$data['is_favorite']);
$this->db->where('user_id',$user_id);
$id = $this->db->update('favourite',$favoriteList); $this->db->where('event_id',$data['event_id']);
$id = $this->db->update('favourite',$data);
}else{ }else{
...@@ -881,7 +890,7 @@ class Webservice_model extends CI_Model { ...@@ -881,7 +890,7 @@ class Webservice_model extends CI_Model {
'events.status'=>1 'events.status'=>1
); );
$result = $this->db->select("events.event_id,event_gallery.media_url,COUNT(booking.id) AS attendees, $result = $this->db->select("events.event_id,event_gallery.media_url,COUNT(booking.id) AS attendees,
event_category.category,events.event_name,AVG(review.rate) AS rating,venue.location,IF(favourite.is_favorite = 0,'false','true') AS is_favorite,IF(events.provider_id = 0,'false','true') AS is_editors_choice,events.seat_pricing,events.custom_seat_layout,venue.layout,venue.layout_details")->where($where)->from('favourite')->join('review', 'review.event_id = favourite.event_id','LEFT')->join('events', 'events.event_id = favourite.event_id')->join('booking', 'booking.event_id = events.event_id')->join('venue', 'venue.id = events.venue_id')->join('event_category', 'events.category_id = event_category.cat_id')->join('event_gallery', 'events.event_id = event_gallery.event_id AND event_gallery.media_type = 0', 'LEFT')->group_by('events.event_id')->get()->result(); event_category.category,events.event_name,AVG(review.rate) AS rating,venue.location,IF(favourite.is_favorite = 0,'false','true') AS is_favorite,IF(events.provider_id = 0,'false','true') AS is_editors_choice,events.seat_pricing,events.custom_seat_layout,venue.layout,venue.layout_details")->where($where)->from('favourite')->join('review', 'review.event_id = favourite.event_id','LEFT')->join('events', 'events.event_id = favourite.event_id')->join('booking', 'booking.event_id = events.event_id','LEFT')->join('venue', 'venue.id = events.venue_id')->join('event_category', 'events.category_id = event_category.cat_id')->join('event_gallery', 'events.event_id = event_gallery.event_id AND event_gallery.media_type = 0', 'LEFT')->group_by('events.event_id')->get()->result();
if(count($result)>0){ if(count($result)>0){
...@@ -934,7 +943,7 @@ class Webservice_model extends CI_Model { ...@@ -934,7 +943,7 @@ class Webservice_model extends CI_Model {
function bookedlist($data) { function bookedlist($data) {
try { try {
$per_page = 10; $per_page = 4;
$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) {
$count = $this->db->select('booking.id')->where('booking.customer_id',$user_id)->get('booking')->num_rows(); $count = $this->db->select('booking.id')->where('booking.customer_id',$user_id)->get('booking')->num_rows();
......
application/views/Category/categoryAddForm.php
...@@ -30,34 +30,55 @@ ...@@ -30,34 +30,55 @@
<div class="box-body"> <div class="box-body">
<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-6"> <div class="col-md-12">
<div class="form-group"> <div class="col-md-6">
<label>Category Name</label> <div class="form-group">
<input type="text" class="form-control required" data-parsley-trigger="change" <label>Category Name</label>
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" <input type="text" class="form-control required" data-parsley-trigger="change"
name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>"placeholder="Category Name"> data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$"
<span class="glyphicon form-control-feedback"></span> name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>"placeholder="Category Name">
<span class="glyphicon form-control-feedback"></span>
</div>
</div> </div>
<div class="form-group"> <div class="col-md-6">
<label>Category Description</label> <div class="form-group">
<input type="text" class="form-control required" data-parsley-trigger="change" <label>Category Icon Web</label>
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" <div class="col-md-12" style="padding-bottom:10px;">
name="category_description" required placeholder="Category Description" <div class="col-md-3">
value="<?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?>" > <img id="image_id" src="<?= (isset($categoryData->category_image))?base_url($categoryData->category_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
<span class="glyphicon form-control-feedback"></span> </div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="category_image" type="file" accept="image/*" onchange="setImg(this,'image_id');" />
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-12">
<div class="form-group"> <div class="col-md-6">
<label>Category Icon</label> <div class="form-group">
<div class="col-md-12" style="padding-bottom:10px;"> <label>Category Description</label>
<div class="col-md-3"> <input type="text" class="form-control required" data-parsley-trigger="change"
<img id="image_id" src="<?= (isset($categoryData->category_image))?base_url($categoryData->category_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" /> data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$"
</div> name="category_description" required placeholder="Category Description"
<div class="col-md-9" style="padding-top: 25px;"> value="<?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?>" >
<input name="category_image" type="file" accept="image/*" onchange="setImg(this,'image_id');" /> <span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Category Icon Mobile</label>
<div class="col-md-12" style="padding-bottom:10px;">
<div class="col-md-3">
<img id="category_image_mob" src="<?= (isset($categoryData->category_image_mob))?base_url($categoryData->category_image_mob):'' ?>" 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_image_mob" type="file" accept="image/*" onchange="setImg(this,'category_image_mob');" />
</div>
</div> </div>
</div> </div>
</div> </div>
......
application/views/Checker/checkerAddForm.php
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>User Name</label> <label>User Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="username" required="" placeholder="User Name"> data-parsley-minlength="2" required="" name="username" placeholder="User Name">
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
......
application/views/Provider/viewProvider.php
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="150px;">Organizer Name</th> <th width="150px;">Organizer Name</th>
<th width="150px;">User Name</th> <th width="120px;">User Name</th>
<th width="150px;">Email_id</th> <th width="130px;">Email_id</th>
<th width="100px;">Phone</th> <th width="80px;">Phone</th>
<th width="100px;">Status</th> <th width="60px;">Status</th>
<th width="500px;">Action</th> <th width="500px;">Action</th>
</tr> </tr>
</thead> </thead>
......
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