From f9899d89eab44b49f0a3930ab8057f941ee9df40 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Wed, 3 Feb 2021 22:42:03 -0500 Subject: [PATCH] Bunch of little fixes to to UI empty vars php errors removed a buch of tags etc. Converted client trip modals with global trip modals --- accounts.php | 23 +++-- add_account_modal.php | 6 +- add_calendar_event_modal.php | 8 +- add_expense_modal.php | 9 +- add_invoice_copy_modal.php | 6 +- add_invoice_modal.php | 6 +- add_product_modal.php | 10 +- add_quote_copy_modal.php | 6 +- add_quote_modal.php | 8 +- add_recurring_modal.php | 8 +- add_revenue_modal.php | 6 +- add_ticket_modal.php | 6 +- add_transfer_modal.php | 27 +++-- add_trip_copy_modal.php | 173 +++++++++++++++------------------ add_trip_modal.php | 167 +++++++++++++++---------------- assets.php | 54 +++++++--- calendar_events.php | 7 +- client_add_trip_copy_modal.php | 75 -------------- client_add_trip_modal.php | 69 ------------- client_edit_trip_modal.php | 76 --------------- client_trips.php | 6 +- clients.php | 10 +- edit_account_modal.php | 4 +- edit_calendar_event_modal.php | 11 ++- edit_invoice_modal.php | 4 +- edit_product_modal.php | 9 +- edit_quote_modal.php | 16 ++- edit_recurring_modal.php | 4 +- edit_revenue_modal.php | 6 +- edit_ticket_modal.php | 6 +- edit_trip_modal.php | 172 +++++++++++++++----------------- expenses.php | 135 +++++++++++++------------ invoices.php | 64 +++++++----- payments.php | 140 ++++++++++++++------------ products.php | 109 +++++++++++---------- quotes.php | 144 ++++++++++++++++----------- recurring.php | 137 ++++++++++++++++---------- revenues.php | 133 +++++++++++++++---------- tickets.php | 2 +- transfers.php | 132 ++++++++++++++++--------- trips.php | 67 ++++++++----- 41 files changed, 1025 insertions(+), 1036 deletions(-) delete mode 100644 client_add_trip_copy_modal.php delete mode 100644 client_add_trip_modal.php delete mode 100644 client_edit_trip_modal.php diff --git a/accounts.php b/accounts.php index 0a839067..6d6aa7e9 100644 --- a/accounts.php +++ b/accounts.php @@ -1,9 +1,5 @@ $sb, 'o' => $o))); - //Paging if(isset($_GET['p'])){ $p = intval($_GET['p']); @@ -40,20 +36,23 @@ $disp = "DESC"; } + //Rebuild URL + $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); + $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts WHERE account_name LIKE '%$q%' AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - $total_found_rows = $num_rows[0]; - $total_pages = ceil($total_found_rows / 10); ?> -
-
-
Accounts
- +
+
+

Accounts

+
+ +
@@ -111,12 +110,12 @@
Delete
-
- +
diff --git a/add_account_modal.php b/add_account_modal.php index 02aa4239..0c2836f9 100644 --- a/add_account_modal.php +++ b/add_account_modal.php @@ -1,10 +1,10 @@