From dc04deaada3cc246449c875c08fa9399da4d054d Mon Sep 17 00:00:00 2001
From: Andrew Malsbury <andymalsb@gmail.com>
Date: Wed, 22 Nov 2023 15:00:42 +0000
Subject: [PATCH 1/3] Fix new trip on trips.php

---
 guest_view_invoice.php |  1 +
 trip_add_modal.php     | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 65c9cd97..f1ee664b 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -302,6 +302,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
                             <td><strong>Balance</strong></td>
                             <td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></strong></td>
                         </tr>
+
                         </tbody>
                     </table>
                 </div>
diff --git a/trip_add_modal.php b/trip_add_modal.php
index 8b6e7651..a70671b4 100644
--- a/trip_add_modal.php
+++ b/trip_add_modal.php
@@ -56,21 +56,24 @@
                             <select class="form-control select2" name="destination" data-tags="true" data-placeholder="- Select / Input Destination -" required>
                                 <option value=""></option>
                                 <?php
-
-                                $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                                if (isset($_GET['client_id'])) {
+                                    $client_id = intval($_GET['client_id']);
+                                    $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
                                 while ($row = mysqli_fetch_array($sql_locations)) {
                                     $location_name = nullable_htmlentities($row['location_name']);
                                     $location_address = nullable_htmlentities($row['location_address']);
                                     $location_city = nullable_htmlentities($row['location_city']);
                                     $location_state = nullable_htmlentities($row['location_state']);
                                     $location_zip = nullable_htmlentities($row['location_zip']);
-
                                     ?>
                                     <option><?php echo "$location_address $location_city $location_state $location_zip"; ?></option>
-
                                     <?php
                                 }
+                            }else{
                                 ?>
+                                <option value="0"></option>
+                                <?php
+                            } ?>
                             </select>
                         </div>
                     </div>

From 7c93a073b29b9cea1aa5ee1801861e4d3f28ed6e Mon Sep 17 00:00:00 2001
From: Andrew Malsbury <andymalsb@gmail.com>
Date: Wed, 22 Nov 2023 15:01:49 +0000
Subject: [PATCH 2/3] fix option

---
 trip_add_modal.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/trip_add_modal.php b/trip_add_modal.php
index a70671b4..d16f91e1 100644
--- a/trip_add_modal.php
+++ b/trip_add_modal.php
@@ -69,10 +69,6 @@
                                     <option><?php echo "$location_address $location_city $location_state $location_zip"; ?></option>
                                     <?php
                                 }
-                            }else{
-                                ?>
-                                <option value="0"></option>
-                                <?php
                             } ?>
                             </select>
                         </div>

From 61f6735ceb078c4b52904bc369789f2e4feb1ecb Mon Sep 17 00:00:00 2001
From: Andrew Malsbury <andymalsb@gmail.com>
Date: Wed, 22 Nov 2023 16:31:14 +0000
Subject: [PATCH 3/3] added missing currency variable

---
 report_collections.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/report_collections.php b/report_collections.php
index 19973c0f..480ba278 100644
--- a/report_collections.php
+++ b/report_collections.php
@@ -57,6 +57,9 @@
     ORDER BY
         months_behind DESC;";
     $result_client_balance_report = mysqli_query($mysqli, $sql_client_balance_report);
+
+    //get currency format from settings
+    $config_currency_code = getSettingValue($mysqli, "company_currency");
 ?>
 
 <div class="card card-dark">
@@ -97,11 +100,11 @@
                                 
                                 echo "<tr>";
                                 echo "<td><a href='client_details.php?client_id=$client_id'>$client_name</a></td>";
-                                echo "<td class='text-right'>$formatted_balance</td>";
+                                echo "<td>$formatted_balance</td>";
                                 echo "<td>$billing_contact_phone</td>";
-                                echo "<td class='text-right'>$formatted_recurring_monthly_total</td>";
-                                echo "<td class='text-right'>$formatted_behind_amount</td>";
-                                echo "<td class='text-right'>$months_behind</td>";
+                                echo "<td>$formatted_recurring_monthly_total</td>";
+                                echo "<td>$formatted_behind_amount</td>";
+                                echo "<td>$months_behind</td>";
                                 echo "</tr>";
                             }
                         ?>