Skip to content

T
TimeOutAdmin
Commit ef91ce5d by Tobin
Options

Merge branch 'master' into 'dev_production'

dc See merge request !19
parents a5ae8345 3a1f9d8f
Showing with 19 additions and 535 deletions
.gitignore 0 → 100644
/application/controllers/Webservice.php
/application/models/Webservice_model.php
/application/models/Validation_app_model.php
application/controllers/Api.php
...@@ -22,6 +22,7 @@ class Api extends CI_Controller { ...@@ -22,6 +22,7 @@ class Api extends CI_Controller {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
date_default_timezone_set("Asia/Riyadh");
$this->load->model('Api_model'); $this->load->model('Api_model');
$this->load->model('Validation_model'); $this->load->model('Validation_model');
$method = $this->router->fetch_method(); $method = $this->router->fetch_method();
......
application/models/Api_model.php
...@@ -678,7 +678,14 @@ class Api_model extends CI_Model { ...@@ -678,7 +678,14 @@ class Api_model extends CI_Model {
$latlng = array('lat'=>$rs->lat, 'lng'=>$rs->lng); $latlng = array('lat'=>$rs->lat, 'lng'=>$rs->lng);
foreach ($dates as $rss) { foreach ($dates as $rss) {
$timeArray = explode('#', $rss); $timeArray = explode('#', $rss);
$time_spec[$timeArray[1]][] = array("id"=>$timeArray[0],"time"=>$timeArray[2]);
$sTime = $timeArray[1].' '.$timeArray[2];
$cTime = date("Y-m-d H:i", strtotime('+15 minutes'));
if($cTime < $sTime){
$time_spec[$timeArray[1]][] = array("id"=>$timeArray[0],
"time"=>$timeArray[2]);
}
} }
$tags = explode(',', $rs->tag); $tags = explode(',', $rs->tag);
$media_url = explode(',', $rs->media_url); $media_url = explode(',', $rs->media_url);
......
application/models/Validation_app_model.php deleted 100644 → 0
<?php
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'),)),
'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')
),
'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone no is null or empty'),
'phone'=>array('code'=>'ER08', 'message'=>'Invalid Phone no')
),
),
'registration'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'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'),
),
'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'),
)
),
'filters'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'events_details'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'get_category_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'get_last_booking'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'add_favorites'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER16', 'message'=>'Event id is null or empty')),
'is_favorite'=>array('required'=>array('code'=>'ER21', 'message'=>'Is favorate is null or empty')),),
'get_cities_list'=>array('auth_token'=>array('required'=>array('code'=>'ER19', 'message'=>'User Id is null or empty'),
)
),
'update_city'=>array('auth_token'=>array('required'=>array('code'=>'ER19', 'message'=>'User Id is null or empty'),
)
),
'booking_summary'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'payment'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking id is null or empty'))),
'event_rating'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'rating'=>array('required'=>array('code'=>'ER26', 'message'=>'Rating is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER27', 'message'=>'Event id is null or empty')),
'description'=>array('required'=>array('code'=>'ER28', 'message'=>'description id is null or empty')),),
'update_notification_email_status'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'notification_status'=>array('required'=>array('code'=>'ER24', 'message'=>'Notification Status is null or empty')),
'email_status'=>array('required'=>array('code'=>'ER25', 'message'=>'Email status id is null or empty')),),
'profile_details'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
'profile_edit'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),),
'booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER20', 'message'=>'Event id is null or empty')),
'customer_id'=>array('required'=>array('code'=>'ER29', 'message'=>'Customer id is null or empty')),
'event_date_id'=>array('required'=>array('code'=>'ER30', 'message'=>'Event date id is null or empty')),
'no_of_ticket'=>array('required'=>array('code'=>'ER31', 'message'=>'Number of ticket is null or empty')),
'ticket_details'=>array('required'=>array('code'=>'ER32', 'message'=>'Ticket details is null or empty')),
'amount'=>array('required'=>array('code'=>'ER33', 'message'=>'Amount is null or empty')),),
'cancel_booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty')),),
'get_favorites_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'get_booking_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'settings'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'forgot_password'=> array('new_password'=>array('required'=>array('code'=>'ER35', 'message'=>'New password is null or empty')),
'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone is null or empty')),),
);
public function validation_check($method_name, $parms) {
$state = 0;
$rules = $this->validation_array[$method_name];
$error_key = '';
foreach ($rules as $key => $value) {
foreach ($value as $keys => $values) {
switch ($keys) {
case 'required':
if(!isset($parms[$key]) || $parms[$key]=='' || $parms[$key]== null){
$state = 1;
$error_key = $values;
}
break;
case 'email':
if (isset($parms[$key]) && !filter_var($parms[$key], FILTER_VALIDATE_EMAIL)) {
$state = 1;
$error_key = $values;
}
break;
case 'phone':
if(isset($parms[$key])){
$phone = preg_replace('/[^0-9]/', '', $parms[$key]);
/*if (strlen($phone) !== 10) {
$state = 1;
$error_key = $values;
} */
}
break;
default:
# code...
break;
}
if($state==1){
break;
}
}
if($state==1){
break;
}
}
return array('state'=>$state,'response'=>$error_key);
}
}
?>
\ No newline at end of file
application/views/Venue/viewVenueList.php
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<th width="100px;">Host Type</th> <th width="100px;">Host Type</th>
<th width="120px;">Location</th> <th width="120px;">Location</th>
<th width="50px;">Status</th> <th width="50px;">Status</th>
<th width="300px;">Action</th> <th width="320px;">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
assets/css/custom-style.css
...@@ -666,4 +666,8 @@ ...@@ -666,4 +666,8 @@
.errorBorder { .errorBorder {
border: 1px solid #ff0000 !important; border: 1px solid #ff0000 !important;
}
.datepicker{
z-index: 9999 !important;
} }
\ No newline at end of file
assets/js/custom-script.js
...@@ -393,7 +393,7 @@ jQuery('[id="viewProvider"]').on('click',function() { ...@@ -393,7 +393,7 @@ jQuery('[id="viewProvider"]').on('click',function() {
jQuery.ajax({ jQuery.ajax({
url : base_url+"Provider/getProviderData", url : base_url+"Provider/getProviderData",
type : 'POST', type : 'POST',
data : {'provider_id':provider_id,'view_all':'1'}, data : {'provider_id':provider_id,'view_all':'0'},
success: function(resp){ success: function(resp){
if(resp == '' || resp == undefined || resp == 'undefined' || resp == null || resp == 'null'){ if(resp == '' || resp == undefined || resp == 'undefined' || resp == null || resp == 'null'){
remModalLoader(); remModalLoader();
......
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