diff --git a/ajax/ajax_trip_copy.php b/ajax/ajax_trip_copy.php index 8200ebd19..8865b81bd 100644 --- a/ajax/ajax_trip_copy.php +++ b/ajax/ajax_trip_copy.php @@ -16,7 +16,7 @@ $trip_created_at = nullable_htmlentities($row['trip_created_at']); $trip_archived_at = nullable_htmlentities($row['trip_archived_at']); $round_trip = nullable_htmlentities($row['round_trip']); -$client_id = intval($row['client_id']); +$client_id = intval($row['trip_client_id']); // Generate the HTML form content using output buffering. ob_start(); diff --git a/ajax/ajax_trip_edit.php b/ajax/ajax_trip_edit.php index f3abf2a7b..352f47dce 100644 --- a/ajax/ajax_trip_edit.php +++ b/ajax/ajax_trip_edit.php @@ -16,7 +16,7 @@ $trip_created_at = nullable_htmlentities($row['trip_created_at']); $trip_archived_at = nullable_htmlentities($row['trip_archived_at']); $round_trip = nullable_htmlentities($row['round_trip']); -$client_id = intval($row['client_id']); +$client_id = intval($row['trip_client_id']); // Generate the HTML form content using output buffering. ob_start(); diff --git a/client_trips.php b/client_trips.php deleted file mode 100644 index d37e0d71c..000000000 --- a/client_trips.php +++ /dev/null @@ -1,195 +0,0 @@ - - -
-
-

Trips

-
-
- - 0) { ?> - -
- - Export - -
- -
- -
-
-
-
- -
- -
-
- -
- -
-
-
- -
-
-
-
- -
-
-
-
- - "> - - - - - - - - - - - - "; - } else { - $round_trip_display = ""; - } - $user_name = nullable_htmlentities($row['user_name']); - if (empty($user_name)) { - $user_name_display = "-"; - } else { - $user_name_display = $user_name; - } - - ?> - - - - - - - - - - - - - -
- - Date - - - - Driver - - - - Purpose - - - - From - - - - To - - - - Miles - - Action
- - - - -
- -
- - Map it - -
- - Edit - - - Copy - -
- - Delete - -
-
-
-
- -
-
- -
  • - "> + ">

    Trips diff --git a/modals/client_trip_export_modal.php b/modals/client_trip_export_modal.php deleted file mode 100644 index ecf1114c0..000000000 --- a/modals/client_trip_export_modal.php +++ /dev/null @@ -1,22 +0,0 @@ -

    diff --git a/modals/trip_export_modal.php b/modals/trip_export_modal.php index cbdbe8b28..9f074c0d8 100644 --- a/modals/trip_export_modal.php +++ b/modals/trip_export_modal.php @@ -8,6 +8,9 @@
    + + +
    diff --git a/post/user/trip.php b/post/user/trip.php index ec083f15c..f10c82249 100644 --- a/post/user/trip.php +++ b/post/user/trip.php @@ -64,6 +64,13 @@ } if (isset($_POST['export_trips_csv'])) { + + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND trip_client_id = $client_id"; + } else { + $client_query = ''; + } $date_from = sanitizeInput($_POST['date_from']); $date_to = sanitizeInput($_POST['date_to']); @@ -79,6 +86,7 @@ $sql = mysqli_query($mysqli,"SELECT * FROM trips LEFT JOIN clients ON trip_client_id = client_id WHERE $date_query + $client_query ORDER BY trip_date DESC" ); @@ -117,50 +125,3 @@ exit; } - -if (isset($_POST['export_client_trips_csv'])) { - $client_id = intval($_POST['client_id']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = sanitizeInput($row['client_name']); - - $sql = mysqli_query($mysqli,"SELECT * FROM trips WHERE trip_client_id = $client_id ORDER BY trip_date ASC"); - - $count = mysqli_num_rows($sql); - - if ($count > 0) { - $delimiter = ","; - $filename = $row['client_name'] . "-Trips-" . date('Y-m-d') . ".csv"; - - //create a file pointer - $f = fopen('php://memory', 'w'); - - //set column headers - $fields = array('Date', 'Purpose', 'Source', 'Destination', 'Miles'); - fputcsv($f, $fields, $delimiter); - - //output each row of the data, format line as csv and write to file pointer - while($row = $sql->fetch_assoc()){ - $lineData = array($row['trip_date'], $row['trip_purpose'], $row['trip_source'], $row['trip_destination'], $row['trip_miles']); - fputcsv($f, $lineData, $delimiter); - } - - //move back to beginning of file - fseek($f, 0); - - //set headers to download file rather than displayed - header('Content-Type: text/csv'); - header('Content-Disposition: attachment; filename="' . $filename . '";'); - - //output all remaining data on a file pointer - fpassthru($f); - - // Logging - logAction("Trip", "Export", "$session_name exported $count trip(s) to a CSV file for client $client_name", $client_id); - } - exit; - -} diff --git a/trips.php b/trips.php index 677971457..62d232cc3 100644 --- a/trips.php +++ b/trips.php @@ -4,8 +4,14 @@ $sort = "trip_date"; $order = "DESC"; -require_once "includes/inc_all.php"; - +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND trip_client_id = $client_id"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; +} //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -18,6 +24,7 @@ WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%' OR trip_miles LIKE '%$q%' OR client_name LIKE '%$q%' OR user_name LIKE '%$q%') AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt' AND trip_archived_at IS NULL + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -43,6 +50,9 @@
    + + +
    @@ -101,11 +111,13 @@ Date + Client + Driver @@ -153,7 +165,7 @@ if (empty($client_name)) { $client_name_display = "-"; } else { - $client_name_display = "$client_name"; + $client_name_display = "$client_name"; } if ($round_trip == 1) { $round_trip_display = ""; @@ -172,13 +184,15 @@ " data-ajax-id="" > + + @@ -196,14 +210,14 @@
    " data-ajax-id="" > Edit " data-ajax-id="" > Copy