Commit f805fac4 by Tobin

dc

parent 10a8a4bd
...@@ -122,7 +122,7 @@ class Notification extends CI_Controller { ...@@ -122,7 +122,7 @@ class Notification extends CI_Controller {
foreach($users AS $user){ foreach($users AS $user){
$userData = array('id'=>$event_data->event_id, $userData = array('id'=>$event_data->event_id,
'title'=>$event_data->event_name_en, 'title'=>$event_data->event_name_EN,
'message'=>$message); 'message'=>$message);
$this->push_sent_cancel('1',$user['fcm_token'],$userData); $this->push_sent_cancel('1',$user['fcm_token'],$userData);
} }
......
...@@ -98,18 +98,17 @@ class Webservice extends CI_Controller { ...@@ -98,18 +98,17 @@ class Webservice extends CI_Controller {
} }
} }
public function events_details($event_id = null) { public function events_details($event_id = '') {
$data['event_id'] = $_GET['event_id']; if(empty($event_id) && (!isset($_GET['event_id']) || empty($event_id = $_GET['event_id']))){
$data['auth_token'] = $this->auth_token;
$data['event_date_id'] = '';
if($data['event_id'] == null) {
$this->errorResponse("ER16","Event id is null or empty");die; $this->errorResponse("ER16","Event id is null or empty");die;
} }
if (isset($_GET['event_date_id']) && !empty($_GET['event_date_id'])){ $data['event_id'] = $event_id;
$data['event_date_id'] = $_GET['event_date_id']; $data['auth_token'] = $this->auth_token;
} $data['event_date_id'] = (isset($_GET['event_date_id']) && !empty($_GET['event_date_id']))?
$_GET['event_date_id']:'';
$res = $this->Webservice_model->event($data); $res = $this->Webservice_model->event($data);
if($res['status']!=0){ if($res['status'] != 0){
$this->response($res['data']); $this->response($res['data']);
} else{ } else{
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
......
...@@ -205,6 +205,15 @@ class Event_model extends CI_Model { ...@@ -205,6 +205,15 @@ class Event_model extends CI_Model {
return $status; return $status;
} }
public function updateEventDateTime($event_id = '', $eventData = array()){
if(empty($event_id) || empty($eventData)){
return 0;
}
$this->db->delete('event_date_time',array('event_id'=>$event_id));
$status = $this->db->insert_batch('event_date_time',$eventData);
return $status;
}
public function createEventMedia($eventData = array()){ public function createEventMedia($eventData = array()){
if(empty($eventData)){ if(empty($eventData)){
return 0; return 0;
......
...@@ -26,7 +26,7 @@ class Notification_model extends CI_Model { ...@@ -26,7 +26,7 @@ class Notification_model extends CI_Model {
return 0; return 0;
} }
$cond = ($view != '')?" USR.status IN ($view)":" USR.status!='2'"; $cond = ($view != '')?" USR.status IN ($view)":" USR.status!='2'";
$cond .= ($cities != '')?" AND CUST.profile_city IN ($cities)":""; $cond .= ($cities != '')?" AND CUST.city IN ($cities)":"";
$cityData = $this->db->query("SELECT CUST.* FROM customer AS CUST $cityData = $this->db->query("SELECT CUST.* FROM customer AS CUST
INNER JOIN users AS USR ON (USR.id=CUST.customer_id) INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<img id="country_flag" src="<?= (isset($countryData->country_flag))?base_url($countryData->country_flag):'' ?>" onerror="this.src='<?=base_url("assets/images/flag_default.png")?>';" height="50" width="65" /> <img id="country_flag" src="<?= (isset($countryData->country_flag))?base_url($countryData->country_flag):'' ?>" onerror="this.src='<?=base_url("assets/images/flag_default.png")?>';" height="50" width="65" />
</div> </div>
<div class="col-md-9" style="padding-top: 13px;"> <div class="col-md-9" style="padding-top: 13px;">
<input class="required" name="country_flag" type="file" accept="image/*" onchange="setImg(this,'country_flag');" /> <input class="<?= !empty($country_id)?'':'required' ?>" name="country_flag" type="file" accept="image/*" onchange="setImg(this,'country_flag');" />
</div> </div>
</div> </div>
</div> </div>
......
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
<div class="form-group"> <div class="form-group">
<label>Price</label> <label>Price</label>
<input type="text" class="form-control required" placeholder="Price" <input type="text" class="form-control required" placeholder="Price"
data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" name="price"> data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" name="price" value="<?= isset($seat_pricing['price'])?$seat_pricing['price']:'' ?>">
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<label>Capacity</label> <label>Capacity</label>
<input type="text" class="form-control required" placeholder="Provide Capacity" <input type="text" class="form-control required" placeholder="Provide Capacity"
data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-trigger="change" data-parsley-minlength="1"
name="capacity" data-parsley-pattern="^[0-9\ . \/]+$"> name="capacity" data-parsley-pattern="^[0-9\ . \/]+$" value="<?= isset($seat_pricing['capacity'])?$seat_pricing['capacity']:'' ?>">
</div> </div>
</div> </div>
</div> </div>
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
<div class="form-group"> <div class="form-group">
<label>About Price Division (EN)</label> <label>About Price Division (EN)</label>
<textarea type="text" name="price_details_EN" required data-parsley-trigger="change" <textarea type="text" name="price_details_EN" required data-parsley-trigger="change"
class="ip_reg_form_input form-control reset-form-custom required custom_price" placeholder="Price Division (EN)" data-parsley-minlength="2"></textarea> class="ip_reg_form_input form-control reset-form-custom required custom_price" placeholder="Price Division (EN)" data-parsley-minlength="2"><?= isset($seat_pricing['price_details_EN'])?$seat_pricing['price_details_EN']:'' ?></textarea>
</div> </div>
</div> </div>
<div class="col-sm-6" style="padding-top: 41px;padding-bottom: 18px;"> <div class="col-sm-6" style="padding-top: 41px;padding-bottom: 18px;">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<label>About Price Division (<?= $lang ?>)</label> <label>About Price Division (<?= $lang ?>)</label>
<textarea type="text" name="price_details_<?= $lang ?>" data-parsley-minlength="2" <textarea type="text" name="price_details_<?= $lang ?>" data-parsley-minlength="2"
class="ip_reg_form_input form-control reset-form-custom custom_price" class="ip_reg_form_input form-control reset-form-custom custom_price"
placeholder="Price Division (<?= $lang ?>)" data-parsley-trigger="change"></textarea> placeholder="Price Division (<?= $lang ?>)" data-parsley-trigger="change"><?= isset($seat_pricing['price_details_'.$lang])?$seat_pricing['price_details_'.$lang]:'' ?></textarea>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<option selected disabled>Choose an Event</option> <option selected disabled>Choose an Event</option>
<?php <?php
foreach ($event_data as $event) { foreach ($event_data as $event) {
echo '<option value="'.$event->event_id.'">'.$event->event_name_en.'</option>'; echo '<option value="'.$event->event_id.'">'.$event->event_name_EN.'</option>';
} }
?> ?>
</select> </select>
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
<label>Tags</label> <label>Tags</label>
<div type="parent" class="header-tag-box marginTop10" style="height:82px;"> <div type="parent" class="header-tag-box marginTop10" style="height:82px;">
<?php foreach($regionData AS $region){ ?> <?php foreach($regionData AS $region){ ?>
<div id="tag_<?= $region->id ?>" class="header-tag cpoint" <div id="tag_<?= $region->id ?>" class="header-tag cpoint" select="0"
tag_id="<?= $region->name_en ?>" select="0" onclick="manageTags(jQuery(this))"> tag_id="<?= $region->id ?>" onclick="manageTags(jQuery(this))">
<?= $region->name_en ?> <?= $region->region_name_EN ?>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
......
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