Merge branch 'master' into 'production'

application/helpers/excel_reader_helper.txt

+<?php
+
+    defined('BASEPATH') OR exit('No direct script access allowed');
+
+    include('excelReaderLibrary/SpreadsheetReader.php');
+    include('excelReaderLibrary/php-excel-reader/excel_reader.php');
+
+?>
\ No newline at end of file

application/models/Ride_model.php

@@ -42,8 +42,8 @@ class Ride_model extends CI_Model {
 		return ($status)?1:0;
 	}
 
-	function getRideData($ride_id = '',$company_id = '',$broker_id = '',$scheduled = '',$condArr = array()){
-		$cond = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":"";
+	function getRideData($ride_id='',$company_id='',$broker_id='',$scheduled='',$condArr=array()){
+		$cond  = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":"";
 		$cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":"";
 		$cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":"";
 
@@ -147,11 +147,13 @@ class Ride_model extends CI_Model {
  		$this->db->delete('ride_status',array('ride_id'=>$ride_id));
  	}
 
- 	function autoAssignDriver($ride_id = '', $appointment_time = '', $pickupLoc = array(),
+ 	function autoAssignDriver($ride_id = '', $appointment_time = '', $locData = array(),
  							  $drivers = array(), $no_driver = '0'){
- 		if(empty($ride_id) || empty($appointment_time) || empty($pickupLoc) || 
- 		   !isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' ||
- 		   !isset($pickupLoc['lng']) || $pickupLoc['lng'] == ''){
+ 		if(empty($ride_id) || empty($appointment_time) || empty($locData) || 
+ 		   !isset($locData['plat']) || $locData['plat'] == '' ||
+ 		   !isset($locData['plng']) || $locData['plng'] == '' || 
+ 		   !isset($locData['dlat']) || $locData['dlat'] == '' ||
+ 		   !isset($locData['dlng']) || $locData['dlng'] == ''){
  			return 0;
  		}
 
@@ -180,9 +182,9 @@ class Ride_model extends CI_Model {
 		  	}
 		  	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)*
+		 					   3956*2*ASIN(SQRT(POWER(SIN((".$locData['plat']."-DRV.active_loc_lat)*
+		 					   pi()/180/2),2)+COS(".$locData['plat']."*pi()/180)*COS(DRV.active_loc_lat*
+		 					   pi()/180)*POWER(SIN((".$locData['plng']."-DRV.active_loc_lng)*
 		 					   pi()/180/2),2))) AS distance
 		 				FROM drivers AS DRV 
 						WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).") AND 

application/views/Ride/add_transport.php

@@ -281,10 +281,16 @@
                     </div>
                   </div>
                 </div>
+                <div class="col-md-12" style="padding-left:30px;padding-bottom:10px;"> 
+                  <input type="checkbox" name="skipMapping" checked>
+                    <p style="display:inline;padding-left:10px;">
+                      Auto skip Mapping Page (If mapping data is available)
+                    </p>
+                </div>
                 <div class="col-md-12">          
                   <div class="box-footer">
                     <button type="submit" class="btn btn-primary">Upload</button>
-                  </div>        
+                  </div>
                 </div> 
               </div>
               <br>

application/views/Ride/view_rides.php

@@ -168,16 +168,20 @@
                 $report_data = array();
                 if(!empty($ride_data)){
                   foreach($ride_data as $ride) {
-                    $ride_ids[] = $ride->transport_id;
+                    $schedFlag = 0;
                     $json_ride = json_decode($ride->data,true);
                     if(empty($json_ride)){
                       continue; 
                     }
+                    if($json_ride['Trip_Status'] == 'S1'){
+                      $schedFlag = 1;
+                      $ride_ids[] = $ride->transport_id;
+                    }
                     ?>
                       <tr>
                         <th class="hidden"><?= $ride->transport_id ?></th>
                         <th class="center">
-                          <?php if($this->session->userdata['user_type'] != 1 && !empty($drivers_data)){ 
+                          <?php if($schedFlag && $this->session->userdata['user_type'] != 1 && !empty($drivers_data)){ 
                             $style = 'style="color:red;";';
                             $ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0;
                             if($ride->is_scheduled == 1){