From b35665863553dd35c4c7415747a1c4bb57795c24 Mon Sep 17 00:00:00 2001 From: Tamir Slobodskoy Date: Tue, 8 Apr 2025 05:02:46 +0100 Subject: [PATCH 1/2] Fix Dashboard following DB Update 1.9.7 --- dashboard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard.php b/dashboard.php index f4b968ad..58b854bf 100644 --- a/dashboard.php +++ b/dashboard.php @@ -151,7 +151,7 @@ if ($user_config_dashboard_financial_enable == 1) { $row = mysqli_fetch_array($sql_unbilled_tickets); $unbilled_tickets = intval($row['unbilled_tickets']); } else { - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(recurring_id) AS recurring_invoices_added FROM recurring WHERE YEAR(recurring_created_at) = $year")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(recurring_invoice_id) AS recurring_invoices_added FROM recurring_invoices WHERE YEAR(recurring_invoice_created_at) = $year")); $recurring_invoices_added = intval($row['recurring_invoices_added']); } From d413e0c8ff1c2ffe2f5408874ab8dcdbe469ee9a Mon Sep 17 00:00:00 2001 From: Tamir Slobodskoy Date: Tue, 8 Apr 2025 05:27:56 +0100 Subject: [PATCH 2/2] Fix Copy Trip Modal --- ajax/ajax_trip_copy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ajax/ajax_trip_copy.php b/ajax/ajax_trip_copy.php index 8865b81b..3eddd5a0 100644 --- a/ajax/ajax_trip_copy.php +++ b/ajax/ajax_trip_copy.php @@ -115,7 +115,7 @@ ob_start(); $sql_users = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id - WHERE user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + WHERE user_role_id > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']);