Skip to content

J
joyride phase2
Commit e6bb9c95 by Jansa Jose
Options

Merge branch 'master' into 'dev_production'

recuring ride See merge request !18
parents 5b6ebc56 d64f6473
Showing with 93 additions and 57 deletions
application/controllers/Webservices.php
......@@ -2809,10 +2809,11 @@ public function end_ride_update_post(){
public function recurring_ride_post(){
$postdata = file_get_contents("php://input");
$request =(array) json_decode($postdata,true);
$request = json_decode($postdata,true);
//echo "<pre>";print_r($request);exit;
$recur_data = $this->Webservice_model->recurring_ride($request);
if($recur_data){
$ride_data = $this->Webservice_model->get_recuring_rideid_data($request['ride_id']);
if($request['recur_type'] == '0'){
$monday = strtotime("last monday");
$monday = date('w', $monday)==date('w') ? $monday+7*86400 : $monday;
......@@ -2822,21 +2823,44 @@ public function end_ride_update_post(){
$this_week_sd = strtotime(date("Y-m-d",$monday));
$this_week_ed = strtotime(date("Y-m-d",$sunday));
$ride_data = $this->Webservice_model->get_recuring_rideid_data($request['ride_id']);
$depart_date= strtotime($ride_data->departure_date);
$ride_start_ride = strtotime($request['start_date']);
if(($ride_start_ride >= $this_week_sd) && ($ride_start_ride <= $this_week_ed)){
$numeric_depart_date = strtolower(date('l',$ride_start_ride));
if($request['week_available'][0][$numeric_depart_date]['status'] == 1){
$nextday = strtotime(date('Y-m-d', strtotime('+1 day',strtotime($ride_data->departure_date))));
$rec_res = $this->insert_new_recring_ride($ride_data,$this_week_ed,$request,$nextday);
$ride_start_date = strtotime($request['start_date']);
$ride_end_date = strtotime($request['end_date']);
if($ride_start_date <= $this_week_ed){
if($ride_end_date <= $this_week_ed){
$ride_differ = abs($ride_start_date - $ride_end_date);
$days = $ride_differ/(60 * 60 * 24);
$rec_res = $this->insert_new_recring_ride($ride_data,$request,$days);
if($rec_res){
$res = array('status'=>'success');
}else{
$res = array('status'=>'error');
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
}else{
$ride_strt = explode('T',$request['start_date']);
$ride_differ = abs(strtotime($ride_strt[0]) - $this_week_ed);
$days = $ride_differ/(60 * 60 * 24);
$rec_res = $this->insert_new_recring_ride($ride_data,$request,$days);
if($rec_res){
$res = array('status'=>'success');
}else{
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
}
}else{
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
}elseif($request['recur_type'] == '1'){
$rec_res = $this->insert_new_recring_ride($ride_data,$request,$days=7);
if($rec_res){
$res = array('status'=>'success');
}else{
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
}
}else{
$res = array('status'=>'error','error'=>'error','messgae'=>'Something Went Wrong.. Try Again Later');
......@@ -2844,43 +2868,53 @@ public function end_ride_update_post(){
print json_encode($res);
}
public function insert_new_recring_ride($ride_data,$this_week_ed,$request,$nextday){
$depart_date= strtotime($ride_data->departure_date);
$numeric_depart_date = strtolower(date('l',$depart_date));
public function insert_new_recring_ride($ride_data,$request,$days){
$nextday = explode('T',$request['start_date']);
$nextdate = $nextday[0];
/*print_r($request['week_available'][0][$numeric_depart_date]['time']);exit();*/
$new = array();
for($i=0; $i <=$days; $i++){
if(($nextday <= $this_week_ed) && ($nextday <= $request['end_date'])){
$data =array('source'=>$ride_data['source'],
'destination'=>$ride_data['destination'],
'source_lat'=>$ride_data['source_lat'],
'source_lng'=>$ride_data['source_lng'],
'destination_lat'=>$ride_data['destination_lat'],
'destination_lng'=>$ride_data['destination_lng'],
'stopover'=>$ride_data['stopover'],
'stopover_lng'=>$ride_data['stopover_lng'],
'stopover_lat'=>$ride_data['stopover_lat'],
'pickup_flexibility'=>$ride_data['pickup_flexibility'],
'for_ladies'=>$ride_data['for_ladies'],
'to_airport'=>$ride_data['to_airport'],
'detour'=>$ride_data['detour'],
'no_of_seats'=>$ride_data['no_of_seats'],
'car_id'=>$ride_data['car_id'],
'max_luggage'=>$ride_data['max_luggage'],
'price'=>$ride_data['price'],
'users_id'=>$ride_data['users_id'],
'departure_date'=>$nextday,
'detour_time'=>$request['week_available'][0][$numeric_depart_date]['time'],
'reached_time'=>$ride_data['reached_time'],
'is_round_trip'=>$ride_data['is_round_trip'],
'status'=>1
$depart_date= strtotime($nextdate) ;
$numeric_depart_date = strtolower(date('l',$depart_date));
if($request['week_available'][$numeric_depart_date]['status'] == '1'){
$data =array('source'=>$ride_data->source,
'destination'=>$ride_data->destination,
'source_lat'=>$ride_data->source_lat,
'source_lng'=>$ride_data->source_lng,
'destination_lat'=>$ride_data->destination_lat,
'destination_lng'=>$ride_data->destination_lng,
'stopover'=>$ride_data->stopover,
'stopover_lng'=>$ride_data->stopover_lng,
'stopover_lat'=>$ride_data->stopover_lat,
'pickup_flexibility'=>$ride_data->pickup_flexibility,
'for_ladies'=>$ride_data->for_ladies,
'to_airport'=>$ride_data->to_airport,
'detour'=>$ride_data->detour,
'no_of_seats'=>$ride_data->no_of_seats,
'car_id'=>$ride_data->car_id,
'max_luggage'=>$ride_data->max_luggage,
'price'=>$ride_data->price,
'users_id'=>$ride_data->users_id,
'departure_date'=>$nextdate,
'detour_time'=>$request['week_available'][$numeric_depart_date]['time'],
'reached_time'=>$ride_data->reached_time,
'is_round_trip'=>$ride_data->is_round_trip,
'status'=>$ride_data->status
);
$this->db->insert('ride',$data);
$nextday = strtotime(date('Y-m-d', strtotime('+1 day',$nextday)));
return $this->insert_new_recring_ride($ride_data,$this_week_ed,$request,$nextday);
$new[$i] = $data;
}
$nextdate = date('Y-m-d', strtotime($nextdate . ' +1 day'));
}
if(count($new) > 0){
array_splice($new, 0, 0);
if($this->db->insert_batch('ride',$new)){
return true;
}
}else{
return true;
}
}
/* public function newwelkdr_post(){
$monday = strtotime("last monday");
print_r(date('d-m-y',$monday));
......
application/models/Webservice_model.php
......@@ -214,9 +214,9 @@ function get_cars_details(){
//$mailTemplate=$data->message;
//$this->email->set_newline("\r\n");
$this->email->from('no-reply@techlabz.in');
$this->email->from('info@techlabz.in');
$this->email->to($email);
$this->email->subject("Verify Your Email Adress - JoyRide");
$this->email->subject("Verify Your Email Adress - Tukkibi");
$this->email->message("Click the Link to verify your Email Adress:".$link);
$this->email->send();
// echo $this->email->print_debugger();
......@@ -1009,9 +1009,6 @@ function get_cars_details(){
}
$start=5;
// // $this->db->limit(isset($request['start']?$request['start']:''),$stop);
$this->db->limit($start,$stop);
$this->db->order_by("id", "desc");
$this->db->where('departure_date>=',$date );
......@@ -1021,9 +1018,18 @@ function get_cars_details(){
$this->db->from('ride');
$this->db->join('car_details','ride.car_id=car_details.id','left');
$this->db->join('car_make','car_details.car_make=car_make.id','left');
$query= $this->db->get('');
//echo $this->db->last_query();
return $query->result();
$query= $this->db->get('')->result();
if(count($query) > 0){
foreach ($query as $key => $value) {
$res = $this->db->get_where('recurring_ride',array('ride_id'=>$value->id))->row();
if($res){
$query[$key]->recuring_data = $res;
}else{
$query[$key]->recuring_data = '';
}
}
}
return $query;
}
public function get_find_ride($request){
$this->db->where('no_of_seats >=',$request['seats']);
......
application/views/Templates/left-menu-old.php
......@@ -68,17 +68,13 @@ $admin_detail = pull_admin();
<?php } ?>
</ul>
</li>
<?php } ?>
<?php } if( in_array('26',$page_name))
{?>
<li class="treeview"><a href="<?php echo base_url();?>chat/index"><i class="fa fa-male"></i> <span>Chat</span><i class="fa fa-angle-left pull-right"></i></a>
<li class="treeview"><a href="<?php echo base_url();?>Chat/index"><i class="fa fa-male"></i> <span>Chat</span><i class="fa fa-angle-left pull-right"></i></a>
</li>
<?php if( in_array('11',$page_name) || in_array('12',$page_name) || in_array('13',$page_name))
<?php }if( in_array('11',$page_name) || in_array('12',$page_name) || in_array('13',$page_name))
{?>
<li class="treeview"><a href="#"><i class="fa fa-th" aria-hidden="true"></i> <span>Offer Rides</span><i class="fa fa-angle-left pull-right"></i></a>
<ul class="treeview-menu">
......
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