diff --git a/application/controllers/Event.php b/application/controllers/Event.php index 6c118b0..aea0a3a 100644 --- a/application/controllers/Event.php +++ b/application/controllers/Event.php @@ -100,6 +100,7 @@ class Event extends CI_Controller { $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?1:0; $_POST['approve_booking'] = (isset($_POST['approve_booking'])&&$_POST['approve_booking']==1)?1:0; + $_POST['directory_listing'] = (isset($_POST['directory_listing'])&&$_POST['directory_listing']==1)?1:0; $_POST['seat_pricing'] = $_POST['custom_seat_layout'] = ''; if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){ @@ -136,6 +137,7 @@ class Event extends CI_Controller { 'max_booking'=>$_POST['max_booking'], 'approve_booking'=>$_POST['approve_booking'], 'has_payment'=>$_POST['has_payment'], + 'directory_listing'=>$_POST['directory_listing'], 'seat_pricing'=>$_POST['seat_pricing'], 'custom_seat_layout'=>$_POST['custom_seat_layout']); $languageArr = array(); @@ -284,6 +286,8 @@ class Event extends CI_Controller { $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment']==1)?'1':'0'; $_POST['approve_booking']=(isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?1:0; + $_POST['directory_listing'] = (isset($_POST['directory_listing'])&&$_POST['directory_listing']==1)?1:0; + $_POST['seat_pricing'] = $_POST['custom_seat_layout'] = ''; if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){ @@ -317,6 +321,7 @@ class Event extends CI_Controller { 'category_id'=>$_POST['category_id'], 'max_booking'=>$_POST['max_booking'], 'has_payment'=>$_POST['has_payment'], + 'directory_listing'=>$_POST['directory_listing'], 'seat_pricing'=>$_POST['seat_pricing'], 'approve_booking'=>$_POST['approve_booking'], 'custom_seat_layout'=>$_POST['custom_seat_layout']); diff --git a/application/controllers/Host.php b/application/controllers/Host.php index c881c41..9d02cf9 100644 --- a/application/controllers/Host.php +++ b/application/controllers/Host.php @@ -58,6 +58,7 @@ class Host extends CI_Controller { $err = 1; $errMsg = 'Provide a Seat Layout Type'; } + $_POST['customer_choice'] = (isset($_POST['customer_choice']) && $_POST['customer_choice'] == 1)?1:0; if($err == 1){ $flashMsg['message'] = $errMsg; @@ -112,6 +113,7 @@ class Host extends CI_Controller { $err = 1; $errMsg = 'Provide a Seat Layout Type'; } + $_POST['customer_choice'] = (isset($_POST['customer_choice']) && $_POST['customer_choice'] == 1)?1:0; if($err == 1){ $flashMsg['message'] = $errMsg; diff --git a/application/models/Webservice_model.php b/application/models/Webservice_model.php index 6dddbbb..ff5f57e 100644 --- a/application/models/Webservice_model.php +++ b/application/models/Webservice_model.php @@ -396,7 +396,7 @@ class Webservice_model extends CI_Model { $this->db->query("SET SESSION group_concat_max_len = 200000"); $result = $this->db->query(" SELECT events.seat_pricing,events.custom_seat_layout,event_category.cat_id,venue.id AS venue_id,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id,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,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, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time, - events.has_payment + events.has_payment,events.directory_listing FROM events INNER JOIN venue ON venue.id = events.venue_id INNER JOIN event_date_time ON events.event_id = event_date_time.event_id @@ -461,7 +461,8 @@ class Webservice_model extends CI_Model { 'latitude'=>$rs->latitude, 'longitude'=>$rs->longitude, 'has_payment'=>$rs->has_payment, - 'currency_symbol'=>$countryData['currency_symbol'] + 'currency_symbol'=>$countryData['currency_symbol'], + 'is_demo'=>$countryData['directory_listing'] ); array_push($response, $resData); } @@ -531,7 +532,8 @@ class Webservice_model extends CI_Model { venue.location_lat AS lat,venue.location_lng AS lng,events.max_booking, GROUP_CONCAT(DISTINCT event_gallery.media_url) AS media_url, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date, - event_date_time.time)) AS date_time + event_date_time.time)) AS date_time, host_categories.customer_choice, + events.directory_listing FROM events INNER JOIN venue ON venue.id=events.venue_id INNER JOIN event_date_time ON events.event_id=event_date_time.event_id @@ -648,6 +650,8 @@ class Webservice_model extends CI_Model { 'address'=>$rs->address, 'longitude'=>$rs->lng, 'currency_symbol'=>$countryData['currency_symbol'], + 'is_demo'=>$rs->directory_listing, + 'is_requestable'=>$rs->customer_choice, 'wallet_balance'=>$waltBlnce ); $res = array('status'=>1,'data'=>$resData); @@ -1961,14 +1965,16 @@ class Webservice_model extends CI_Model { $phNumbers = ''; foreach($data['contacts'] AS $key => $number) { - $number = preg_replace('/\D/', '', $number); - $cond = " AND CUST.enable_chat='1' AND USR.status='1'"; - $eCond = ($key != count($data['contacts'])-1)?') OR ':')'; - $eCond = $cond.$eCond; - if(strlen($number) > 9){ - $phNumbers .= " (CUST.phone LIKE '%".substr($number, strlen($number)-9)."' ".$eCond; - } else { - $phNumbers .= " (CUST.phone LIKE '%".$number."' ".$eCond; + if(strlen($number) > 8){ + $number = preg_replace('/\D/', '', $number); + $cond = " AND CUST.enable_chat='1' AND USR.status='1'"; + $eCond = ($key != count($data['contacts'])-1)?') OR ':')'; + $eCond = $cond.$eCond; + if(strlen($number) > 9){ + $phNumbers .= " (CUST.phone LIKE '%".substr($number, strlen($number)-9)."' ".$eCond; + } else { + $phNumbers .= " (CUST.phone LIKE '%".$number."' ".$eCond; + } } } if(empty($phNumbers)){ return array('status'=>0,'code'=>'919','message'=>'Invalid Data'); } diff --git a/application/views/Event/eventAddForm.php b/application/views/Event/eventAddForm.php index d699fe0..d327fe5 100644 --- a/application/views/Event/eventAddForm.php +++ b/application/views/Event/eventAddForm.php @@ -86,6 +86,21 @@ </div> </div> + <br> + <div class="box-body"> + <div class="col-sm-12"> + <div class="col-sm-6"> + <div class="col-sm-1 padAll-10"> + <input name="directory_listing" type="checkbox" value="1"> + </div> + <div class="col-sm-11"> + <h4>Directory Listing</h4> + </div> + </div> + </div> + </div> + <br> + <?php if($venueData->show_layout == 1 && !empty($venueData->layout_details) && !empty($layoutDtls = json_decode($venueData->layout_details,true))){ ?> diff --git a/application/views/Event/eventEditForm.php b/application/views/Event/eventEditForm.php index e98e984..c2bb26c 100644 --- a/application/views/Event/eventEditForm.php +++ b/application/views/Event/eventEditForm.php @@ -67,6 +67,22 @@ </div> </div> + <br> + <div class="box-body"> + <div class="col-sm-12"> + <div class="col-sm-6"> + <div class="col-sm-1 padAll-10"> + <input name="directory_listing" type="checkbox" value="1" + <?= ($event_data->directory_listing == 1)?'checked':'' ?>> + </div> + <div class="col-sm-11"> + <h4>Directory Listing</h4> + </div> + </div> + </div> + </div> + <br> + <?php if($event_data->show_layout == 1){ ?> <div class="box-header with-border padTop0"> diff --git a/application/views/Event/viewEventDetails.php b/application/views/Event/viewEventDetails.php index 371fbb0..46729c9 100644 --- a/application/views/Event/viewEventDetails.php +++ b/application/views/Event/viewEventDetails.php @@ -32,6 +32,13 @@ <div class="col-sm-6"><p class="truncateText"><?= $seat_pricing['price_details_EN'] ?></p></div> </div> <?php } ?> + <div class="row"> + <div class="col-sm-5">Directory Listing</div> + <div class="col-sm-1"><span>:</span></div> + <div class="col-sm-6"> + <p><strong><?= ($event->directory_listing == 1)?'Enabled':'Disabled' ?></strong></p> + </div> + </div> </div> </div> <div class="col-sm-6"> diff --git a/application/views/Host/hostCategoryForm.php b/application/views/Host/hostCategoryForm.php index 1ff1c17..2bd6e37 100644 --- a/application/views/Host/hostCategoryForm.php +++ b/application/views/Host/hostCategoryForm.php @@ -39,7 +39,7 @@ <span class="glyphicon form-control-feedback"></span> </div> </div> - <div class="col-md-6"> + <div class="col-md-3"> <div class="form-group"> <label>Have Layout</label> <div> @@ -57,6 +57,24 @@ <span class="glyphicon form-control-feedback"></span> </div> </div> + <div class="col-md-3"> + <div class="form-group"> + <label>Customer Choice</label> + <div> + <?php + $dCheck = 'checked'; + if(isset($host_data->customer_choice) && $host_data->customer_choice == 1){ + $dCheck = $host_data->customer_choice; + } + ?> + <input type="radio" name="customer_choice" value="1" <?= ($dCheck == 1)?'checked':'' ?>> + <label class="padAll-10">Yes</label> + <input type="radio" name="customer_choice" value="0" <?= ($dCheck == 0)?'checked':'' ?>> + <label class="padAll-10">No</label> + </div> + <span class="glyphicon form-control-feedback"></span> + </div> + </div> <div class="col-md-12"> <div class="box-footer textCenterAlign"> <button type="submit" class="btn btn-primary">Submit</button>