Skip to content

J
joyride phase2
Commit ef6642f2 by Jansa Jose
Options

Merge branch 'master' into 'dev_production'

aligned file See merge request !58
parents 7ea16b00 f3646e96
Showing with 141 additions and 181 deletions
application/controllers/Webservices.php
<?php
<?php
// Begin
/*use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\Exception;
require 'C:/Workspace/phpmailer/vendor/autoload.php';*/
// end
/*use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\Exception;
require 'C:/Workspace/phpmailer/vendor/autoload.php';*/
// end
require(APPPATH.'libraries/REST_Controller.php');
defined('BASEPATH') OR exit('No direct script access allowed');
header('Content-Type: text/html; charset=utf-8');
defined('BASEPATH') OR exit('No direct script access allowed');
header('Content-Type: text/html; charset=utf-8');
// Allow from any origin
if (isset($_SERVER['HTTP_ORIGIN'])) {
......@@ -47,7 +47,7 @@ header('Content-Type: text/html; charset=utf-8');
#####################################user registration #############################################
#####################################user registration #############################################
......@@ -114,7 +114,7 @@ header('Content-Type: text/html; charset=utf-8');
##################################### Login #######################################################
##################################### Login #######################################################
public function do_login_post(){
......@@ -126,27 +126,23 @@ header('Content-Type: text/html; charset=utf-8');
$result = $this->Webservice_model->login($request);
header('Content-type: application/json');
if($result){
//if($result['email_is_verified'] == '1'){
if($result['email_is_verified'] == '1'){
$result1 = $this->Webservice_model->player_id_insert($request);
print json_encode(array('status' => 'success','message'=>'Login Successfully','data'=>$result));
/*}else{
}else{
print json_encode(array('status' => 'error','message'=>'Email is not Verified. Please Verify'));
}*/
}
}else{
print json_encode(array('status' => 'error','message'=>'Unknown Credential! Try Again','data'=>''));
}
}
##################################### Facebook Login #################################################
##################################### Facebook Login #################################################
public function google_login_post(){
// 'fb_login');die();
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
// var_dump($request);
// die();
$result = $this->Webservice_model->google_login($request);
header('Content-type: application/json');
......@@ -171,7 +167,7 @@ header('Content-Type: text/html; charset=utf-8');
print json_encode($response);
}
public function fb_login_post(){
public function fb_login_post(){
// 'fb_login');die();
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
......@@ -190,7 +186,7 @@ public function fb_login_post(){
}
##################################### Forgot password ###############################################
##################################### Forgot password ###############################################
public function forgot_password_post() {
......@@ -213,7 +209,7 @@ public function fb_login_post(){
}
##################################### Change password ################################################
##################################### Change password ################################################
public function change_password_post(){
......@@ -241,7 +237,7 @@ public function fb_login_post(){
##################################### Biography Update ################################################
##################################### Biography Update ################################################
public function update_biography_post(){
......@@ -267,7 +263,7 @@ public function fb_login_post(){
}
##################################### Profile Update ###############################################
##################################### Profile Update ###############################################
public function update_profile_post(){
......@@ -294,40 +290,40 @@ public function fb_login_post(){
##################################### Profile Pic upadate ###########################################
##################################### Profile Pic upadate ###########################################
// public function update_profile_picture_post(){
// public function update_profile_picture_post(){
// if(is_uploaded_file($_FILES['image']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['image']['tmp_name'];
// $pic_name = $_FILES['image']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// if(is_uploaded_file($_FILES['image']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['image']['tmp_name'];
// $pic_name = $_FILES['image']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['image'] = base_url().$uploads_dir.$pic_name;
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['image'] = base_url().$uploads_dir.$pic_name;
// $result = $this->Webservice_model->photo_uploads($request);
// $result = $this->Webservice_model->photo_uploads($request);
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// }
// }
......@@ -365,14 +361,14 @@ public function fb_login_post(){
}
}
}
########################################################################################################
########################################################################################################
......@@ -399,7 +395,7 @@ public function fb_login_post(){
}
######################################################################################
######################################################################################
public function get_preference_post(){
......@@ -426,7 +422,7 @@ public function fb_login_post(){
}
###################################################################################################
###################################################################################################
public function get_users_car_list_post(){
......@@ -589,13 +585,13 @@ public function fb_login_post(){
foreach($ride_list as $ride_id){
++$i;
$request['ride_id'] = $ride_id;
// $reached_time= $this->Webservice_model->get_reached_time($request);
// //var_dump($reached_time);
// if($reached_time){
// $request['reached_time']=$reached_time->reached_time;
// }else{
// $request['reached_time']='14:00:00';
// }
// $reached_time= $this->Webservice_model->get_reached_time($request);
// //var_dump($reached_time);
// if($reached_time){
// $request['reached_time']=$reached_time->reached_time;
// }else{
// $request['reached_time']='14:00:00';
// }
//var_dump($request['reached_time']);
$carexist= $this->Webservice_model->car_exist($request,$i);
......@@ -729,9 +725,9 @@ public function fb_login_post(){
$time = $data['rows'][0]['elements'][0]['duration']['text']; //Text for String and Value for INT
$distance = $data['rows'][0]['elements'][0]['distance']['text'];//T
$settings= $this->Webservice_model->getkm_charge();
// echo $this->db->last_query();
// $settings);
// die;
// echo $this->db->last_query();
// $settings);
// die;
$kmcharge=$distance *($settings->kmcharge);
foreach($result as $data){
$data->rate=$this->Webservice_model->getrate($data->users_id);
......@@ -886,9 +882,9 @@ public function fb_login_post(){
$response=array('status' => 'error','message'=>'Something Went Wrong','data'=>'');
}
print json_encode($response);
}
}
public function send_mails($data){
public function send_mails($data){
$settings = $this->db->get_where('settings',array('id'=>'1'))->row();
......@@ -916,7 +912,7 @@ public function send_mails($data){
//echo $this->email->print_debugger();
return "EmailSend";
}
}
......@@ -1009,7 +1005,7 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
// public function save_notification_post(){
......@@ -1048,7 +1044,7 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
public function notifysave_post(){
......@@ -1089,7 +1085,7 @@ public function send_mails($data){
##################################################################################################
##################################################################################################
public function get_notification_post(){
......@@ -1107,7 +1103,7 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
......@@ -1168,7 +1164,7 @@ public function send_mails($data){
##################################################################################################
##################################################################################################
......@@ -1229,7 +1225,7 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
// public function save_passport_info_post(){
......@@ -1289,8 +1285,8 @@ public function send_mails($data){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
// $request);
// die;
// $request);
// die;
if($request){
$result = $this->Webservice_model->save_goverment_info($request);
......@@ -1311,7 +1307,7 @@ public function send_mails($data){
##################################################################################################
##################################################################################################
public function add_number_post(){
......@@ -1336,7 +1332,7 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
......@@ -1439,7 +1435,7 @@ public function send_mails($data){
return $response;
}
/* public function similar_ride_alert_post(){
/* public function similar_ride_alert_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata);
......@@ -1539,42 +1535,42 @@ public function send_mails($data){
}
##################################################################################################
##################################################################################################
// public function passport_upload_post(){
// public function passport_upload_post(){
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// $result = $this->Webservice_model->passport_uploads($request);
// $result = $this->Webservice_model->passport_uploads($request);
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// }
// }
public function passport_upload_post(){
public function passport_upload_post(){
if(is_uploaded_file($_FILES['file']['tmp_name'])){
......@@ -1606,10 +1602,10 @@ public function passport_upload_post(){
}
}
}
public function goverment_upload_post(){
public function goverment_upload_post(){
if(is_uploaded_file($_FILES['file']['tmp_name'])){
......@@ -1645,7 +1641,7 @@ public function goverment_upload_post(){
}
}
}
......@@ -1656,7 +1652,7 @@ public function goverment_upload_post(){
##################################################################################################
##################################################################################################
public function getrate_find_ride_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata);
......@@ -1680,7 +1676,7 @@ public function goverment_upload_post(){
}
##################################################################################################
##################################################################################################
public function approve_booking_post(){
$postdata = file_get_contents("php://input");
......@@ -2080,36 +2076,36 @@ public function goverment_upload_post(){
// public function test_upload_post(){
// public function test_upload_post(){
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// $result = $this->Webservice_model->test($request);
// $result = $this->Webservice_model->test($request);
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// if($result){
// print json_encode(array('status' => 'success','message'=>'Profile Photo Updated Succesfully','data'=>$result));
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrong'));
// }
// }
// }
public function update_carphoto_post(){
......@@ -2144,7 +2140,7 @@ public function goverment_upload_post(){
}
}
}
public function car_details_start_post(){
......@@ -2348,42 +2344,42 @@ public function goverment_upload_post(){
}
################################################################################################################
// public function update_carphoto_post(){
// public function update_carphoto_post(){
// print json_encode(array('status' => 'error','data'=>$_FILES));
// die();
// print json_encode(array('status' => 'error','data'=>$_FILES));
// die();
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// if(is_uploaded_file($_FILES['file']['tmp_name'])){
// $uploads_dir = './assets/uploads/profile_pic/';
// $tmp_name = $_FILES['file']['tmp_name'];
// $pic_name = $_FILES['file']['name'];
// $pic_name = str_replace(' ', '_', mt_rand().$pic_name);
// move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// //$request['file'] = $uploads_dir.$pic_name;
// $request = $_POST;
// //$request['image'] = $uploads_dir.$pic_name;
// $request['file'] = base_url().$uploads_dir.$pic_name;
// //$request['file'] = $uploads_dir.$pic_name;
// $result = $this->Webservice_model->carphoto_uploads($request);
// $result = $this->Webservice_model->carphoto_uploads($request);
// if($result){
// print json_encode(array('status' => 'success','message'=>'Car Photo Updated Succesfully','data'=>$result));
// if($result){
// print json_encode(array('status' => 'success','message'=>'Car Photo Updated Succesfully','data'=>$result));
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrrong'));
// }
// } else {
// print json_encode(array('status' => 'error','data'=>''));
// }
// } else {
// print json_encode(array('status' => 'error','message'=>'Something Went wrrong'));
// }
// }
// }
public function end_ride_update_post(){
public function end_ride_update_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
// var_dump($request);die;
......@@ -2436,18 +2432,13 @@ public function end_ride_update_post(){
public function reject_send_alert($request){
$res=$this->Webservice_model->reject_send_details($request);
$content = array(
"en" => 'Ride Rejected '
);
$headings = array(
"en" => 'Ride'
);
// var_dump(array($result['player_id']));
// var_dump($content);
$type='ride_reject_alert';
//die;
$include_player_ids = array($res->player_id);
$id='';
......@@ -2457,20 +2448,12 @@ public function end_ride_update_post(){
$data['msg'] = 'Hi '.$res->first_name.', Your Request is Rejected.';
$this->send_mails($data);
$return = $ress;
// print($return);
// $return = json_encode($return);
}
public function approve_send_alert($request){
$res=$this->Webservice_model->approve_send_details($request->booking_id);
//print_r($res->email);exit();
$content = array(
"en" => 'Ride Accepted '
......@@ -2478,10 +2461,7 @@ public function end_ride_update_post(){
$headings = array(
"en" => 'Ride'
);
// var_dump(array($result['player_id']));
// var_dump($content);
$type='ride_approve_alert';
//die;
$include_player_ids = array(isset($res->device_id) && !empty($res->device_id)? $res->device_id : '');
$id='';
......@@ -2491,14 +2471,6 @@ public function end_ride_update_post(){
$data['msg'] = 'Hi '.$res->first_name.', Your Request is Approved.';
$this->send_mails($data);
$return = $ress;
// print($return);
// $return = json_encode($return);
}
#######################################################################
public function booking_history_count_details_post(){
......@@ -2508,18 +2480,13 @@ public function end_ride_update_post(){
$result = $this->Webservice_model->booking_history_count_details($request);
if($result){
$response=array('status' => 'success','data'=>$result);
}else{
$response=array('status' => 'error','message'=>'Error Occured','data'=>'');
}
}else{
$response=array('status' => 'error','message'=>'Something Went Wrong','data'=>'');
}
print json_encode($response);
}
##########################################################################
public function offer_history_count_details_post(){
......@@ -2529,18 +2496,13 @@ public function end_ride_update_post(){
$result = $this->Webservice_model->offer_history_count_details($request);
if($result){
$response=array('status' => 'success','data'=>$result);
}else{
$response=array('status' => 'Warning','message'=>'Error Occured','data'=>'');
}
}else{
$response=array('status' => 'error','message'=>'Something Went Wrong','data'=>'');
}
print json_encode($response);
}
......@@ -2552,10 +2514,8 @@ public function end_ride_update_post(){
$result=$this->Webservice_model->car_active_check($request);
if($result){
$response=array('status' => 'success','data'=>$result);
}else{
$response=array('status' => 'error','message'=>"Booking with this car!!Not allowed to Edit");
}
}
print json_encode($response);
......@@ -2627,7 +2587,7 @@ public function end_ride_update_post(){
/********send mail ***************/
/********send mail ***************/
public function send_mail($email,$sub,$body,$name){
$mail = new PHPMailer(true);
......@@ -3002,7 +2962,7 @@ public function end_ride_update_post(){
/********send mail ***************/
/********send mail ***************/
public function mailsendfun(){
$this->load->library('email');
......
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