Skip to content

N
nemt_backend
Commit c7b1cafb by Tobin
Options

Merge branch 'master' into 'production'

Master See merge request !7
parents 0e4aceb3 66854e28
Showing with 1550 additions and 349 deletions
application/controllers/Broker.php
......@@ -7,6 +7,7 @@ class Broker extends CI_Controller {
parent::__construct();
date_default_timezone_set("Asia/Kolkata");
$this->load->model('Broker_model');
$this->load->model('Company_model');
if(!$this->session->userdata('logged_in')) {
redirect(base_url('Login'));
......@@ -21,6 +22,13 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Add New Broker";
$template['page_title'] = "Add Broker";
$template['company_data'] = $this->Company_model->getCompany();
if($this->session->userdata['user_type'] == 1 && empty($template['company_data'])){
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue.',
'class'=>'error');
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}
$this->load->view('template',$template);
}
......@@ -34,7 +42,7 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Brokers List View";
$template['page_title'] = "View Brokers";
$template['brokers_data'] = $this->Broker_model->getBroker();
$template['brokers_data'] = $this->Broker_model->getBroker('','0,1');
$this->load->view('template',$template);
}
......@@ -50,13 +58,31 @@ class Broker extends CI_Controller {
if($err == 0 && (!isset($_POST['broker_name']) || empty($_POST['broker_name']))){
$err = 1;
$errMsg = 'Provide a Broker Name';
}else if($err == 0 && (!isset($_POST['broker_email']) || empty($_POST['broker_email']))){
}
else if($err == 0 && (!isset($_POST['broker_email']) || empty($_POST['broker_email']))){
$err = 1;
$errMsg = 'Provide an Email ID';
}else if($err == 0 && (!isset($_POST['broker_phone']) || empty($_POST['broker_phone']))){
}
else if($err == 0 && (!isset($_POST['broker_phone']) || empty($_POST['broker_phone']))){
$err = 1;
$errMsg = 'Provide a Phone Number';
}
else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
$err = 1;
$errMsg = 'Provide an Address';
}
else if($err == 0 && (!isset($_POST['city']) || empty($_POST['city']))){
$err = 1;
$errMsg = 'Provide a City Name';
}
else if($err == 0 && (!isset($_POST['state']) || empty($_POST['state']))){
$err = 1;
$errMsg = 'Provide a State Name';
}
else if($err == 0 && (!isset($_POST['company_id']) || empty($_POST['company_id']))){
$err = 1;
$errMsg = 'Choose a Company';
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
......@@ -66,6 +92,9 @@ class Broker extends CI_Controller {
if($status == 1){
$flashMsg['class'] = 'success';
$flashMsg['message'] = 'Broker Created';
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}else if($status == 2){
$flashMsg['message'] = 'Email ID already in use.';
}else if($status == 3){
......@@ -105,7 +134,15 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Edit Broker Details";
$template['page_title'] = "Edit Broker";
$template['broker_id'] = $broker_id;
$template['broker_data'] = $this->Broker_model->getBroker($broker_id);
$template['broker_data'] = $this->Broker_model->getBroker($broker_id,'0,1');
$template['company_data'] = $this->Company_model->getCompany();
if($this->session->userdata['user_type'] == 1 && empty($template['company_data'])){
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue.',
'class'=>'error');
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}
$this->load->view('template',$template);
}
......@@ -125,16 +162,32 @@ class Broker extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/edit/'.encode_param($broker_id)));
}
if($err == 0 && (!isset($_POST['broker_name']) || empty($_POST['broker_name']))){
$err = 1;
$errMsg = 'Provide a Broker Name';
}else if($err == 0 && (!isset($_POST['broker_email']) || empty($_POST['broker_email']))){
}
else if($err == 0 && (!isset($_POST['broker_email']) || empty($_POST['broker_email']))){
$err = 1;
$errMsg = 'Provide an Email ID';
}else if($err == 0 && (!isset($_POST['broker_phone']) || empty($_POST['broker_phone']))){
}
else if($err == 0 && (!isset($_POST['broker_phone']) || empty($_POST['broker_phone']))){
$err = 1;
$errMsg = 'Provide a Phone Number';
}
else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
$err = 1;
$errMsg = 'Provide an Address';
}
else if($err == 0 && (!isset($_POST['city']) || empty($_POST['city']))){
$err = 1;
$errMsg = 'Provide a City Name';
}
else if($err == 0 && (!isset($_POST['state']) || empty($_POST['state']))){
$err = 1;
$errMsg = 'Provide a State Name';
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
......@@ -156,5 +209,19 @@ class Broker extends CI_Controller {
redirect(base_url('Broker/edit/'.encode_param($broker_id)));
}
function getBrokers(){
$result = array('status'=>'0');
if(!isset($_POST) || empty($_POST) || !isset($_POST['company_id']) || empty($_POST['company_id'])){
echo json_encode($result);exit;
}
$broker_data = $this->Broker_model->getBroker('','',$_POST['company_id']);
if(empty($broker_data)){
$result['status'] = 2;
echo json_encode($result);exit;
}
$result['status'] = 1;
$result['data'] = $broker_data;
echo json_encode($result);exit;
}
}
?>
\ No newline at end of file
application/controllers/Company.php
......@@ -40,7 +40,7 @@ class Company extends CI_Controller {
$template['menu'] = "Company Management";
$template['sub_menu'] = "View Companies";
$template['company_data'] = $this->Company_model->getCompany();
$template['company_data'] = $this->Company_model->getCompany('','0,1');
$this->load->view('template',$template);
}
......@@ -151,7 +151,7 @@ class Company extends CI_Controller {
$template['page_title'] = "View Company Details";
$template['company_id'] = $company_id;
$template['company_data'] = $this->Company_model->getCompany($company_id);
$template['company_data'] = $this->Company_model->getCompany($company_id,'0,1');
$this->load->view('template',$template);
}
......@@ -172,7 +172,7 @@ class Company extends CI_Controller {
$template['page_title'] = "Edit Company";
$template['company_id'] = $company_id;
$template['company_data'] = $this->Company_model->getCompany($company_id);
$template['company_data'] = $this->Company_model->getCompany($company_id,'0,1');
$this->load->view('template',$template);
}
......@@ -257,7 +257,7 @@ class Company extends CI_Controller {
redirect(base_url('Company/edit/'.encode_param($company_id)));
}
function manager_offers(){
function manager_offers($offer_type = '1,2'){
$template['page'] = 'Company/offer_list_page';
$template['menu'] = "Company Management";
......@@ -266,7 +266,7 @@ class Company extends CI_Controller {
$template['page_desc'] = "Manage Company Offers";
$template['page_title'] = "Offer Management";
$template['offer_data'] = $this->Company_model->getOfferData();
$template['offer_data'] = $this->Company_model->getOfferData($offer_type);
$this->load->view('template',$template);
}
......@@ -312,6 +312,9 @@ class Company extends CI_Controller {
}else if($err == 0 && (!isset($_POST['activation_date']) || empty($_POST['activation_date']))){
$err = 1;
$errMsg = 'Provide an Activation Date';
}else if($err == 0 && (!isset($_POST['applicable_on']) || $_POST['applicable_on'] == '')){
$err = 1;
$errMsg = 'Offer Applicable Field is required';
}else if($err == 0 && (!isset($_POST['expiry_date']) || empty($_POST['expiry_date']))){
$err = 1;
$errMsg = 'Provide an Expiry Date';
......
application/controllers/Customer.php
......@@ -20,11 +20,11 @@ class Customer extends CI_Controller {
public function addCustomerUser(){
$template['page'] = 'Customer/add-customer-user';
$template['page_title'] = "Add New Customer";
$template['page_desc'] = "Create New Customer Users";
$template['page_title'] = "Add New Patient";
$template['page_desc'] = "Create New Patient";
$template['menu'] = "Customer Management";
$template['sub_menu'] = "Add Customer";
$template['menu'] = "Patient Management";
$template['sub_menu'] = "Add Patient";
$this->load->view('template',$template);
}
......@@ -32,11 +32,11 @@ class Customer extends CI_Controller {
public function listCustomerUsers(){
$template['page'] = 'Customer/list-customer-users';
$template['page_title'] = "View All Customer Users";
$template['page_desc'] = "View and Manageme All Customer Users";
$template['page_title'] = "View All Patients";
$template['page_desc'] = "View and Manage All Patients";
$template['menu'] = "Customer Management";
$template['sub_menu'] = "View Customer";
$template['menu'] = "Patients Management";
$template['sub_menu'] = "View Patients";
$template['customerData'] = $this->Customer_model->getCustomer();
$this->load->view('template',$template);
......@@ -168,11 +168,11 @@ class Customer extends CI_Controller {
$template['page'] = 'Customer/add-customer-user';
$template['menu'] = "Customer Management";
$template['sub_menu'] = "Edit Customer";
$template['menu'] = "Patient Management";
$template['sub_menu'] = "Edit Patient";
$template['page_desc'] = "Edit Customer Details";
$template['page_title'] = "Edit Customer";
$template['page_desc'] = "Edit Patient Details";
$template['page_title'] = "Edit Patient";
$template['customer_id'] = $customer_id;
$customer_id = decode_param($customer_id);
......
application/controllers/Driver.php
......@@ -24,7 +24,7 @@ class Driver extends CI_Controller {
$template['page_desc'] = "Add New Driver";
$template['page_title'] = "Add Driver";
$template['vehicles'] = $this->Vehicle_model->getVehicle();
$template['vehicles'] = $this->Vehicle_model->getVehicleType();
$template['companies'] = $this->Company_model->getCompany();
$this->load->view('template',$template);
}
......@@ -38,7 +38,7 @@ class Driver extends CI_Controller {
$template['page_desc'] = "Driver List View";
$template['page_title'] = "View Drivers";
$template['drivers_data'] = $this->Driver_model->getDriver();
$template['drivers_data'] = $this->Driver_model->getDriver('','0,1');
$this->load->view('template',$template);
}
......@@ -71,13 +71,43 @@ class Driver extends CI_Controller {
$errMsg = 'Select a Company';
}else if($err == 0 && (!isset($_FILES['licence']) || empty($_FILES['licence']))){
$err = 1;
$errMsg = 'Provide your Licence';
$errMsg = 'Provide your Licence Photo';
}else if($err == 0 && (!isset($_FILES['profile_image']) || empty($_FILES['profile_image']))){
$err = 1;
$errMsg = 'Select a Profile Photo';
$errMsg = 'Provide a Profile Photo';
}else if($err == 0 && (!isset($_POST['vehicle_id']) || empty($_POST['vehicle_id']))){
$err = 1;
$errMsg = 'Select a Vehicle Type';
$errMsg = 'Provide a Vehicle Type';
}else if($err == 0 && (!isset($_POST['city']) || empty($_POST['city']))){
$err = 1;
$errMsg = 'Provide a city';
}else if($err == 0 && (!isset($_POST['state']) || empty($_POST['state']))){
$err = 1;
$errMsg = 'Provide a state';
}else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
$err = 1;
$errMsg = 'Provide your address';
}else if($err == 0 && (!isset($_POST['licence_exp_date']) || empty($_POST['licence_exp_date']))){
$err = 1;
$errMsg = 'Provide your licence expiry date';
}else if($err == 0 && (!isset($_POST['licence_number']) || empty($_POST['licence_number']))){
$err = 1;
$errMsg = 'Provide your Licence Number';
}else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){
$err = 1;
$errMsg = 'Provide your Vehicle Model';
}else if($err == 0 && (!isset($_POST['active_location']) || empty($_POST['active_location']))){
$err = 1;
$errMsg = 'Provide your Active Location';
}else if($err == 0 && (!isset($_POST['online_start_time']) || empty($_POST['online_start_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck In Time';
}else if($err == 0 && (!isset($_POST['online_end_time']) || empty($_POST['online_end_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck Out Time';
}else if($err == 0 && ($_POST['online_start_time'] >= $_POST['online_end_time'])){
$err = 1;
$errMsg = 'Provide Ckeck Out Time greater than Ckeck In Time';
}
if($err == 0){
$config = set_upload_service("assets/uploads/services");
......@@ -103,17 +133,33 @@ class Driver extends CI_Controller {
$upload_data = $this->upload->data();
$_POST['licence'] = $config['upload_path']."/".$upload_data['file_name'];
}
$acLatLng = getLatLngFromLocation($_POST['active_location']);
if(empty($acLatLng) || !isset($acLatLng['lat']) || !isset($acLatLng['lng'])){
$err = 1;
$errMsg = 'Provide a valid Active Location';
} else {
$_POST['active_loc_lat'] = $acLatLng['lat'];
$_POST['active_loc_lng'] = $acLatLng['lng'];
}
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/add_driver'));
}
$_POST['password'] = md5($_POST['password']);
$_POST['online_end_time'] = strtotime($_POST['online_end_time']);
$_POST['online_start_time'] = strtotime($_POST['online_start_time']);
$status = $this->Driver_model->addDriver($_POST);
if($status == 1){
$flashMsg['class'] = 'success';
$flashMsg['message'] = 'Driver Created';
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/driver_list'));
}else if($status == 2){
$flashMsg['message'] = 'Email ID already in use.';
}else if($status == 3){
......@@ -153,7 +199,7 @@ class Driver extends CI_Controller {
$template['page_desc'] = "View Driver Details";
$template['page_title'] = "Driver Details";
$template['driver_id'] = $driver_id;
$template['driver_data'] = $this->Driver_model->getDriver($driver_id);
$template['driver_data'] = $this->Driver_model->getDriver($driver_id,'0,1');
$this->load->view('template',$template);
}
......@@ -175,10 +221,16 @@ class Driver extends CI_Controller {
$template['page_title'] = "Edit Driver";
$template['driver_id'] = $driver_id;
$template['vehicles'] = $this->Vehicle_model->getVehicle();
$template['companies'] = $this->Company_model->getCompany();
$template['driver_data'] = $this->Driver_model->getDriver($driver_id);
$template['driver_data'] = $this->Driver_model->getDriver($driver_id,'0,1');
$template['vehicle_types'] = $this->Vehicle_model->getVehicleType();
if(empty($template['driver_data'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/Driver_list'));
}
$vehicles = (isset($template['driver_data']->vehicle))?$template['driver_data']->vehicle:'';
$template['vehicles'] = $this->Vehicle_model->getVehiclesData($vehicles);
$this->load->view('template',$template);
}
......@@ -209,6 +261,36 @@ class Driver extends CI_Controller {
}else if($err == 0 && (!isset($_POST['phone']) || empty($_POST['phone']))){
$err = 1;
$errMsg = 'Provide a Phone Number';
}else if($err == 0 && (!isset($_POST['city']) || empty($_POST['city']))){
$err = 1;
$errMsg = 'Provide a city';
}else if($err == 0 && (!isset($_POST['state']) || empty($_POST['state']))){
$err = 1;
$errMsg = 'Provide a state';
}else if($err == 0 && (!isset($_POST['address']) || empty($_POST['address']))){
$err = 1;
$errMsg = 'Provide your address';
}else if($err == 0 && (!isset($_POST['licence_exp_date']) || empty($_POST['licence_exp_date']))){
$err = 1;
$errMsg = 'Provide your licence expiry date';
}else if($err == 0 && (!isset($_POST['licence_number']) || empty($_POST['licence_number']))){
$err = 1;
$errMsg = 'Provide your Licence Number';
}else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){
$err = 1;
$errMsg = 'Choose your Vehicle';
}else if($err == 0 && (!isset($_POST['active_location']) || empty($_POST['active_location']))){
$err = 1;
$errMsg = 'Provide your Active Location';
}else if($err == 0 && (!isset($_POST['online_start_time']) || empty($_POST['online_start_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck In Time';
}else if($err == 0 && (!isset($_POST['online_end_time']) || empty($_POST['online_end_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck Out Time';
}else if($err == 0 && ($_POST['online_start_time'] >= $_POST['online_end_time'])){
$err = 1;
$errMsg = 'Provide Ckeck Out Time greater than Ckeck In Time';
}
$_POST['profile_image'] = $_POST['licence'] = '';
......@@ -233,12 +315,23 @@ class Driver extends CI_Controller {
}
}
$acLatLng = getLatLngFromLocation($_POST['active_location']);
if(empty($acLatLng) || !isset($acLatLng['lat']) || !isset($acLatLng['lng'])){
$err = 1;
$errMsg = 'Provide a valid Active Location';
} else {
$_POST['active_loc_lat'] = $acLatLng['lat'];
$_POST['active_loc_lng'] = $acLatLng['lng'];
}
if($err == 1){
$flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/edit/'.encode_param($driver_id)));
}
$_POST['online_end_time'] = strtotime($_POST['online_end_time']);
$_POST['online_start_time'] = strtotime($_POST['online_start_time']);
$status = $this->Driver_model->updateDriver($driver_id,$_POST);
if($status == 1){
$flashMsg['class'] = 'success';
......@@ -260,12 +353,20 @@ class Driver extends CI_Controller {
echo json_encode($return_arr);exit;
}
$driver_id = decode_param($_POST['driver_id']);
$driver_data = $this->Driver_model->getDriver($driver_id);
$driver_data = $this->Driver_model->getDriver($driver_id,'0,1');
if(!empty($driver_data)){
$driver_data->online_time = ' -- ';
if(!empty($driver_data->online_start_time) && !empty($driver_data->online_end_time)){
$driver_data->online_time = $driver_data->online_start_time.' -- '.$driver_data->online_end_time;
}
$return_arr['status'] = 1;
$return_arr['driver_data'] = $driver_data;
}
echo json_encode($return_arr);exit;
}
}
?>
\ No newline at end of file
application/controllers/Payment.php
......@@ -32,8 +32,33 @@ class Payment extends CI_Controller {
$template['user_type'] = $this->session->userdata('user_type');
$template['company_data'] = $this->Company_model->getCompany();
$template['payment_details'] = $this->Company_model->getPayDetails($company_id);
$template['broker_pay_details'] = $this->Company_model->getBrokerPayDetails($company_id);
$this->load->view('template',$template);
}
function updatePaymentDate(){
$retStatus = array('status'=>'0');
if(!isset($_POST) || empty($_POST) ||
!isset($_POST['broker_id']) || empty($_POST['broker_id']) ||
!isset($_POST['last_paid_date']) || empty($_POST['last_paid_date'])){
echo json_encode($retStatus);exit;
}
$_POST['broker_id'] = decode_param($_POST['broker_id']);
$_POST['company_id'] = $this->session->userdata['id'];
$_POST['last_paid_date'] = date('Y-m-d 00:00:00',strtotime($_POST['last_paid_date']));
$retStatus['status'] = $this->Company_model->updatePaymentDate($_POST);
if($retStatus['status']){
$data = $this->Company_model->getBrokerPayDetails($_POST['company_id']);
if(!isset($data[$_POST['broker_id']]) || empty($data[$_POST['broker_id']])){
$retStatus['status'] = 0;
} else {
$data[$_POST['broker_id']]['last_paid_date'] = date('d-M-Y',strtotime($data[$_POST['broker_id']]['last_paid_date']));
$retStatus['data'] = $data[$_POST['broker_id']];
}
}
echo json_encode($retStatus);exit;
}
}
?>
\ No newline at end of file
application/controllers/Report.php
......@@ -23,8 +23,13 @@ class Report extends CI_Controller {
$template['page_desc'] = "Report Generation Page";
$template['page_title'] = "Report Management";
$template['company_data'] = $this->Company_model->getCompany();
$template['company_data'] = $this->Company_model->getCompany('','0,1');
$template['broker_data'] = '';
if($this->session->userdata['user_type'] != 1){
$this->load->model('Broker_model');
$template['broker_data'] = $this->Broker_model->getBroker('','0,1');
}
$this->load->view('template',$template);
}
......@@ -108,7 +113,8 @@ class Report extends CI_Controller {
if($this->session->userdata['user_type'] != 1){
$company_id = $this->session->userdata['id'];
$this->db->query("UPDATE `company_payment_details`
SET `report_count`=report_count+1
SET `report_count`=report_count+1,
`outstanding_amount`=outstanding_amount+report_charge
WHERE `company_id`=".$company_id);
}
//Download CSV\\
......
application/helpers/generals_helper.php
......@@ -112,4 +112,25 @@ function decode_param($param = ''){
$decode = trim(base64_decode(urldecode($decode)),'{*}');
return $decode;
}
function getLatLngFromLocation($location = ''){
if(empty($location))
return 0;
$thisObj = & get_instance();
$locData = file_get_contents("https://maps.google.com/maps/api/geocode/json?address=".
urlencode($location).
"&sensor=false&key=".$thisObj->session->userdata['settings']['google_api_key']);
if(empty($locData))
return 0;
$loc_data = json_decode($locData);
if(empty($loc_data) || !isset($loc_data->status) || $loc_data->status != 'OK')
return 0;
$locArr['lat'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lat'};
$locArr['lng'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lng'};
if(empty($locArr['lat']) || empty($locArr['lng']))
return 0;
return $locArr;
}
?>
\ No newline at end of file
application/models/Broker_model.php
......@@ -21,10 +21,15 @@ class Broker_model extends CI_Model {
return ($status)?1:0;
}
function getBroker($broker_id = ''){
$cond = (!empty($broker_id))?" AND broker_id = '$broker_id'":"";
function getBroker($broker_id = '', $status = '1', $company_id = ''){
$cond = (!empty($broker_id))?" AND BRK.broker_id = '$broker_id'":"";
$cond .= (!empty($company_id))?" AND BRK.company_id = '$company_id'":"";
$status = ($status == '')?'1':$status;
$result = $this->db->query("SELECT * FROM brokers WHERE status IN (0,1) $cond");
$result = $this->db->query("SELECT BRK.*,CMP.company_name
FROM brokers AS BRK
INNER JOIN company AS CMP ON (CMP.company_id = BRK.company_id)
WHERE BRK.status IN ($status) $cond");
if(empty($result)){
return;
}
......
application/models/Company_model.php
......@@ -20,6 +20,12 @@ class Company_model extends CI_Model {
$status = $this->db->insert('company',array('company_id'=>$company_id,'company_name'=>$company_data['company_name'],'address'=>$company_data['address'],'phone'=>$company_data['phone'],'fax'=>$company_data['fax'],'email_id'=>$company_data['email_id'],'company_contact'=>$company_data['company_contact'],'company_info'=>$company_data['company_info'],'company_federal_id'=>$company_data['company_federal_id']));
$this->db->insert('company_offers',
array('offer_type'=>'3','company_id'=>$company_id,'applicable_on'=>'0',
'activation_date'=>strtotime(date('d-M-y')),
'expiry_date'=>strtotime('+30 days',strtotime((date('d-M-y')))),
'status'=>'1'));
$this->db->insert('company_payment_details',array('company_id'=>$company_id,'booking_charge'=>$company_data['booking_charge'],'sms_charge'=>$company_data['sms_charge'],'push_charge'=>$company_data['push_charge'],'report_charge'=>$company_data['report_charge']));
return ($status)?1:0;
......@@ -27,14 +33,14 @@ class Company_model extends CI_Model {
return 0;
}
function getCompany($company_id = ''){
function getCompany($company_id = '',$status = '1'){
$cond = (!empty($company_id))?" AND CMP.company_id = '$company_id'":"";
$sql = "SELECT CMP.*,AU.*,CPAY.*
FROM company AS CMP
INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id)
INNER JOIN company_payment_details AS CPAY ON (CPAY.company_id = CMP.company_id)
WHERE AU.status IN (0,1) $cond";
WHERE AU.status IN ($status) $cond";
$result = $this->db->query($sql);
if(empty($result)){
return;
......@@ -71,12 +77,14 @@ class Company_model extends CI_Model {
return 0;
}
function getOfferData(){
function getOfferData($offer_type = '1,2'){
$cond = " AND COF.offer_type IN (".$offer_type.") ";
$sql = "SELECT CMP.*, COF.*
FROM company AS CMP
INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id)
INNER JOIN company_offers AS COF ON (CMP.company_id = COF.company_id)
WHERE AU.status = '1' AND COF.status != '2'
WHERE AU.status = '1' AND COF.status != '2' ".$cond."
ORDER BY CMP.company_name";
$result = $this->db->query($sql);
......@@ -90,7 +98,21 @@ class Company_model extends CI_Model {
if(empty($offer_id)){
return 0;
}
if($status == 2){
$offrData = $this->db->get_where('company_offers',array('id'=>$offer_id));
if(!empty($offrData) && !empty($offrData = $offrData->row_array()) &&
isset($offrData['expiry_date']) && !empty($offrData['expiry_date']) &&
isset($offrData['activation_date']) && !empty($offrData['activation_date']) &&
$offrData['activation_date'] < strtotime(date('d-M-y')) &&
$offrData['expiry_date'] > strtotime(date('d-M-y'))){
$this->db->update('company_offers', array('expiry_date'=>strtotime(date('d-M-y'))),
array('id'=>$offer_id));
}
}
$status = $this->db->update('company_offers',array('status'=>$status), array('id'=>$offer_id));
return ($status)?1:0;
}
......@@ -129,5 +151,63 @@ class Company_model extends CI_Model {
}
return $result->row();
}
function getBrokerPayDetails($company_id = ''){
if(empty($company_id)){
return 0;
}
$qryResp = $this->db->query("SELECT DISTINCT(TD.broker_id),BRK.*,BKR_PAY.last_paid_date
FROM transport_details AS TD
INNER JOIN brokers AS BRK ON (BRK.broker_id = TD.broker_id)
LEFT JOIN broker_payment_details AS BKR_PAY ON
(BKR_PAY.broker_id = TD.broker_id AND
BKR_PAY.company_id = TD.company_id AND BKR_PAY.status = '1')
WHERE TD.company_id = '".$company_id."'");
if(empty($qryResp)){
return 0;
}
$tmpData = array();
$brkPayData = array();
$qryResp = $qryResp->result_array();
foreach ($qryResp AS $brkData) {
$tmpData = $brkData;
$data = $this->db->get_where('transport_details',array('broker_id' => $brkData['broker_id'],
'company_id' => $company_id));
$tmpData['all_trans_count'] = (!empty($data->num_rows()))?$data->num_rows():'0';
$data = $this->db->get_where('transport_details',array('broker_id'=>$brkData['broker_id'],
'company_id'=>$company_id,
'status !='=>'2','is_scheduled'=>'1'));
$tmpData['pro_trans_count'] = (!empty($data->num_rows()))?$data->num_rows():'0';
$tmpData['pending_trans_count'] = $tmpData['pro_trans_count'];
if(!empty($brkData['last_paid_date'])){
$data = $this->db->get_where('transport_details',
array('broker_id'=>$brkData['broker_id'],
'company_id'=>$company_id,
'status !='=>'2','is_scheduled'=>'1',
'created_date >='=> $brkData['last_paid_date']));
$tmpData['pending_trans_count'] = (!empty($data->num_rows()))?$data->num_rows():'0';
}
$tmpData['encoded_broker_id'] = encode_param($brkData['broker_id']);
$brkPayData[$brkData['broker_id']] = $tmpData;
}
return $brkPayData;
}
public function updatePaymentDate($data = array()){
if(empty($data) || !isset($data['broker_id']) || !isset($data['last_paid_date']) ||
!isset($data['company_id']) || empty($data['company_id']) || empty($data['broker_id']) ||
empty($data['last_paid_date'])){
return 0;
}
$this->db->update('broker_payment_details',array('status'=>'2'),
array('broker_id'=>$data['broker_id'],'company_id'=>$data['company_id']));
$status = $this->db->insert('broker_payment_details',$data);
return ($status)?1:0;
}
}
?>
\ No newline at end of file
application/models/Customer_model.php
......@@ -18,7 +18,7 @@ class Customer_model extends CI_Model {
return (empty($customer_data))?$result->result():$result->row();
}
function createCustomer($customer_data = array()){
function createCustomer($customer_data = array(), $ret_customer_id = 0){
if(empty($customer_data))
return 0;
......@@ -36,7 +36,10 @@ class Customer_model extends CI_Model {
}
$status = $this->db->insert('customers',$customer_data);
return ($status)?1:0;;
if($status && $ret_customer_id == 1){
return $this->db->insert_id();
}
return ($status)?1:0;
}
function updateCustomer($customer_id = '', $customer_data = array()){
......@@ -57,7 +60,7 @@ class Customer_model extends CI_Model {
}
$status = $this->db->update('customers',$customer_data,array('customer_id'=>$customer_id));
return ($status)?1:0;;
return ($status)?1:0;
}
function changeStatus($customer_id = '', $status = '0'){
......
application/models/Driver_model.php
......@@ -21,20 +21,23 @@ class Driver_model extends CI_Model {
return ($status)?1:0;
}
function getDriver($driver_id = ''){
function getDriver($driver_id = '',$status = '1',$company_id = ''){
$cond = '';
$user_id = $this->session->userdata('id');
if($this->session->userdata('user_type') != 1){
$cond = " AND CMP.company_id = '$user_id'";
}
$cond .= (!empty($driver_id))?" AND DRV.driver_id = '$driver_id'":"";
$cond .= (!empty($company_id))?" AND DRV.company_id = '$company_id'":"";
$sql = "SELECT DRV.*, CMP.company_name, VH.vehicle_type
$sql = "SELECT DRV.*, CMP.company_name, VH.vehicle_type, VHS.vehicle_model, VHS.vehicle_reg_no,
VHS.vehicle_reg_image, VHS.model
FROM drivers AS DRV
INNER JOIN company AS CMP ON (CMP.company_id = DRV.company_id)
INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id)
LEFT JOIN vehicles AS VH ON (VH.vehicle_id = DRV.vehicle_id)
WHERE DRV.status IN (0,1) AND AU.status = '1' $cond";
LEFT JOIN vehicles AS VHS ON (VHS.vehicle_id = DRV.vehicle)
LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = DRV.vehicle_id)
WHERE DRV.status IN ($status) AND AU.status = '1' $cond";
$result = $this->db->query($sql);
if(empty($result)){
return;
......@@ -62,20 +65,20 @@ class Driver_model extends CI_Model {
if(!empty($phoneChk) && $phoneChk->num_rows() > 0){
return 3;
}
$upArr = array('first_name'=>$driver_data['first_name'],'last_name'=>$driver_data['last_name'],'email_id'=>$driver_data['email_id'],'phone'=>$driver_data['phone']);
if(!empty($driver_data['profile_image'])){
$upArr['profile_image'] = $driver_data['profile_image'];
if(empty($driver_data['licence'])){
unset($driver_data['licence']);
}
if(!empty($driver_data['licence'])){
$upArr['licence'] = $driver_data['licence'];
if(empty($driver_data['company_id'])){
unset($driver_data['company_id']);
}
if(!empty($driver_data['company_id'])){
$upArr['company_id'] = $driver_data['company_id'];
if(empty($driver_data['vehicle_id'])){
unset($driver_data['vehicle_id']);
}
if(!empty($driver_data['vehicle_id'])){
$upArr['vehicle_id'] = $driver_data['vehicle_id'];
if(empty($driver_data['profile_image'])){
unset($driver_data['profile_image']);
}
$status = $this->db->update('drivers', $upArr, array('driver_id'=>$driver_id));
$status = $this->db->update('drivers', $driver_data, array('driver_id'=>$driver_id));
return ($status)?1:0;
}
......
application/models/Report_model.php
......@@ -14,6 +14,9 @@ class Report_model extends CI_Model {
if(!empty($where_cond['company_id'])){
$where_clause = " WHERE TDLS.company_id = '".$where_cond['company_id']."' ";
}
if(!empty($where_cond['broker_id'])){
$where_clause = " WHERE TDLS.broker_id = '".$where_cond['broker_id']."' ";
}
if(!empty($where_cond['start_date']) && !empty($where_cond['end_date'])){
$where_clause .= (empty($where_clause))?' WHERE ':' AND ';
......@@ -43,7 +46,7 @@ class Report_model extends CI_Model {
$sql = "SELECT ".$fields."
FROM transport_details AS TDLS
LEFT JOIN drivers AS DRV ON (DRV.driver_id = TDLS.assigned_driver)
LEFT JOIN vehicles AS VEH ON (VEH.vehicle_id = DRV.vehicle_id)
LEFT JOIN vehicle_types AS VEH ON (VEH.vehicle_id = DRV.vehicle_id)
LEFT JOIN company AS CMP ON (CMP.company_id = TDLS.company_id)
LEFT JOIN company_payment_details AS CPAY ON (CPAY.company_id = TDLS.company_id)
LEFT JOIN brokers AS BRKR ON (BRKR.broker_id = TDLS.broker_id)
......
application/models/Ride_model.php
......@@ -60,9 +60,9 @@ class Ride_model extends CI_Model {
FROM transport_details AS TD
LEFT JOIN brokers AS BK ON (TD.broker_id = BK.broker_id)
LEFT JOIN drivers AS DV ON (DV.driver_id = TD.assigned_driver)
LEFT JOIN vehicles AS VH ON (VH.vehicle_id = TD.vehicle_type)
LEFT JOIN trip_type AS TT ON (TT.trip_id = TD.trip_type)
LEFT JOIN trip_status AS TS ON (TS.trip_status_id = TD.trip_status)
LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = TD.vehicle_type)
LEFT JOIN appointment_reason AS AR ON (AR.reason_id = TD.reason_code)
WHERE TD.status != '2' ".$cond."
ORDER BY TD.transport_id DESC";
......@@ -126,12 +126,16 @@ class Ride_model extends CI_Model {
if(empty($ride_id)){
return;
}
$status = $this->db->update('transport_details',
array('is_scheduled'=>$is_scheduled),
array('transport_id'=>$ride_id));
$upArr = array('is_scheduled'=>$is_scheduled);
if($is_scheduled == 0){
$upArr['status'] = '0';
$upArr['assigned_driver'] = '0';
$upArr['driver_assign_status'] = NULL;
$this->deleteAssignedRider($ride_id);
}
$status = $this->db->update('transport_details',$upArr,array('transport_id'=>$ride_id));
return $status;
}
......@@ -143,16 +147,19 @@ class Ride_model extends CI_Model {
$this->db->delete('ride_status',array('ride_id'=>$ride_id));
}
function autoAssignDriver($ride_id = '',$appointment_time = '', $pickupLoc = array()){
if(empty($ride_id) || empty($appointment_time) || empty($pickupLoc) || !isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) || $pickupLoc['lng'] == ''){
function autoAssignDriver($ride_id = '', $appointment_time = '', $pickupLoc = array(),
$drivers = array(), $no_driver = '0'){
if(empty($ride_id) || empty($appointment_time) || empty($drivers) || empty($pickupLoc) ||
!isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) ||
$pickupLoc['lng'] == '' ){
return;
}
$time = date("G:i",$appointment_time);
$date = date("d-m-y",$appointment_time);
$date = date("d-m-Y",$appointment_time);
$endTime = date("G:i",strtotime($time) + 60 * 60);
$startTime = date("G:i",strtotime($time) - 60 * 60);
$startTime = date("G:i",strtotime($time) - 90 * 60);
$endDateTime = strtotime($date.' '.$endTime);
$startDateTime = strtotime($date.' '.$startTime);
......@@ -161,44 +168,44 @@ class Ride_model extends CI_Model {
FROM transport_details AS TD
WHERE TD.driver_assign_status='0' AND TD.assigned_driver<>'0' AND TD.is_scheduled='1' AND
TD.appointment_time>$startDateTime AND TD.appointment_time<$endDateTime AND
TD.status IN (4,5,8)";
TD.status IN (4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")";
$prvDrivers = $this->db->query($sql);
if(empty($prvDrivers)){
return 0;
}
$driverCond = '';
if($prvDrivers->num_rows() > 0){
$prvDrivers = $prvDrivers->row_array();
$driverCond = (isset($prvDrivers['assigned_drivers']) && !empty($prvDrivers['assigned_drivers']))?
'AND DRV.driver_id NOT IN ('.$prvDrivers['assigned_drivers'].')':'';
if(!empty($prvDrivers) && $prvDrivers->num_rows() > 0 &&
!empty($prvDrivers = $prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) &&
!empty($prvDrivers['assigned_drivers'])){
$prvDrivers = explode(',',$prvDrivers['assigned_drivers']);
$drivers = array_diff($drivers,$prvDrivers);
}
$sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.lat_driver)*
pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.lat_driver*pi()/180)*
POWER(SIN((".$pickupLoc['lng']."-DRV.lng_driver)*pi()/180/2),2))) AS distance
if(!empty($drivers)){
$sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.active_loc_lat)*
pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.active_loc_lat*pi()/180)*
POWER(SIN((".$pickupLoc['lng']."-DRV.active_loc_lng)*pi()/180/2),2))) AS distance
FROM drivers AS DRV
WHERE DRV.status = 1 ".$driverCond."
HAVING distance < 25
WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).")
ORDER BY distance
LIMIT 0,1";
$driverData = $this->db->query($sql);
if(empty($driverData)){
return 0;
}
if($driverData->num_rows() > 0){
$nearByDriver = $driverData->row_array();
$nearByDriver = $nearByDriver['driver_id'];
if(!empty($driverData) && $driverData->num_rows() > 0 &&
!empty($nearByDriver = $driverData->row_array())){
$driver_id = $nearByDriver['driver_id'];
$status = $this->db->update('transport_details',
array('driver_assign_status'=>'0','assigned_driver'=>$nearByDriver,'status'=>'3'),
array('driver_assign_status'=>'0','assigned_driver'=>$driver_id,'status'=>'3'),
array('transport_id'=>$ride_id));
} else {
return $status;
}
}
$assignStatus = ($no_driver == '1')?'2':'1';
$status = $this->db->update('transport_details',
array('driver_assign_status'=>'1','status'=>'3'),
array('driver_assign_status'=>$assignStatus,'status'=>'3'),
array('transport_id'=>$ride_id));
}
return $status;
}
}
}
?>
\ No newline at end of file
application/models/Vehicle_model.php
......@@ -5,55 +5,89 @@ class Vehicle_model extends CI_Model {
parent::_construct();
}
public function addVehicle($vehicle_data = array()){
public function addVehicleType($vehicle_data = array()){
if(empty($vehicle_data)){
return 0;
}
$typeChk = $this->db->get_where('vehicles',array('vehicle_type'=>$vehicle_data['vehicle_type'],'status !='=>'2'));
$typeChk = $this->db->get_where('vehicle_types',array('vehicle_type'=>$vehicle_data['vehicle_type'],'status !='=>'2'));
if(!empty($typeChk) && $typeChk->num_rows() > 0){
return 2;
}
$status = $this->db->insert('vehicles',$vehicle_data);
$status = $this->db->insert('vehicle_types',$vehicle_data);
return ($status)?1:0;
}
function getVehicle($vehicle_id = ''){
function getVehicleType($vehicle_id = ''){
$cond = (!empty($vehicle_id))?" AND vehicle_id = '$vehicle_id'":"";
$result = $this->db->query("SELECT * FROM vehicles WHERE status IN (0,1) $cond");
$result = $this->db->query("SELECT * FROM vehicle_types WHERE status IN (0,1) $cond");
if(empty($result)){
return;
}
return (empty($vehicle_id))?$result->result():$result->row();
}
function changeStatus($vehicle_id = '', $status = '0'){
function changeVehicleTypeStatus($vehicle_id = '', $status = '0'){
if(empty($vehicle_id)){
return 0;
}
if($status == 2){
$status = $this->db->delete('vehicles',array('vehicle_id' => $vehicle_id));
$status = $this->db->delete('vehicle_types',array('vehicle_id' => $vehicle_id));
return $status;
}
$status = $this->db->update('vehicles',array('status'=>$status), array('vehicle_id'=>$vehicle_id));
$status = $this->db->update('vehicle_types',array('status'=>$status), array('vehicle_id'=>$vehicle_id));
return $status;
}
function updateVehicle($vehicle_id = '', $vehicle_data = array()){
function updateVehicleType($vehicle_id = '', $vehicle_data = array()){
if(empty($vehicle_id) || empty($vehicle_data)){
return 0;
}
$typeChk = $this->db->get_where('vehicles',array('vehicle_type'=>$vehicle_data['vehicle_type'],'status !='=>'2','vehicle_id !='=>$vehicle_id));
$typeChk = $this->db->get_where('vehicle_types',array('vehicle_type'=>$vehicle_data['vehicle_type'],'status !='=>'2','vehicle_id !='=>$vehicle_id));
if(!empty($typeChk) && $typeChk->num_rows() > 0){
return 2;
}
if(empty($vehicle_data['vehicle_photo'])){
unset($vehicle_data['vehicle_photo']);
}
$status = $this->db->update('vehicles',$vehicle_data,array('vehicle_id'=>$vehicle_id));
$status = $this->db->update('vehicle_types',$vehicle_data,array('vehicle_id'=>$vehicle_id));
return ($status)?1:0;
}
function createVehicle($vehicle_data = array()){
if(empty($vehicle_data)){
return 0;
}
$status = $this->db->insert("vehicles",$vehicle_data);
return ($status)?1:0;
}
function getVehiclesData($vehicle_id = '',$vechile_type = ''){
$cond = (!empty($vehicle_id))?" AND vehicle_id = '$vehicle_id'":"";
$cond = (!empty($vechile_type))?" AND vehicle_type = '$vechile_type'":"";
$result = $this->db->query("SELECT * FROM vehicles WHERE status IN (0,1) $cond");
if(empty($result)){
return;
}
return (empty($vehicle_id))?$result->result():$result->row();
}
function changeVehicleStatus($vehicle_id = '', $status = ''){
if(empty($vehicle_id) || $status == ''){
return 0;
}
$status = $this->db->update('vehicles',array('status'=>$status), array('vehicle_id'=>$vehicle_id));
return ($status)?1:0;
}
function updateVehicle($vehicle_id = '', $vehicle_data = array()){
if(empty($vehicle_id) || empty($vehicle_data)){
return 0;
}
$status = $this->db->update('vehicles',$vehicle_data, array('vehicle_id'=>$vehicle_id));
return ($status)?1:0;
}
}
?>
\ No newline at end of file
application/views/Broker/add_broker.php
......@@ -9,8 +9,8 @@
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
......@@ -26,28 +26,73 @@
<div class="box-header with-border">
<h3 class="box-title">Broker Details</h3>
</div>
<form role="form" action="<?=base_url('Broker/addBroker')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<form role="form" action="<?=base_url('Broker/addBroker')?>"
method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Broker Name</label>
<label>Broker Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Company Name">
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Broker Company Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label>Select Company</label>
<select name="company_id" class="form-control">
<option selected value="">All Company</option>
<?php
if(!empty($company_data)){
foreach ($company_data as $company) {
$chkFlg = ($company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
}
}
?>
</select>
</div>
<?php } else { ?>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Email</label>
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="broker_email" placeholder="Enter email ID">
data-parsley-minlength="2" required=""
name="broker_email" placeholder="Enter Broker email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Phone</label>
<label>Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="broker_phone" placeholder="Broker Phone">
data-parsley-minlength="2" required="" name="broker_phone" placeholder="Enter Broker Phone">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Broker Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>City</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required=""
name="city" placeholder="Enter City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>State</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="state" placeholder="Enter State">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-12" style="text-align: center;">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
......@@ -55,5 +100,6 @@
</div>
</form>
</div>
</div>
</section>
</div>
application/views/Broker/edit.php
......@@ -9,8 +9,8 @@
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
......@@ -26,28 +26,73 @@
<div class="box-header with-border">
<h3 class="box-title">Edit Driver Details</h3>
</div>
<form role="form" action="<?=base_url('Broker/update/'.encode_param($broker_id))?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<form role="form" action="<?=base_url('Broker/update/'.encode_param($broker_id))?>"
method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Broker Name</label>
<label>Broker Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->broker_name ?>" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Company Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label>Select Company</label>
<select name="company_id" class="form-control">
<option selected value="">All Company</option>
<?php
if(!empty($company_data)){
foreach ($company_data as $company) {
$chkFlg = ($broker_data->company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
}
}
?>
</select>
</div>
<?php } else { ?>
<input type="hidden" name="company_id" value="<?= $broker_data->company_id ?>">
<?php } ?>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Email</label>
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->broker_email ?>" required="" name="broker_email" placeholder="Enter email ID">
data-parsley-minlength="2" value="<?= $broker_data->broker_email ?>" required=""
name="broker_email" placeholder="Enter email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Phone</label>
<label>Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->broker_phone ?>" required="" name="broker_phone" placeholder="Broker Phone">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->address ?>" required="" name="address" placeholder="Enter Broker Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>City</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->city ?>" required=""
name="city" placeholder="Enter City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>Phone</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $broker_data->state ?>" required="" name="state" placeholder="Enter State">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-12" style="text-align: center;">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
......@@ -55,5 +100,6 @@
</div>
</form>
</div>
</div>
</section>
</div>
\ No newline at end of file
application/views/Broker/view_brokers.php
......@@ -33,11 +33,14 @@
<thead>
<tr>
<th class="hidden">ID</th>
<th width="150px;">Broker Name</th>
<th width="250px;">Email ID</th>
<th width="200px;">Phone</th>
<th width="150px;">Status</th>
<th width="300px;">Action</th>
<th width="90px;">Broker Name</th>
<th width="90px;">Company</th>
<th width="200px;">Email ID</th>
<th width="80px;">Phone</th>
<th width="100px;">Address</th>
<th width="50px;">City</th>
<th width="50px;">State</th>
<th width="120px;">Action</th>
</tr>
</thead>
<tbody>
......@@ -48,10 +51,14 @@
<tr>
<th class="hidden"><?= $broker->broker_id ?></th>
<td class="center"><?= $broker->broker_name ?></th>
<td class="center"><?= $broker->company_name ?></th>
<td class="center"><?= $broker->broker_email ?></th>
<td class="center"><?= $broker->broker_phone ?></th>
<td class="center"><?= ($broker->status == '1')?'Active':'Inactive'?></td>
<td class="center"><?= $broker->address ?></th>
<td class="center"><?= $broker->city ?></th>
<td class="center"><?= $broker->state ?></th>
<td class="center">
<div>
<a class="btn btn-sm btn-primary"
href="<?= base_url('Broker/edit/'.encode_param($broker->broker_id)) ?>">
<i class="fa fa-fw fa-trash"></i>Edit
......@@ -61,6 +68,8 @@
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
</div>
<div style="text-align: center; padding-top: 2px;">
<?php if($broker->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
......@@ -70,6 +79,7 @@
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
</div>
</td>
</tr>
<?php }
......
application/views/Company/create_offer.php
......@@ -29,7 +29,7 @@
<form role="form" action="<?=base_url('Company/addOffer')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-12">
<div class="col-md-4">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
......@@ -44,7 +44,21 @@
</select>
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Offer Applicable For</label>
<select name="applicable_on" class="form-control required" data-parsley-trigger="change" required>
<option selected value="0">All Transactions</option>
<option value="1">Booking Charges</option>
<option value="2">SMS Charges</option>
<option value="3">Report Generation Charges</option>
<option value="4">Push Notification Charges</option>
</select>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Offer Activation Date</label>
<div class="input-group date" data-provide="datepicker">
......@@ -55,7 +69,7 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Offer Expiry Date</label>
<div class="input-group date" data-provide="datepicker">
......@@ -68,32 +82,34 @@
</div>
</div>
<div class="col-md-12">
<div class="col-md-4">
<div class="col-md-6" style="margin-bottom:27px;">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Offer Type</label>
<div class="input-group">
<div class="col-md-12">
<div class="col-md-4">
<input type="radio" name="offer_type" value="1" class="required" required checked>
&nbsp;&nbsp;Free Trial&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Free Trial
</div>
<div class="col-md-8">
<input type="radio" name="offer_type" value="2" class="required" required >
&nbsp;&nbsp;Discount&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Discount
</div>
</div>
</div>
</div>
<div class="col-md-4" id="input_discount">
<div class="col-md-6" id="input_discount">
<!-- Discount Text Box -->
</div>
</div>
<div class="col-md-12">
<div class="box-footer">
<div class="box-footer" style="text-align:center;">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div>
</section>
</div>
</div>
<div id="discount_input_html" class="hide">
<div class="form-group has-feedback" >
......
application/views/Company/offer_list_page.php
......@@ -33,10 +33,11 @@
<thead>
<tr>
<th width="120px;">Company Name</th>
<th width="150px;">Offer Type</th>
<th width="100px;">Offer Type</th>
<th width="150px;">Applicable For</th>
<th width="150px;">Offer Period</th>
<th width="120px;">Status</th>
<th width="150px;">Action</th>
<th width="50px;">Action</th>
</tr>
</thead>
<tbody>
......@@ -47,10 +48,25 @@
<tr>
<td class="center"><b><?= $offer->company_name ?></b></th>
<td class="center">
<?=
($offer->offer_type==1)?'Free Trail':$offer->discount.'% Discount Per Booking'
<?php
switch($offer->offer_type){
case 1: echo "Free Trail"; break;
case 2: echo $offer->discount."% Discount Per Booking"; break;
case 3: echo "Activation Pack <br> (Free Trial for 30 Days)"; break;
}
?>
</th>
<td class="center">
<?php
switch($offer->applicable_on){
case 0: echo "All Transactions"; break;
case 1: echo "Booking Charges"; break;
case 2: echo "SMS Charges"; break;
case 3: echo "Report Generation Charges"; break;
case 4: echo "Push Notification Charges"; break;
}
?>
</td>
<td class="center"><b><?= date("d-M-y",$offer->activation_date).' - '.date("d-M-y",$offer->expiry_date) ?></b></th>
<td class="center">
<strong>
......@@ -72,15 +88,6 @@
href="<?= base_url("Company/changeOfferStatus/".encode_param($offer->id))."/2" ?>"onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($offer->status == 1){ ?>
<a class="btn btn-sm btn-primary" style="width:100px;background-color:#ac2925;" href="<?= base_url("Company/changeOfferStatus/".encode_param($offer->id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" style="width:100px;" href="<?= base_url("Company/changeOfferStatus/".encode_param($offer->id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
</td>
</tr>
<?php }
......@@ -91,3 +98,15 @@
</div>
</section>
</div>
<!-- <?php if($offer->status == 1){ ?>
<a class="btn btn-sm btn-primary" style="width:100px;background-color:#ac2925;" href="<?= base_url("Company/changeOfferStatus/".encode_param($offer->id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" style="width:100px;" href="<?= base_url("Company/changeOfferStatus/".encode_param($offer->id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?> -->
\ No newline at end of file
application/views/Company/view.php
......@@ -63,7 +63,7 @@
</label>
</div>
</div>
<div class="col-md-3">
<div class="col-md-5">
<div class="form-group has-feedback">
<span style="padding-right: 108px;">Fax </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
......@@ -89,7 +89,6 @@
</label>
</div>
</div>
<div class="col-md-3"> </div>
</div>
<div class="col-md-12" style="padding-bottom: 15px;">
<div class="col-md-12 box-header with-border"><h4>Payment Charges</h4></div>
......@@ -110,7 +109,7 @@
</label>
</div>
</div>
<div class="col-md-3">
<div class="col-md-5">
<div class="form-group has-feedback">
<span style="padding-right: 50px;">Push Notification Charge </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
......@@ -124,7 +123,6 @@
</label>
</div>
</div>
<div class="col-md-3"> </div>
</div>
</div>
</div>
......
application/views/Customer/add-customer-user.php
......@@ -28,7 +28,7 @@
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Customer Personal Details</h3>
<h3 class="box-title">Personal Details</h3>
</div>
<form role="form" action="<?=base_url($redirectUrl)?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
......@@ -38,7 +38,7 @@
<label>First Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$"
required="" name="first_name" placeholder="Enter Customer First Name"
required="" name="first_name" placeholder="Enter Patient First Name"
value="<?= (isset($customer_data) && isset($customer_data->first_name))?$customer_data->first_name:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
......@@ -47,7 +47,7 @@
<div class="form-group has-feedback">
<label>Last Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Customer Last Name"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Patient Last Name"
value="<?= (isset($customer_data) && isset($customer_data->last_name))?$customer_data->last_name:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
......@@ -60,7 +60,7 @@
<div class="form-group has-feedback">
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email" placeholder="Enter Customer Email"
data-parsley-minlength="2" required="" name="email" placeholder="Enter Patient Email"
value="<?= (isset($customer_data) && isset($customer_data->email))?$customer_data->email:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
......@@ -69,7 +69,7 @@
<div class="form-group has-feedback">
<label>Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Customer Phone"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Patient Phone"
value="<?= (isset($customer_data) && isset($customer_data->phone))?$customer_data->phone:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
......@@ -106,7 +106,7 @@
<div class="form-group has-feedback">
<label>Address</label>
<textarea class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Customer Address"><?= (isset($customer_data) && isset($customer_data->address))?trim($customer_data->address):'' ?></textarea>
data-parsley-minlength="2" required="" name="address" placeholder="Enter Patient Address"><?= (isset($customer_data) && isset($customer_data->address))?trim($customer_data->address):'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
......@@ -131,7 +131,7 @@
<div style="border-bottom: 1px solid #f4f4f4;border-bottom-width: 1px;border-bottom-style: solid;
border-bottom-color: rgb(244, 244, 244);">
<h3 class="box-title" style="font-size: 18px !important;">
Customer Medical Details
Medical Details
</h3>
</div><br>
......@@ -213,91 +213,3 @@
</div>
</section>
</div>
\ No newline at end of file
<!-- <div class="form-group has-feedback">
<label>Last Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Phone Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>Password</label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div> -->
<!-- <div class="col-md-6">
<div class="form-group">
<label>Profile Picture</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="profile_image" src="" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="profile_image" type="file" accept="image/*" class="required" onchange="setImg(this,'profile_image')" />
</div>
</div>
</div>
<div class="form-group">
<label style="padding-top:10px;">Licence</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="licence_img" src="" onerror="this.src='<?=base_url("assets/images/no_image.png")?>'" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="licence" type="file" accept="image/*" class="required" onchange="setImg(this,'licence_img')" />
</div>
</div>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label style="padding-top:12px;">Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Company</option>
<?php
if(!empty($companies)){
foreach ($companies as $company) {
echo '<option value="'.$company->company_id.'">'.$company->company_name.'</option>';
}
}
?>
</select>
</div>
<?php }else{ ?>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group">
<label>Select Vehicle</label>
<select name="vehicle_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Type</option>
<?php
if(!empty($vehicles)){
foreach ($vehicles as $vehicle) {
echo '<option value="'.$vehicle->vehicle_id.'">'.$vehicle->vehicle_type.'</option>';
}
}
?>
</select>
</div>
</div> -->
\ No newline at end of file
application/views/Customer/list-customer-users.php
......@@ -95,7 +95,7 @@
if(customer_id=='' || customer_id==undefined || customer_id=='undefined' || customer_id==null || customer_id=='null'){
return true;
}
modalTrigger('Ride Details','');
modalTrigger('Patient Details','');
addModalLoader();
jQuery.ajax({
url : base_url+"Customer/getCustomerData",
......@@ -116,9 +116,10 @@
var customer_data = resp_data['customer_data'];
// Direct HTML
var html = '<div class="col-xs-12"><div class="col-md-2"> '+
var html = '<div class="col-xs-12">'+
'<div class="col-md-2"> '+
'<div class="form-group has-feedback"> '+
'<img id="customerProfileImg" src="'+base_url+customer_data['profile_image']+'" '+
'<img id="customerProfileImg" src="'+base_url+customer_data['profile_image']+'"'+
'height="100" width="100" /> '+
'</div> '+
'</div> '+
......@@ -167,7 +168,6 @@
'</div> '+
'</div> '+
'<div class="col-md-5"> '+
'<div class="form-group has-feedback"> '+
'<span style="padding-right: 56px;">Last Name </span> : '+
......
application/views/Driver/add_driver.php
......@@ -29,45 +29,82 @@
<form role="form" action="<?=base_url('Driver/addDriver')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">First Name</label>
<div class="form-group">
<label>First Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="first_name" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Last Name</label>
<div class="form-group">
<label>Last Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Phone</label>
<label>Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Phone Number">
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Driver Phone Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Email</label>
<div class="form-group">
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter email ID">
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter Driver email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Password</label>
<div class="form-group">
<label>Password</label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
<div class="form-group">
<label>Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Driver Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>City</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required=""
name="city" placeholder="Enter Driver City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>State</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="state" placeholder="Enter Driver State">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Online Timing</label>
<div style="display: flex;">
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-right: 5px;width: 50%;">
<div class="input-group date" id='online_start_time'>
<input type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="online_start_time" placeholder="Pick Online Check In Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-left: 5px;width: 50%;">
<div class="input-group date" id='online_end_time'>
<input type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="online_end_time" placeholder="Pick Online Check Out Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Profile Picture</label>
<label>Profile Picture</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="profile_image" src="" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
......@@ -78,7 +115,7 @@
</div>
</div>
<div class="form-group">
<label for="exampleInputEmail1" style="padding-top:10px;">Licence</label>
<label style="padding-top:10px;">Licence</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="licence_img" src="" onerror="this.src='<?=base_url("assets/images/no_image.png")?>'" height="75" width="75" />
......@@ -88,9 +125,30 @@
</div>
</div>
</div>
<div class="form-group">
<label style="padding-top:12px;">Licence Number</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="licence_number" placeholder="Enter Driver Licence Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Licence Expiry Date</label>
<div class="input-group date" data-provide="datepicker">
<input id="datepicker" type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="licence_exp_date" placeholder="Pick Licence Expiry Date" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
</div>
</div>
<div class="form-group">
<label>Active Location</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required=""
id="pickup_location" name="active_location" placeholder="Select Active Location">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label for="exampleInputEmail1" style="padding-top:12px;">Company</label>
<label>Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Company</option>
<?php
......@@ -106,7 +164,7 @@
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group">
<label for="exampleInputEmail1">Select Vehicle</label>
<label>Select Vehicle Type</label>
<select name="vehicle_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Type</option>
<?php
......@@ -118,6 +176,17 @@
?>
</select>
</div>
<div id="vehicleModelCont" class="form-group hide">
<label>Select Vehicle Model</label>
<select name="vehicle" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Model</option>
</select>
</div>
</div>
<div class="col-md-12" style="text-align: center; padding-top: 20px;">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div>
......
application/views/Driver/driver_list.php
......@@ -83,8 +83,8 @@
</td>
</tr>
<?php
if(!empty($driver->lat_driver) && !empty($driver->lng_driver))
$drvLatLng = $driver->lat_driver.','.$driver->lng_driver;
if(!empty($driver->active_loc_lat) && !empty($driver->active_loc_lng))
$drvLatLng = $driver->active_loc_lat.','.$driver->active_loc_lng;
$mapLocData[]=array('DisplayText'=>$driver->first_name.' '.$driver->last_name,
'MarkerId'=>base_url('assets/images/mapCarIconPref.png'),
......@@ -137,11 +137,15 @@
icon: people["MarkerId"]
});
google.maps.event.addListener(marker, 'click', function(event) {
markCalBak(people["driver_id"]);
});
google.maps.event.addListener(marker, 'mouseout', function(event) {
infowindow.close(map, this);
});
google.maps.event.addListener(marker, 'mouseover', function(event) {
infowindow.setContent(this.html);
infowindow.setPosition(event.latLng);
infowindow.open(map, this);
markCalBak(people["driver_id"]);
});
}
}
......@@ -231,12 +235,20 @@
'</div> '+
'<div class="col-md-5"> '+
'<div class="form-group"> '+
'<span style="padding-right: 35px;">Online Timing </span> : '+
'<label style="padding-left: 10px;">'+driver_data['online_time']+' </label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 27px;">Active Location </span> : '+
'<label style="padding-left: 10px;">'+driver_data['active_location']+'</label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 50px;">Licence No. </span> : '+
'<label style="padding-left: 10px;"> '+driver_data['licence_number']+' </label> '+
'<label style="padding-left: 10px;"> '+driver_data['licence_number']+' </label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 33px;">Licence Expiry </span> : '+
'<label style="padding-left: 10px;"> '+driver_data['licence_exp_date']+' </label> '+
'<label style="padding-left: 10px;">'+driver_data['licence_exp_date']+'</label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 37px;">Licence Proof </span> : '+
......@@ -248,7 +260,7 @@
'</div> '+
'</div>'+
'<div style="text-align:center;">'+
'<a href="'+base_url+'Driver/view/'+driver_id+'">View More</a>'+
'<a href="'+base_url+'Driver/view/'+driver_id+'">View</a>'+
'</div>';
remModalLoader();
......
application/views/Driver/view.php
......@@ -24,7 +24,9 @@
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<div class="col-md-6"><h3 class="box-title">Driver Details</h3></div>
<div class="col-md-6">
<h3 class="box-title">Driver Details</h3>
</div>
<div class="col-md-6" align="right">
<a class="btn btn-sm btn-primary" href="<?= base_url('Driver/edit/'.encode_param($driver_id)) ?>">Edit</a>
<a class="btn btn-sm btn-primary" href="<?= base_url('Driver/driver_list') ?>">Back</a>
......@@ -37,45 +39,118 @@
<img src="<?= base_url($driver_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="100" width="100" />
</div>
</div>
<div class="col-md-4">
<div class="col-md-5" style="width:380px;">
<div class="form-group has-feedback">
<span style="padding-right: 52px;">Name </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
<span style="padding-right: 73px;">Name </span> :
<label style="padding-left: 10px;">
<?= $driver_data->first_name.' '.$driver_data->last_name ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 38px;">Email ID </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
<span style="padding-right: 58px;">Email ID </span> :
<label style="padding-left: 10px;">
<?= $driver_data->email_id ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 49px;">Phone </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
<span style="padding-right: 69px;">Phone </span> :
<label style="padding-left: 10px;">
<?= $driver_data->phone ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 31px;">Company </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
<span style="padding-right: 51px;">Company </span> :
<label style="padding-left: 10px;">
<?= $driver_data->company_name ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 45px;">Vechile </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
<span style="padding-right: 61px;">Address </span> :
<label style="padding-left: 10px;">
<?= $driver_data->address ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 85px;">City </span> :
<label style="padding-left: 10px;">
<?= $driver_data->city ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 78px;">State </span> :
<label style="padding-left: 10px;">
<?= $driver_data->state ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 35px;">Vehicle Type </span> :
<label style="padding-left: 10px;">
<?= $driver_data->vehicle_type ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 67px;">Vehicle </span> :
<label style="padding-left: 10px;">
<?= $driver_data->vehicle_model ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 28px;">Vehicle Model </span> :
<label style="padding-left: 10px;">
<?= $driver_data->model ?>
</label>
</div>
<div class="form-group has-feedback">
<span style="padding-right: 20px;">Vehicle Reg No. </span> :
<label style="padding-left: 10px;">
<?= $driver_data->vehicle_reg_no ?>
</label>
</div>
</div>
<div class="col-md-5">
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 40px;">Licence Proof :</span>
<span style="padding-right: 27px;">Active Location </span> :
</div>
<label>
<?= $driver_data->active_location ?>
</label>
</div>
<?php
$online_time = ' -- ';
if(!empty($driver_data->online_start_time) && !empty($driver_data->online_end_time)){
$online_time = date('G:i',$driver_data->online_start_time).' - '.date('G:i',$driver_data->online_end_time);
}?>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 34px;">Online Timing </span> :
</div>
<label>
<?= $online_time ?>
</label>
</div>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 50px;">Licence No. </span> :
</div>
<label >
<?= $driver_data->licence_number ?>
</label>
</div>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 34px;">Licence Expiry </span> :
</div>
<label >
<?= $driver_data->licence_exp_date ?>
</label>
</div>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 38px;">Licence Proof </span> :
</div>
<div class="col-md-7" style="height: 200px;">
<img id="licence_img" src="<?= base_url($driver_data->licence) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="100%" />
<img id="licence_img" src="<?= base_url($driver_data->licence) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" style="height:auto;width:100%;" />
</div>
</div>
</div>
......
application/views/Report/generate.php
......@@ -48,6 +48,21 @@
</div>
</div>
<?php }else{ ?>
<div class="col-md-3">
<div class="form-group ">
<label>Select Broker</label>
<select name="broker_id" class="form-control" data-parsley-trigger="change">
<option selected disabled>Select Broker</option>
<?php
if(!empty($broker_data)){
foreach ($broker_data as $broker) {
echo '<option value="'.$broker->broker_id.'">'.$broker->broker_name.'</option>';
}
}
?>
</select>
</div>
</div>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="col-md-3">
......
application/views/Ride/add_transport.php
......@@ -102,7 +102,7 @@
<span class="glyphicon form-control-feedback"></span>
</div>
<!-- 2 - 5 -->
<div class="form-group has-feedback">
<!-- <div class="form-group has-feedback">
<label>Trip Type</label>
<select name="trip_type" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Trip Type</option>
......@@ -114,7 +114,7 @@
}
?>
</select>
</div>
</div> -->
</div>
<div class="col-md-4">
<!-- 3 - 1 -->
......@@ -125,7 +125,7 @@
<span class="glyphicon form-control-feedback"></span>
</div>
<!-- 3 - 2 -->
<div class="form-group has-feedback">
<!-- <div class="form-group has-feedback">
<label>Preferred Driver</label>
<select name="driver_id" class="form-control" data-parsley-trigger="change">
<option selected>Select Preferred Driver (If any)</option>
......@@ -137,6 +137,19 @@
}
?>
</select>
</div> -->
<div class="form-group has-feedback">
<label>Trip Type</label>
<select name="trip_type" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Trip Type</option>
<?php
if(!empty($trip_type)){
foreach ($trip_type as $type) {
echo '<option value="'.$type->trip_id.'">'.$type->trip_type.'</option>';
}
}
?>
</select>
</div>
<!-- 3 - 3 -->
<div class="form-group has-feedback">
......@@ -226,7 +239,7 @@
<div class="col-md-4">
<div class="form-group has-feedback">
<label>Select NEMT Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required onchange="getBrokers(0,0)" id="searchCompanyDrop" >
<option selected disabled>Select Company</option>
<?php
if(!empty($company_data)){
......@@ -242,16 +255,18 @@
</div>
<?php }else{ ?>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="col-md-4">
<div class="form-group has-feedback">
<label>Choose Broker</label>
<select name="broker_id" class="form-control required" data-parsley-trigger="change" required>
<?php } $customCls = ($this->session->userdata['user_type'] == 1)?'disable-div':''; ?>
<div id="searchBrokerBlock" class="col-md-4 <?= $customCls ?>">
<div class="form-group">
<label>Choose Booking Source</label>
<select id="searchBrokerDrop" name="broker_id" class="form-control required">
<option selected disabled>Select Broker</option>
<?php
if(!empty($broker_data)){
if($this->session->userdata['user_type'] != 1 && !empty($company_data)){
foreach ($broker_data as $broker) {
echo '<option value="'.$broker->broker_id.'">'.$broker->broker_name.'</option>';
echo '<option value="'.$broker->broker_id.'">'.
$broker->broker_name.
'</option>';
}
}
?>
......
application/views/Ride/assign_driver.php
......@@ -33,7 +33,7 @@
<h3 class="box-title">Select Driver</h3>
</div>
<div "class="col-12">
<div id="map-canvas" style="width: 100%; height: 300px;"></div>
<div id="map-canvas-assign" style="width: 100%; height: 300px;"></div>
<div "class="col-xs-12">
<img src="<?=base_url('assets/images/mapPickupIcon.png')?>" style="padding-left:230px;">
Patient Pick Up
......@@ -116,7 +116,7 @@
zoom: 10,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
map = new google.maps.Map(document.getElementById("map-canvas"), mapOptions);
map = new google.maps.Map(document.getElementById("map-canvas-assign"), mapOptions);
var data = '<?= json_encode($mapLocData) ?>';
people = JSON.parse(data);
......
application/views/Ride/scheduled_rides.php
......@@ -62,13 +62,13 @@
<tr>
<th class="hidden">ID</th>
<th width="100px">Scheduled Time</th>
<th width="100px">Arrival Time</th>
<th width="70px">Arrival Time</th>
<th width="100px">Coustomer Name</th>
<th width="100px">Mobility</th>
<th width="100px">Pick Up Address</th>
<th width="100px">Drop Off Address</th>
<th width="100px">Rider Status</th>
<th width="40px">View</th>
<th width="30px">Mobility</th>
<th width="90px">Pick Up Address</th>
<th width="90px">Drop Address</th>
<th width="155px">Rider Status</th>
<th width="30px">View</th>
</tr>
</thead>
<tbody>
......@@ -83,23 +83,26 @@
<tr>
<th class="hidden"><?= $ride->transport_id ?></th>
<th class="center">
<?= date("d-m-y G:i",$ride->appointment_time) ?>
<?= date("d-m-y G:i",$ride->appointment_time - 60 * 60) ?>
</th>
<th class="center"></th>
<th class="center"><?= date("d-m-y G:i",$ride->appointment_time) ?></th>
<th class="center"><?= $ride->patient_name ?></th>
<th class="center"></th>
<th class="center">Med</th>
<th class="center"><?= $ride->pickup_location ?></th>
<th class="center"><?= $ride->drop_location ?></th>
<th class="center">
<?php
if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'Driver Cancelled & Auto Assigned to Dispatcher';
echo 'Driver Cancelled,<br> Auto Assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'No Driver Found, ride assigned to dispatcher';
echo 'No Driver Found,<br> Ride assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '2'){
echo 'No Driver Found,<br> Ride assigned to No Driver';
} else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 3){
echo 'Waiting for driver response : Driver Name '.$ride->assigned_driver_name;
echo 'Waiting for driver Approval<br>
Driver Name - '.$ride->assigned_driver_name;
} else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 4){
echo 'Driver Accepted : Driver Name '.$ride->assigned_driver_name;
echo 'Driver Accepted<br> Driver Name - '.$ride->assigned_driver_name;
}
?>
</th>
......
application/views/Templates/header-menu.php
......@@ -4,7 +4,7 @@
<!-- mini logo for sidebar mini 50x50 pixels -->
<!-- <span class="logo-mini"><b>B S</b></span>-->
<span class="logo-mini">
<img id="fav_icon" src="<?= base_url($this->session->userdata['settings']['site_logo']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="50" />
<img id="fav_icon" src="<?= base_url($this->session->userdata['settings']['fav_icon']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="50" width="50" />
</span>
<!-- logo for regular state and mobile devices -->
<!-- <span class="logo-lg"><b>Bus Solution</b></span>-->
......
application/views/Templates/header-script.php
......@@ -2,7 +2,11 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title><?=$this->session->userdata['settings']['title_short']?></title>
<link href="<?= base_url($this->session->userdata['settings']['fav_icon']) ?>" type="image/x-icon" />
<link rel="icon" href="<?= base_url($this->session->userdata['settings']['fav_icon'])?> "
type="image/x-icon"/>
<link rel="shortcut icon" href="<?= base_url($this->session->userdata['settings']['fav_icon']) ?>"
type="image/x-icon"/>
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
......
application/views/Templates/left-menu.php
......@@ -45,20 +45,20 @@
<li class="treeview">
<a href="#">
<i class="fa fa-bars" aria-hidden="true"></i>
<span>Customer Management</span>
<span>Patient Management</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li>
<a href="<?= base_url('Customer/addCustomerUser') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Add Customer
Add Patient
</a>
</li>
<li>
<a href="<?= base_url('Customer/listCustomerUsers') ?>">
<i class="fa fa-circle-o text-aqua"></i>
View Customer
View Patient
</a>
</li>
</ul>
......@@ -83,15 +83,21 @@
</a>
</li>
<li>
<a href="<?= base_url('Company/create_offer') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Create Offer
</a>
</li>
<li>
<a href="<?= base_url('Company/manager_offers') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Manage Offers
</a>
</li>
<li>
<a href="<?= base_url('Company/create_offer') ?>">
<a href="<?= base_url('Company/manager_offers/3') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Create New Offer
Veiw Activation Packs
</a>
</li>
</ul>
......@@ -134,7 +140,13 @@
<li>
<a href="<?= base_url('Vehicle/view_vehicles') ?>">
<i class="fa fa-circle-o text-aqua"></i>
View Vehicles
View Vehicle
</a>
</li>
<li>
<a href="<?= base_url('Vehicle/view_vehicle_types') ?>">
<i class="fa fa-circle-o text-aqua"></i>
Manage Vehicle Types
</a>
</li>
</ul>
......
application/views/Vehicle/add_vehicle.php
......@@ -9,11 +9,15 @@
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
<?php
$redirectUrl = (isset($vehicle_id) && !empty($vehicle_id))
?'Vehicle/updateVehicle/'.$vehicle_id
:'Vehicle/createVehicle';
if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
......@@ -26,41 +30,94 @@
<div class="box-header with-border">
<h3 class="box-title">Vehicle Details</h3>
</div>
<form role="form" action="<?=base_url('Vehicle/addVehicle')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<form role="form" action="<?=base_url($redirectUrl)?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type Code</label>
<div class="form-group">
<label>Vehicle Model</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_id" placeholder="Vehicle Type Code">
data-parsley-minlength="2" required="" name="vehicle_model" placeholder="Provide Vehicle Model" value="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_model))?$vehicle_data->vehicle_model:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_type" placeholder="Vehicle Type">
</div>
<div class="col-md-6">
<div class="form-group">
<label>Vehicle Type</label>
<select name="vehicle_type" class="form-control required" data-parsley-trigger="change" required="">
<option selected disabled>Choose Vechile Type</option>
<?php
if(!empty($vehicle_types)){
foreach ($vehicle_types as $type) {
$cond = (isset($vehicle_data) && isset($vehicle_data->vehicle_type) &&
!empty($vehicle_data->vehicle_type) &&
$vehicle_data->vehicle_type == $type->vehicle_id)?'selected':'';
echo '<option '.$cond.' value="'.$type->vehicle_id.'">'.
$type->vehicle_type.
'</option>';
}
}
?>
</select>
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label style="padding-top:13px;">Registration No.</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="vehicle_reg_no" placeholder="Enter Vehicle Registration Number" value="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_reg_no))?$vehicle_data->vehicle_reg_no:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Vehicle Photo</label>
<label>Registration Proof</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="vehicle_photo" src="" onerror="this.src='<?=base_url("assets/images/default_car.jpg")?>';" height="75" width="75" />
<img id="vehicle_reg_image" src="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_reg_image))?base_url($vehicle_data->vehicle_reg_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="vehicle_photo" type="file" accept="image/*" class="required" onchange="setImg(this,'vehicle_photo');" />
<input name="vehicle_reg_image" type="file" accept="image/*"
class="<?= (isset($vehicle_id) && !empty($vehicle_id))?'':'required' ?>"
onchange="setImg(this,'vehicle_reg_image')" />
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label>Model</label>
<select name="model" class="form-control required" data-parsley-trigger="change" onabort="" required="">
<option selected disabled>Choose Model</option>
<?php
for($year=(int)date('Y')-20; $year<=date('Y'); $year++){
$cond = (isset($vehicle_data) && isset($vehicle_data->model) &&
!empty($vehicle_data->model) &&
$vehicle_data->model == $year)?'selected':'';
echo '<option '.$cond.' value="'.$year.'">'.$year.'</option>';
}
?>
</select>
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
</div>
<div class="col-md-12">
<div class="box-footer">
<div style="text-align: center;">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file
application/views/Vehicle/add_vehicle_type.php 0 → 100644
<div class="content-wrapper">
<section class="content-header">
<h1>
<?= $page_title ?>
<small><?= $page_desc ?></small>
</h1>
<ol class="breadcrumb">
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
</div>
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Vehicle Details</h3>
</div>
<form role="form" action="<?=base_url('Vehicle/addVehicle')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type Code</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_id" placeholder="Vehicle Type Code">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_type" placeholder="Vehicle Type">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Vehicle Photo</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="vehicle_photo" src="" onerror="this.src='<?=base_url("assets/images/default_car.jpg")?>';" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="vehicle_photo" type="file" accept="image/*" class="required" onchange="setImg(this,'vehicle_photo');" />
</div>
</div>
</div>
</div>
</form>
</div>
</section>
</div>
\ No newline at end of file
application/views/Vehicle/edit_vehicle_type.php 0 → 100644
<div class="content-wrapper">
<section class="content-header">
<h1>
<?= $page_title ?>
<small><?= $page_desc ?></small>
</h1>
<ol class="breadcrumb">
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
</div>
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Edit Driver Details</h3>
</div>
<form role="form" action="<?=base_url('Vehicle/update/'.encode_param($vehicle_id))?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="box-body">
<div class="col-md-12">
<div class="col-md-3">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type Code</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_id" value="<?= $vehicle_data->vehicle_id ?>" placeholder="Vehicle Code">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-4">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_type" value="<?= $vehicle_data->vehicle_type ?>" placeholder="Vehicle Type">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-5">
<div class="form-group">
<label for="exampleInputEmail1">Vehicle Photo</label>
<div class="col-md-12">
<div class="col-md-3">
<img id="vehicle_photo" src="<?= base_url($vehicle_data->vehicle_photo) ?>" onerror="this.src='<?=base_url("assets/images/default_car.jpg")?>';" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="vehicle_photo" type="file" accept="image/*" onchange="setImg(this,'vehicle_photo');" />
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</div>
</form>
</div>
</section>
</div>
\ No newline at end of file
application/views/Vehicle/view_vehicle_types.php 0 → 100644
<div class="content-wrapper" >
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<?= $page_title ?>
<small><?= $page_desc ?></small>
</h1>
<ol class="breadcrumb">
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
</div>
<div class="col-xs-12">
<div class="box">
<div class="box-header with-border">
<div class="col-md-6">
<h3 class="box-title">View Broker Details</h3>
</div>
<div class="col-md-6" align="right">
<a class="btn btn-sm btn-primary" href="<?= base_url('Vehicle/add_vehicle_type') ?>">Add New</a>
<a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a>
</div>
</div>
<div class="box-body">
<table id="" class="table table-bordered table-striped datatable ">
<thead>
<tr>
<th width="40px;">Vehicle</th>
<th width="100px;">Vehicle Code</th>
<th width="100px;">Vehicle Type</th>
<th width="150px;">Status</th>
<th width="120px;">Action</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($vehicles_data)){
foreach($vehicles_data as $vehicle) {
?>
<tr>
<td class="center">
<img src="<?= base_url($vehicle->vehicle_photo) ?>" onerror="this.src='<?=base_url("assets/images/default_car.jpg")?>';" height="50" width="50" />
</th>
<th class="center"><?= $vehicle->vehicle_id ?></th>
<td class="center"><?= $vehicle->vehicle_type ?></th>
<td class="center"><?= ($vehicle->status == '1')?'Active':'Inactive'?></td>
<td class="center">
<a class="btn btn-sm btn-primary"
href="<?= base_url('Vehicle/edit/'.encode_param($vehicle->vehicle_id)) ?>">
<i class="fa fa-fw fa-trash"></i>Edit
</a>
<a class="btn btn-sm btn-danger"
href="<?= base_url("Vehicle/changeVehicleTypeStatus/".encode_param($vehicle->vehicle_id))."/2" ?>"
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($vehicle->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Vehicle/changeVehicleTypeStatus/".encode_param($vehicle->vehicle_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Vehicle/changeVehicleTypeStatus/".encode_param($vehicle->vehicle_id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
</td>
</tr>
<?php }
}?>
</tbody>
</table>
</div>
</div>
</section>
</div>
application/views/Vehicle/view_vehicles.php 0 → 100644
<div class="content-wrapper" >
<section class="content-header">
<h1>
<?= $page_title ?>
<small><?= $page_desc ?></small>
</h1>
<ol class="breadcrumb">
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li><?= $menu ?></li>
<li class="active"><?= $sub_menu ?></li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
</div>
<div class="col-xs-12">
<div class="box box-warning">
<div class="box-body">
<table id="driverTable" class="table table-bordered table-striped datatable ">
<thead>
<tr>
<th class="hidden">ID</th>
<th width="150px;">Vehicle Model</th>
<th width="80px;">model</th>
<th width="100px;">Vehicle Type</th>
<th width="200px;">Vehicle Registration</th>
<th width="50px;">Status</th>
<th width="500px;">Action</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($vehicle_data)){
foreach($vehicle_data as $vehicle) {
?>
<tr>
<th class="hidden"><?= $vehicle->vehicle_id ?></th>
<th class="center"><?= $vehicle->vehicle_model ?></th>
<td class="center"><?= $vehicle->model ?></th>
<td class="center"><?= $vehicle->vehicle_type ?></th>
<td class="center"><?= $vehicle->vehicle_reg_no ?></th>
<td class="center"><?= ($vehicle->status == '1')?'Active':'Inactive'?></td>
<td class="center">
<a class="btn btn-sm btn-primary" id="viewRegProof" img_src="<?= $vehicle->vehicle_reg_image ?>">
<i class="fa fa-fw fa-edit"></i>View Registration Proof
</a>
<a class="btn btn-sm btn-danger" href="<?= base_url('Vehicle/editVehicle/'.encode_param($vehicle->vehicle_id)) ?>">
<i class="fa fa-fw fa-trash"></i>Edit
</a>
<a class="btn btn-sm btn-danger" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/2" ?>"
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($vehicle->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
</td>
</tr>
<?php
}
}?>
</tbody>
</table>
</div>
</div>
</section>
</div>
<script type="text/javascript">
jQuery('[id="viewRegProof"]').on('click',function() {
var img_src = jQuery(this).attr('img_src');
modalTrigger('Registration Proof','');
addModalLoader();
html = '<div class="form-group has-feedback" style="text-align:center;"> '+
'<img id="proofImg" src="'+base_url+img_src+'" height="400px" width="auto" />'+
'</div>';
jQuery('[id="modal_content"]').html(html);
remModalLoader();
jQuery('[id="proofImg"]').error(function() {
jQuery('[id="proofImg"]').attr('src',base_url+'assets/images/no_image.png');
});
});
</script>
\ No newline at end of file
assets/css/custom-style.css
......@@ -307,3 +307,44 @@
pointer-events: none;
opacity: 0.5;
}
.disable-div {
-webkit-filter: blur(1px) !important;
pointer-events: none;
cursor: default;
text-decoration: none;
color: black;
}
.driver-list-body {
height: 120px;
}
.padLeft20 {
padding-left: 20px;
}
.padBottom10 {
padding-bottom: 10px;
}
.enable-no-driver {
padding-left:5px;
padding-bottom:5px;
color:#a51c1c;
}
.enable-nodriver-blk {
padding-left: 20px;
display: inline-block;
}
.select-all-input {
padding-left:5px;
padding-bottom:5px;
}
.driver-list-blk {
height: 80px;
overflow-y:scroll;
}
\ No newline at end of file
assets/js/nemt_custom.js
......@@ -166,8 +166,8 @@ function viewOrderDetails(key){
modalTrigger('Ride Details',body_html);
}
function getBrokerRides(){
jQuery('[id="getBrokerRides"]').submit();
function getRideData(){
jQuery('[id="getRideDataForm"]').submit();
}
function getCmpyPayDetls(){
......@@ -195,6 +195,50 @@ function remModalLoader(){
jQuery("[id='modal_content']").removeClass('relative height_200');
}
function getBrokers(allBrokerFlag,phoneBookingFlag){
var company_id = jQuery('[id="searchCompanyDrop"] option:selected').val();
if(company_id == '' || company_id == undefined || company_id == 'undefined' || company_id == null || company_id == 'null'){
jQuery('[id="searchBrokerBlock"]').addClass('disable-div');
}
jQuery.ajax({
url : base_url+"Broker/getBrokers",
type : 'POST',
data : {'company_id':company_id},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
return false;
}
var optionHtml = (allBrokerFlag == 1)?'<option selected value="">All Brokers</option>':'';
resp = jQuery.parseJSON(resp);
if(resp['status'] == 0){
return false;
}
if(resp['status'] == 1){
jQuery.each(resp['data'], function(index,value) {
optionHtml += '<option value="'+value['broker_id']+'">'+value['broker_name']+'</option>';
});
}
optionHtml += (phoneBookingFlag == 1)?'<option value="0">Phone Bookings</option>':'';
if(optionHtml == ''){
jQuery('[id="searchBrokerDrop"]').addClass('prevent-click');
optionHtml = '<option selected disabled>No Data Found</option>';
}
jQuery('[id="searchBrokerDrop"]').html(optionHtml);
jQuery('[id="searchBrokerBlock"]').removeClass('disable-div');
}
});
}
jQuery('[id="selectAllDriver"]').click(function(){
var thisObj = jQuery(this);
if(thisObj.prop("checked") == true){
jQuery('[id^="avlDriver_"]').prop("checked", true);
} else {
jQuery('[id^="avlDriver_"]').prop("checked", false);
}
});
jQuery('[id="scheduleAll"]').click(function(){
if(ride_ids==undefined || ride_ids=='undefined' || ride_ids==null || ride_ids=='null' || ride_ids==''){
return false;
......@@ -220,15 +264,31 @@ markAsScheduled(transport_id,is_scheduled);
});
function markAsScheduled(transport_id,is_scheduled){
if(transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == '' ||
is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == ''){
var drivers = [], no_driver = jQuery('[id="checkNoDriver"]:checked').val();
jQuery.each(jQuery("input[name^='avlDrivers[]']:checked"), function() {
drivers.push(jQuery(this).val());
});
no_driver = (no_driver == undefined || no_driver == 'undefined' || no_driver == null || no_driver == 'null' || no_driver == '')?'0':'1';
if(is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == '' ||
transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == ''){
return false;
}
if(is_scheduled == 0 && (drivers == undefined || drivers == 'undefined' || drivers == null || drivers == 'null' || drivers == '')){
slideTo('selectDriverBlock');
jQuery('[id="driverRequired"]').fadeIn(500);
setTimeout(function(){
jQuery('[id="driverRequired"]').fadeOut(1000);
}, 5000);
return false;
}
showFullScreenLoader();
jQuery.ajax({
url : base_url+"Ride/changeSchuduleStatus",
type : 'POST',
data : {'transport_id':transport_id,'is_scheduled':is_scheduled},
data : {'transport_id':transport_id,'is_scheduled':is_scheduled,'no_driver':no_driver,'drivers':drivers},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
remFullScreenLoader();
......@@ -367,3 +427,96 @@ jQuery('[id="upload_excell"]').click(function(){
}
});
});
jQuery('[name="vehicle_id"]').on('change',function() {
var vechileTypId = jQuery(this).find(":selected").val();
if(vechileTypId == '' || vechileTypId == null || vechileTypId == 'null' ||
vechileTypId == undefined || vechileTypId == 'undefined'){
setErrModal('Vechile Type Error','Choose a valid vechile type..!');
return false;
}
jQuery.ajax({
url : base_url+"Vehicle/getVehicleData",
type : 'POST',
data : {'vehicle_type':vechileTypId},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
remFullScreenLoader();
return false;
}
resp = jQuery.parseJSON(resp);
if(resp['status'] == 1){
if(resp['data'] == undefined || resp['data'] == 'undefined' ||
resp['data'] == null || resp['data'] == 'null' || resp['data'] == ''){
jQuery('[name="vehicle"]').html('<option selected disabled>'+
'Select Vehicle Model'+
'</option>');
setErrModal('Vechile Type Error','Choose a valid vechile type..!');
return false;
}
var optHtml = '';
jQuery.each(resp['data'], function(index,vehicleData){
optHtml += '<option value="'+vehicleData['vehicle_id']+'" newOpt="1">'+
vehicleData['vehicle_model']+' - '+vehicleData['vehicle_reg_no']
'</option>'
});
jQuery('[name="vehicle"]').html(optHtml);
jQuery('[id="vehicleModelCont"]').removeClass('hide');
} else {
setErrModal('Error','Something went wrong, please try again..!');
return false;
}
},
error: function (jqXHR, exception) {
setErrModal('Server Error','Something went wrong, please try again..!');
return false;
}
});
});
jQuery('[id^="updateBrkPayDate_"]').on('click',function() {
var thisObj = jQuery(this),
broker_id = thisObj.attr('broker_id'),
last_paid_date = jQuery('[name="payment_date_'+broker_id+'"]').datepicker({dateFormat:'yy-mm-dd'}).val();
if(last_paid_date==''||last_paid_date==undefined||last_paid_date=='undefined'||last_paid_date==null||last_paid_date=='null'){
setErrModal('Date Not Found','Choose a valid date and continue..!');
return false;
}
if(broker_id==''||broker_id==undefined||broker_id=='undefined'||broker_id==null||broker_id=='null'){
setErrModal('Error, Payment Date Update','Something went wrong, please try again..!');
return false;
}
jQuery.ajax({
url : base_url+"Payment/updatePaymentDate",
type : 'POST',
data : {'broker_id':broker_id,'last_paid_date':last_paid_date},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
setErrModal('Issue Updating Date','Something went wrong, please try again..!');
return false;
}
resp = jQuery.parseJSON(resp);
if(resp['status'] == 1 && resp['data'] != '' && resp['data'] != undefined && resp['data'] != null && resp['data'] != 'null' && resp['data'] != 'undefined'){
var data = resp['data'];
jQuery('[id="all_trans_count_'+broker_id+'"]').html(data['all_trans_count']);
jQuery('[id="pro_trans_count_'+broker_id+'"]').html(data['pro_trans_count']);
jQuery('[id="tot_paid_booking_'+broker_id+'"]').html(data['pro_trans_count'] - data['pending_trans_count']);
jQuery('[id="pending_trans_count_'+broker_id+'"]').html(data['pending_trans_count']);
jQuery('[id="brkPayDate_'+broker_id+'"]').html(data['last_paid_date']);
} else {
setErrModal('Error','Something went wrong, please try again..!');
}
return false;
},
error: function (jqXHR, exception) {
setErrModal('Server Error','Something went wrong, please try again..!');
return false;
}
});
});
\ No newline at end of file
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