diff --git a/ajax.php b/ajax.php index e8615dcf..991883f9 100644 --- a/ajax.php +++ b/ajax.php @@ -181,6 +181,18 @@ if (isset($_POST['contact_set_notes'])) { } +if (isset($_POST['asset_set_notes'])) { + $asset_id = intval($_POST['asset_id']); + $notes = sanitizeInput($_POST['notes']); + + // Update notes + mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $asset_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Assets', log_action = 'Modify', log_description = '$session_name modified asset notes', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + +} + /* * Collision Detection/Avoidance * Called upon loading a ticket, and every 2 mins thereafter diff --git a/api/v1/documents/create.php b/api/v1/documents/create.php new file mode 100644 index 00000000..9b540885 --- /dev/null +++ b/api/v1/documents/create.php @@ -0,0 +1,34 @@ + - + diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php index d32c752b..9b7ad916 100644 --- a/calendar_event_add_modal.php +++ b/calendar_event_add_modal.php @@ -58,9 +58,6 @@ -
- -
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php index 7ad9fe21..01b46cce 100644 --- a/calendar_event_edit_modal.php +++ b/calendar_event_edit_modal.php @@ -145,7 +145,7 @@
- Delete + Delete
diff --git a/calendar_events.php b/calendar_events.php index 984f022e..ad1a2370 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -25,9 +25,6 @@ require_once "calendar_event_add_modal.php"; require_once "calendar_add_modal.php"; -require_once "category_quick_add_modal.php"; - - //loop through IDs and create a modal for each $sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id"); while ($row = mysqli_fetch_array($sql)) { @@ -44,7 +41,6 @@ while ($row = mysqli_fetch_array($sql)) { require "calendar_event_edit_modal.php"; - } ?> diff --git a/category_quick_add_modal.php b/category_quick_add_modal.php deleted file mode 100644 index e8eee6f2..00000000 --- a/category_quick_add_modal.php +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - diff --git a/client_add_modal.php b/client_add_modal.php index ab084b5e..dcc62e5b 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -9,6 +9,8 @@
+ +
@@ -61,7 +65,7 @@
- -
- -
@@ -231,115 +232,90 @@ -
+ - +
-
- -
-
- -
- +
+ +
+
+
+ ">
+
-
- -
-
- -
- +
+ +
+
+
+
+
-
- -
-
- -
- +
+ +
+
+
+
+
-
- -
-
- -
- +
+ +
+
+
+
+
- - - - +
+ + + +
-
+
+ +
+
+ +
+ - -
- - - - - - - - -
- -

No Tags Found!

- Try adding a few Settings > Tags +
- - +
diff --git a/client_asset_details.php b/client_asset_details.php index 04fe39e8..bef7c1e6 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -183,7 +183,7 @@ if (isset($_GET['asset_id'])) {
Notes
- +
@@ -495,8 +495,8 @@ if (isset($_GET['asset_id'])) { jQuery.post( "ajax.php", { - contact_set_notes: 'TRUE', - contact_id: contact_id, + asset_set_notes: 'TRUE', + asset_id: asset_id, notes: notes } ) diff --git a/client_assets.php b/client_assets.php index 51980e6e..7786a693 100644 --- a/client_assets.php +++ b/client_assets.php @@ -109,43 +109,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- All Assets - 0) { ?> - Workstations +
+
+
+ All Assets 0) { ?> - Servers - 0) { ?> - Virtual - 0) { ?> - Network - 0) { ?> - Other - + if ($workstation_count > 0) { ?> + Workstations + 0) { ?> + Servers + 0) { ?> + Virtual + 0) { ?> + Network + 0) { ?> + Other + +
+
+ + Archived + + Archived + +
- -
-
- - Archived - - Archived - -
-
-
diff --git a/client_certificates.php b/client_certificates.php index 2f6ea275..51adf31d 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -24,7 +24,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Certificates

- +
+ + +
+ + Export + +
+
@@ -43,22 +51,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
- - - -
diff --git a/client_documents.php b/client_documents.php index 87cb35d9..67b3749c 100644 --- a/client_documents.php +++ b/client_documents.php @@ -155,10 +155,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
diff --git a/client_domains.php b/client_domains.php index 450bbde1..c6a027cf 100644 --- a/client_domains.php +++ b/client_domains.php @@ -25,7 +25,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Domains

- +
+ + +
+ + Export + +
+
@@ -33,7 +41,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
@@ -45,10 +52,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
diff --git a/client_edit_modal.php b/client_edit_modal.php index f5ae5d7a..5dbda1f8 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -12,24 +12,25 @@
+ +
@@ -67,7 +68,7 @@
- -
- -
@@ -117,152 +113,110 @@
-
+ - +
-
- -
-
- -
- +
+ +
+
+
+
+
-
- -
-
- -
- +
+ +
+
+
+
+
-
- -
-
- -
- +
+ +
+
+
+
+
-
- -
-
- -
- +
+ +
+
+
+
- - - - - +
-
+ + +
-
+
+ +
+
+ +
+ " name="tags[]" - value="" > - -
- - - - - - - - -
- -

No Tags Found!

- Try adding a few Settings > Tags +
- - +
- - + +
diff --git a/client_invoices.php b/client_invoices.php index 9d10bf50..9ecef0a8 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -26,8 +26,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Invoices

-
- +
+
+ + +
+ + Export + +
+
@@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
diff --git a/client_networks.php b/client_networks.php index d18b8d89..b15a7a6d 100644 --- a/client_networks.php +++ b/client_networks.php @@ -28,7 +28,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Networks

- +
+ + +
+ + Export + +
+
+
@@ -47,7 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
diff --git a/client_payments.php b/client_payments.php index 77071d90..a7e0f47d 100644 --- a/client_payments.php +++ b/client_payments.php @@ -25,8 +25,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
-
-

Payments

+
+

Payments

+
+ +
@@ -44,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
diff --git a/client_quotes.php b/client_quotes.php index 65cb9efa..d4a7022c 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -27,7 +27,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Quotes

- +
+ + +
+ + Export + +
+
@@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
@@ -163,7 +170,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

Recurring Invoices

- +
+ + +
+ + Export + +
+
@@ -45,7 +53,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
diff --git a/client_service_add_modal.php b/client_service_add_modal.php index 7d91cf4d..eaad688a 100644 --- a/client_service_add_modal.php +++ b/client_service_add_modal.php @@ -97,9 +97,9 @@
- - - -
- -
-
- - -
-
- -
-
- - -
-
+ +
+ + + +
+ +
+
+ + +
-
- -
-
- - -
-
- -
-
- - -
-
- +
+ +
diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php index e7e18847..fe82b5d5 100644 --- a/client_service_edit_modal.php +++ b/client_service_edit_modal.php @@ -96,16 +96,18 @@
+
- '$service_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id"); while ($row_all = mysqli_fetch_array($sql_all)) { $contact_id = intval($row_all['contact_id']); @@ -124,11 +126,11 @@
- '$service_created_at' OR vendor_archived_at IS NULL) AND vendor_template = 0 AND vendor_client_id = $client_id"); while ($row_all = mysqli_fetch_array($sql_all)) { $vendor_id = intval($row_all['vendor_id']); $vendor_name = nullable_htmlentities($row_all['vendor_name']); @@ -146,11 +148,11 @@
- "> -
+
+ + - $asset_name"; - } - else{ - echo ""; - } - } - ?> - -
-
- -
-
- - -
-
+ $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE (asset_archived_at > '$service_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id"); + while ($row_all = mysqli_fetch_array($sql_all)) { + $asset_id = intval($row_all['asset_id']); + $asset_name = nullable_htmlentities($row_all['asset_name']); + if (in_array($asset_id, $selected_ids)) { + echo ""; + } + else{ + echo ""; + } + } + ?> +
+
+ + - $domain_name"; - } - else{ - echo ""; - } - } - ?> - -
-
- -
-
- - -
-
+ $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE (login_archived_at > '$service_created_at' OR login_archived_at IS NULL) AND login_client_id = $client_id"); + while ($row_all = mysqli_fetch_array($sql_all)) { + $login_id = intval($row_all['login_id']); + $login_name = nullable_htmlentities($row_all['login_name']); + if (in_array($login_id, $selected_ids)) { + echo ""; + } + else{ + echo ""; + } + } + ?> +
+
+ + +
+ +
+ + +
- +
diff --git a/client_services.php b/client_services.php index 205c73df..cb7ca1a5 100644 --- a/client_services.php +++ b/client_services.php @@ -34,10 +34,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
- -
- +
+
+
+ +
+ +
+
+
+ +
+
+
@@ -119,7 +128,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id LEFT JOIN networks ON assets.asset_network_id = networks.network_id LEFT JOIN locations ON assets.asset_location_id = locations.location_id - WHERE service_id = $service_id" + AND service_id = $service_id" ); // Associated logins diff --git a/client_side_nav.php b/client_side_nav.php index 58d7d0f8..158fc814 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -47,40 +47,39 @@ +
  • SUPPORT
    • - -
  • - "> - -

    - Tickets - 0) { ?> - - +

  • + "> + +

    + Tickets + 0) { ?> + + -

    -     -
    • +

    + + -
  • - "> - -

    - Schedule Ticket - 0) { ?> - - +

  • + "> + +

    + Schedule Ticket + 0) { ?> + + -

    -     -
    • +

    + + -
  • "> @@ -98,7 +97,7 @@ ">

    - Events + Calendar 0) { ?> @@ -107,10 +106,12 @@

    • + +
  • DOCUMENTATION
  • - "> + ">

    Assets @@ -229,6 +230,7 @@

    • + 2 && $config_module_enable_accounting == 1) { ?> diff --git a/client_software_add_modal.php b/client_software_add_modal.php index 06ba8aad..bd899b9a 100644 --- a/client_software_add_modal.php +++ b/client_software_add_modal.php @@ -16,10 +16,7 @@ Details
  • - Device Licenses -
    • -
  • - User Licenses + Licensing
  • Notes @@ -70,6 +67,10 @@
    • +
    + +
    +
    @@ -125,67 +126,54 @@
    -
    +
    + +
    +
    + +
    + +
    -
      +
      + +
      +
      + +
      + - -
      - - - - -
    - -
    - -
    - -
    - Select Users that are licensed for this software + +
    -
      - - -
    • -
      - - -
      -
      • - - - -
    -
    diff --git a/client_tickets.php b/client_tickets.php index 45d81c8e..30cb59b8 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -232,5 +232,3 @@ require_once "client_ticket_export_modal.php"; require_once "footer.php"; ?> - - diff --git a/client_trips.php b/client_trips.php index a1b73a33..8debe53c 100644 --- a/client_trips.php +++ b/client_trips.php @@ -27,7 +27,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Trips

    - +
    + + +
    + + Export + +
    +
    +
    @@ -46,7 +55,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/clients.php b/clients.php index 326f8188..5c5b3e0e 100644 --- a/clients.php +++ b/clients.php @@ -78,6 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    " autofocus>
    +
    @@ -88,9 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ">Clients ">Leads
    -
    - -
    +
    @@ -263,7 +262,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } if (!empty($contact_name)) { ?> -
    +
    600) { unlink($lock_file_path); @@ -371,7 +371,13 @@ if ($emails) { $from_array = $parser->getAddresses('from')[0]; $from_name = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['display'])))); - $from_email = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['address'])))); + + // Handle blank 'From' emails + $from_email = "itflow-guest@example.com"; + if (filter_var($from_array['address'], FILTER_VALIDATE_EMAIL)) { + $from_email = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['address'])))); + } + $from_domain = explode("@", $from_array['address']); $from_domain = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags(end($from_domain))))); // Use the final element in the array (as technically legal to have multiple @'s) diff --git a/database_updates.php b/database_updates.php index 3395f2c5..9bf550a7 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1491,11 +1491,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } - //if (CURRENT_DATABASE_VERSION == '0.9.1') { - // Insert queries here required to update to DB version 0.9.0 + if (CURRENT_DATABASE_VERSION == '0.9.3') { + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_default_hourly_rate` DECIMAL(15,2) NOT NULL DEFAULT 0.00 AFTER `config_default_net_terms`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.4'"); + + } + + //if (CURRENT_DATABASE_VERSION == '0.9.4') { + // Insert queries here required to update to DB version 0.9.5 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.5'"); //} } else { // Up-to-date diff --git a/database_version.php b/database_version.php index d7ebb9f0..102f8005 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.9.3"); +DEFINE("LATEST_DATABASE_VERSION", "0.9.4"); diff --git a/db.sql b/db.sql index 10c6f3b5..a0da4305 100644 --- a/db.sql +++ b/db.sql @@ -1233,6 +1233,7 @@ CREATE TABLE `settings` ( `config_default_expense_payment_method` varchar(200) DEFAULT NULL, `config_default_calendar` int(11) DEFAULT NULL, `config_default_net_terms` int(11) DEFAULT NULL, + `config_default_hourly_rate` decimal(15,2) NOT NULL DEFAULT 0.00, `config_invoice_prefix` varchar(200) DEFAULT NULL, `config_invoice_next_number` int(11) DEFAULT NULL, `config_invoice_footer` text DEFAULT NULL, @@ -1744,4 +1745,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-10-20 14:53:11 +-- Dump completed on 2023-11-06 14:51:28 diff --git a/expense_add_modal.php b/expense_add_modal.php index e345e67d..1f59d60b 100644 --- a/expense_add_modal.php +++ b/expense_add_modal.php @@ -95,7 +95,7 @@ ?>
    - +
    @@ -140,7 +140,7 @@ ?>
    - +
    diff --git a/expense_copy_modal.php b/expense_copy_modal.php index ab69b03b..64351a67 100644 --- a/expense_copy_modal.php +++ b/expense_copy_modal.php @@ -27,7 +27,7 @@
    - +
    diff --git a/expense_edit_modal.php b/expense_edit_modal.php index 4140254c..f2e74ebe 100644 --- a/expense_edit_modal.php +++ b/expense_edit_modal.php @@ -29,7 +29,7 @@
    - +
    @@ -102,7 +102,7 @@ ?>
    - +
    @@ -147,7 +147,7 @@ ?>
    - +
    diff --git a/expense_refund_modal.php b/expense_refund_modal.php index c35cba77..aa7e82e6 100644 --- a/expense_refund_modal.php +++ b/expense_refund_modal.php @@ -31,7 +31,7 @@
    - +
    diff --git a/expenses.php b/expenses.php index 85dcf1fa..910d5ccf 100644 --- a/expenses.php +++ b/expenses.php @@ -49,7 +49,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -83,6 +82,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    +
    +
    + +
    +
    @@ -201,7 +206,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 'On Receipt', '7'=>'7 Days', '10'=>'10 Days', @@ -139,19 +143,19 @@ $net_terms_array = array( '90'=>'90 Days' ); -$records_per_page_array = array('5','10','15','20','30','50','100'); +$records_per_page_array = array ('5','10','15','20','30','50','100'); include_once "settings_localization_array.php"; -$category_types_array = array( +$category_types_array = array ( 'Expense', 'Income', 'Payment Method', 'Referral' ); -$asset_types_array = array( +$asset_types_array = array ( 'Laptop'=>'fa-laptop', 'Desktop'=>'fa-desktop', 'Server'=>'fa-server', @@ -168,7 +172,7 @@ $asset_types_array = array( 'Other'=>'fa-tag' ); -$software_types_array = array( +$software_types_array = array ( 'SaaS', 'Application', 'Mobile', @@ -177,18 +181,18 @@ $software_types_array = array( 'Misc' ); -$license_types_array = array( +$license_types_array = array ( 'Device', 'User' ); -$document_types_array = array( +$document_types_array = array ( '0'=>'Document', '1'=>'Template', '2'=>'Global Template' ); -$asset_status_array = array( +$asset_status_array = array ( 'Ready to Deploy', 'Deployed', 'Out for Repair', @@ -197,7 +201,7 @@ $asset_status_array = array( 'Retired' ); -$ticket_status_array = array( +$ticket_status_array = array ( 'Pending-Assignment', 'Assigned', 'In-Progress', @@ -207,3 +211,39 @@ $ticket_status_array = array( 'Scheduled', 'Closed' ); + +$industry_select_array = array( + "Accounting", + "Agriculture", + "Automotive", + "Construction", + "Education", + "Entertainent", + "Finance", + "Government", + "Healthcare", + "Hospititality", + "Information Technology", + "Insurance", + "Pharmacy", + "Law", + "Manufacturing", + "Marketing & Advertising", + "Military", + "Non-Profit", + "Real Estate", + "Retail", + "Services", + "Transportation", + "Other" // An 'Other' option for industries not listed +); + +$start_page_select_array = array ( + 'dashboard.php'=>'Personal Dashboard', + 'dashboard_financial.php'=>'Administrative Dashboard', + 'dashboard_technical.php' => 'Technical Dashboard', + 'clients.php'=> 'Client Management', + 'tickets.php'=> 'Support Tickets', + 'invoices.php' => 'Invoices' +); + diff --git a/global_search.php b/global_search.php index 86fe2b16..b059138c 100644 --- a/global_search.php +++ b/global_search.php @@ -39,6 +39,13 @@ if (isset($_GET['query'])) { AND (vendor_name LIKE '%$query%' OR vendor_phone LIKE '%$phone_query%') ORDER BY vendor_id DESC LIMIT 5" ); + + $sql_domains = mysqli_query($mysqli, "SELECT * FROM domains + LEFT JOIN clients ON domain_client_id = client_id + WHERE domain_archived_at IS NULL + AND domain_name LIKE '%$query%' + ORDER BY domain_id DESC LIMIT 5" + ); $sql_products = mysqli_query($mysqli, "SELECT * FROM products WHERE product_archived_at IS NULL @@ -240,6 +247,50 @@ if (isset($_GET['query'])) { + 0) { ?> + + +
    +
    +
    +
    Domains
    +
    +
    + + + + + + + + + + + + + + + + + + +
    NameExpiryClient
    +
    +
    +
    +
    + + + 0) { ?> diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 0e1d19ae..981da396 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -185,7 +185,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it Date - + Due
    @@ -212,7 +212,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it + + + + 0) { ?> - + - - - - - - 0) { ?> + + + + 0) { ?> @@ -397,11 +399,11 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it {}, { text: 'Due', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -520,7 +522,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it ], [ { - rowSpan: 5, + rowSpan: '*', text: , style: 'notesText' }, @@ -533,6 +535,20 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -544,6 +560,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + [ {}, { @@ -555,6 +572,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + 0) { ?> [ {}, { @@ -566,6 +584,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + [ {}, { @@ -631,7 +650,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it alignment: 'right', margin: [0,0,0,30] }, - // Invoice Dates + // Invoice Date invoiceDateTitle: { fontSize: 10, alignment: 'left', @@ -642,6 +661,19 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Date + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/guest_view_quote.php b/guest_view_quote.php index c8df34da..d1502026 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -154,7 +154,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie - + @@ -233,21 +233,16 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
    Subtotal
    Discount-
    Subtotal
    Tax
    Total
    Paid
    		Date
    Expire
    - 0) { - ?> - - - - - + 0) { ?> + + + + + 0) { ?> @@ -378,11 +373,11 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie {}, { text: 'Expire', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -501,7 +496,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie ], [ { - rowSpan: 3, + rowSpan: '*', text: , style: 'notesText' }, @@ -514,6 +509,20 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -525,15 +534,16 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie style: 'itemsFooterSubValue' } ], + [ {}, { text: 'Total', - style: 'itemsFooterSubTitle' + style: 'itemsFooterTotalTitle' }, { text: , - style: 'itemsFooterSubValue' + style: 'itemsFooterTotalValue' } ], ] @@ -600,6 +610,19 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Dates + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/inc_all_client.php b/inc_all_client.php index 7dc50c58..7e895995 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -32,6 +32,7 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_array($sql); $client_name = nullable_htmlentities($row['client_name']); + $client_is_lead = intval($row['client_lead']); $client_type = nullable_htmlentities($row['client_type']); $client_website = nullable_htmlentities($row['client_website']); $client_referral = nullable_htmlentities($row['client_referral']); diff --git a/inc_client_top_head.php b/inc_client_top_head.php index f8ad8209..d782bf06 100644 --- a/inc_client_top_head.php +++ b/inc_client_top_head.php @@ -159,7 +159,3 @@ require_once "client_edit_modal.php"; require_once "client_delete_modal.php"; require_once "client_download_pdf_modal.php"; - -require_once "category_quick_add_modal.php"; - - diff --git a/invoice.php b/invoice.php index b5983fb6..8b1471eb 100644 --- a/invoice.php +++ b/invoice.php @@ -242,7 +242,7 @@ if (isset($_GET['invoice_id'])) { - + @@ -403,28 +403,31 @@ if (isset($_GET['invoice_id'])) {
    Discount
    Subtotal
    Discount
    TaxDate
    Due
    + + + + 0) { ?> - + - - - - - - 0) { ?> - + + + + + 0) { ?> @@ -680,11 +683,11 @@ require_once "footer.php"; {}, { text: 'Due', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -803,7 +806,7 @@ require_once "footer.php"; ], [ { - rowSpan: 5, + rowSpan: '*', text: , style: 'notesText' }, @@ -816,6 +819,20 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -827,6 +844,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + [ {}, { @@ -838,6 +856,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + 0) { ?> [ {}, { @@ -849,6 +868,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + [ {}, { @@ -858,7 +878,7 @@ require_once "footer.php"; { text: , - style: 'itemsFooterTotalTitle' + style: 'itemsFooterTotalValue' } ], ] @@ -914,7 +934,7 @@ require_once "footer.php"; alignment: 'right', margin: [0,0,0,30] }, - // Invoice Dates + // Invoice Date invoiceDateTitle: { fontSize: 10, alignment: 'left', @@ -925,6 +945,19 @@ require_once "footer.php"; alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Date + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/invoice_add_modal.php b/invoice_add_modal.php index e1171764..b2e33e31 100644 --- a/invoice_add_modal.php +++ b/invoice_add_modal.php @@ -73,7 +73,7 @@ ?>
    - +
    diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php index abc451b7..8f5cbf5b 100644 --- a/invoice_edit_modal.php +++ b/invoice_edit_modal.php @@ -56,7 +56,7 @@ ?>
    - +
    @@ -67,7 +67,7 @@
    - + diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php index 7a25845d..a7aa2a41 100644 --- a/invoice_payment_add_modal.php +++ b/invoice_payment_add_modal.php @@ -36,7 +36,7 @@
    - + diff --git a/invoices.php b/invoices.php index f70a83b7..1b8c6bc6 100644 --- a/invoices.php +++ b/invoices.php @@ -162,13 +162,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    -
    - +
    @@ -326,7 +326,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + diff --git a/js/ticket_add_remove_watchers.js b/js/ticket_add_remove_watchers.js deleted file mode 100644 index 50224e73..00000000 --- a/js/ticket_add_remove_watchers.js +++ /dev/null @@ -1,41 +0,0 @@ -function addWatcher(button) { - var container = button.previousElementSibling; - var textFieldWrapper = document.createElement("div"); - textFieldWrapper.className = "input-group mb-3"; - - var prependWrapper = document.createElement("div"); - prependWrapper.className = "input-group-prepend"; - var iconSpan = document.createElement("span"); - iconSpan.className = "input-group-text"; - iconSpan.innerHTML = ""; - prependWrapper.appendChild(iconSpan); - - var textField = document.createElement("input"); - textField.type = "email"; - textField.className = "form-control"; - textField.name = "watchers[]"; - textField.placeholder = "Enter an email"; - - var removeButtonWrapper = document.createElement("div"); - removeButtonWrapper.className = "input-group-append"; - - var removeButton = document.createElement("button"); - removeButton.className = "btn btn-danger"; - removeButton.type = "button"; - removeButton.innerHTML = ""; - removeButton.onclick = function() { - removeWatcher(this); - }; - - removeButtonWrapper.appendChild(removeButton); - textFieldWrapper.appendChild(prependWrapper); - textFieldWrapper.appendChild(textField); - textFieldWrapper.appendChild(removeButtonWrapper); - container.appendChild(textFieldWrapper); -} - -function removeWatcher(button) { - var container = button.parentNode.parentNode.parentNode; // Navigate to the container - var textFieldWrapper = button.parentNode.parentNode; - container.removeChild(textFieldWrapper); -} \ No newline at end of file diff --git a/js/ticket_time_tracking.js b/js/ticket_time_tracking.js index ddcd41e7..5a715958 100644 --- a/js/ticket_time_tracking.js +++ b/js/ticket_time_tracking.js @@ -125,6 +125,7 @@ } } + function updateRunningTicketsCount() { var runningTickets = parseInt(document.getElementById('runningTicketsCount').innerText, 10); @@ -136,6 +137,16 @@ document.getElementById('runningTicketsCount').innerText = runningTickets.toString(); } + + // Function to check status and pause timer + function checkStatusAndPauseTimer() { + var status = document.querySelector('select[name="status"]').value; + if (status.includes("Pending")) { + pauseTimer(); + } + } + + document.getElementById("hours").addEventListener('change', updateTimeFromInput); document.getElementById("minutes").addEventListener('change', updateTimeFromInput); @@ -146,6 +157,9 @@ document.getElementById("minutes").addEventListener('focus', handleInputFocus); document.getElementById("seconds").addEventListener('focus', handleInputFocus); + document.querySelector('select[name="status"]').addEventListener('change', checkStatusAndPauseTimer); + + document.getElementById("startStopTimer").addEventListener('click', function() { if (timerInterval === null) { startTimer(); @@ -162,16 +176,17 @@ // Wait for other synchronous actions (if any) to complete before resetting the timer. setTimeout(forceResetTimer, 100); // 100ms delay should suffice, but you can adjust as needed. }); - + try { displayTime(); if (!localStorage.getItem(getLocalStorageKey("startTime")) && !localStorage.getItem(getLocalStorageKey("pausedTime"))) { - // If first time, start the timer automatically startTimer(); } else if (localStorage.getItem(getLocalStorageKey("startTime"))) { - // Continue timer if it was running before startTimer(); } + + // Check and pause timer if status is pending + checkStatusAndPauseTimer(); } catch (error) { console.error("There was an issue initializing the timer:", error); } diff --git a/login.php b/login.php index 0bb66c69..f78f6b54 100644 --- a/login.php +++ b/login.php @@ -310,6 +310,12 @@ if (isset($_POST['login'])) { +
    +
    + + +
    +
    diff --git a/portal/login_microsoft.php b/portal/login_microsoft.php index 0428da25..b3d32273 100644 --- a/portal/login_microsoft.php +++ b/portal/login_microsoft.php @@ -110,7 +110,7 @@ if (isset($_POST['code']) && $_POST['state'] == session_id()) { header("Location: index.php"); } else { - $_SESSION['login_message'] = 'Something went wrong with login. Ensure you are setup for SSO.'; + $_SESSION['login_message'] = 'Something went wrong with logging you in: Your account is not configured for Azure SSO. Please ensure you are setup in ITFlow as a contact and have Azure SSO configured.'; header("Location: index.php"); } } diff --git a/post/client.php b/post/client.php index efc99a47..a06bdf59 100644 --- a/post/client.php +++ b/post/client.php @@ -26,6 +26,7 @@ if (isset($_POST['add_client'])) { $extended_log_description = ''; + // Create client mysqli_query($mysqli, "INSERT INTO clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_notes = '$notes', client_accessed_at = NOW()"); $client_id = mysqli_insert_id($mysqli); @@ -35,7 +36,15 @@ if (isset($_POST['add_client'])) { file_put_contents("uploads/clients/$client_id/index.php", ""); } - //Add Location + // Create Referral if it doesn't exist + $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'"); + if(mysqli_num_rows($sql) == 0) { + mysqli_query($mysqli, "INSERT INTO categories SET category_name = '$referral', category_type = 'Referral'"); + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Category', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + } + + // Create Location if (!empty($location_phone) || !empty($address) || !empty($city) || !empty($state) || !empty($zip)) { mysqli_query($mysqli, "INSERT INTO locations SET location_name = 'Primary', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$location_phone', location_country = '$country', location_primary = 1, location_client_id = $client_id"); @@ -44,7 +53,7 @@ if (isset($_POST['add_client'])) { } - //Add Contact + // Create Contact if (!empty($contact) || !empty($title) || !empty($contact_phone) || !empty($contact_mobile) || !empty($contact_email)) { mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$contact', contact_title = '$title', contact_phone = '$contact_phone', contact_extension = '$contact_extension', contact_mobile = '$contact_mobile', contact_email = '$contact_email', contact_primary = 1, contact_important = 1, contact_client_id = $client_id"); @@ -52,7 +61,7 @@ if (isset($_POST['add_client'])) { $extended_log_description .= ", primary contact $contact added"; } - //Add Tags + // Add Tags if (isset($_POST['tags'])) { foreach($_POST['tags'] as $tag) { $tag = intval($tag); @@ -60,7 +69,7 @@ if (isset($_POST['add_client'])) { } } - //Add domain to domains/certificates + // Create domain in domains/certificates if (!empty($website) && filter_var($website, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { // Get domain expiry date $expire = getDomainExpirationDate($website); @@ -96,7 +105,7 @@ if (isset($_POST['add_client'])) { } - //Logging + // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Create', log_description = '$session_name created client $name$extended_log_description', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); $_SESSION['alert_message'] = "Client $name created"; @@ -110,24 +119,31 @@ if (isset($_POST['edit_client'])) { require_once 'post/client_model.php'; - validateAdminRole(); $client_id = intval($_POST['client_id']); mysqli_query($mysqli, "UPDATE clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_notes = '$notes' WHERE client_id = $client_id"); - //Tags - //Delete existing tags + // Create Referral if it doesn't exist + $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'"); + if(mysqli_num_rows($sql) == 0) { + mysqli_query($mysqli, "INSERT INTO categories SET category_name = '$referral', category_type = 'Referral'"); + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Category', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + } + + // Tags + // Delete existing tags mysqli_query($mysqli, "DELETE FROM client_tags WHERE client_tag_client_id = $client_id"); - //Add new tags + // Add new tags foreach($_POST['tags'] as $tag) { $tag = intval($tag); mysqli_query($mysqli, "INSERT INTO client_tags SET client_tag_client_id = $client_id, client_tag_tag_id = $tag"); } - //Logging + // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Modify', log_description = '$session_name modified client $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); $_SESSION['alert_message'] = "Client $client_name updated"; diff --git a/post/document.php b/post/document.php index b209de14..59846391 100644 --- a/post/document.php +++ b/post/document.php @@ -134,6 +134,9 @@ if (isset($_POST['edit_document'])) { // vendor documents mysqli_query($mysqli,"UPDATE vendor_documents SET document_id = $new_document_id WHERE document_id = $document_id"); + // Service document + mysqli_query($mysqli,"UPDATE service_documents SET document_id = $new_document_id WHERE document_id = $document_id"); + //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Edit', log_description = '$session_name Edited document $name previous version was kept', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $new_document_id"); @@ -424,6 +427,9 @@ if (isset($_GET['archive_document'])) { // Vendor Associations mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id"); + // Service Associations + mysqli_query($mysqli,"DELETE FROM service_documents WHERE document_id = $document_id"); + //logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Archive', log_description = '$session_name archived document $document_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $document_id"); @@ -458,6 +464,9 @@ if (isset($_GET['delete_document'])) { // Vendor Associations mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id"); + // Service Associations + mysqli_query($mysqli,"DELETE FROM service_documents WHERE document_id = $document_id"); + //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Delete', log_description = '$document_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/post/setting.php b/post/setting.php index c877999c..bba3113a 100644 --- a/post/setting.php +++ b/post/setting.php @@ -265,8 +265,9 @@ if (isset($_POST['edit_default_settings'])) { $transfer_to_account = intval($_POST['transfer_to_account']); $calendar = intval($_POST['calendar']); $net_terms = intval($_POST['net_terms']); + $hourly_rate = floatval($_POST['hourly_rate']); - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate WHERE company_id = 1"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/post/trip.php b/post/trip.php index 8d4567f5..b2f46d97 100644 --- a/post/trip.php +++ b/post/trip.php @@ -59,11 +59,11 @@ if (isset($_GET['delete_trip'])) { if (isset($_POST['export_trips_csv'])) { $date_from = sanitizeInput($_POST['date_from']); $date_to = sanitizeInput($_POST['date_to']); - if(!empty($date_from) && !empty($date_to)){ - $date_query = "AND DATE(trip_date) BETWEEN '$date_from' AND '$date_to'"; + if (!empty($date_from) && !empty($date_to)){ + $date_query = "DATE(trip_date) BETWEEN '$date_from' AND '$date_to'"; $file_name_date = "$date_from-to-$date_to"; - }else{ - $date_query = ""; + } else { + $date_query = "trip_date IS NOT NULL"; $file_name_date = date('Y-m-d'); } diff --git a/product_add_modal.php b/product_add_modal.php index 07a38629..b62dd51a 100644 --- a/product_add_modal.php +++ b/product_add_modal.php @@ -42,7 +42,7 @@ ?>
    - +
    diff --git a/product_edit_modal.php b/product_edit_modal.php index af9b20f8..aaf2beeb 100644 --- a/product_edit_modal.php +++ b/product_edit_modal.php @@ -42,7 +42,7 @@ ?>
    - +
    @@ -55,7 +55,7 @@
    - + diff --git a/products.php b/products.php index 5ac07d1a..cd1214da 100644 --- a/products.php +++ b/products.php @@ -123,7 +123,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "product_add_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; - diff --git a/quote.php b/quote.php index 650a9034..81c51cf8 100644 --- a/quote.php +++ b/quote.php @@ -99,7 +99,7 @@ if (isset($_GET['quote_id'])) { $json_products = json_encode($products); } - ?> +?>
    1. @@ -135,10 +135,10 @@ if (isset($_GET['quote_id'])) { - + Accept - + Decline @@ -167,8 +167,7 @@ if (isset($_GET['quote_id'])) { Print - ');"> + ');"> Download PDF @@ -207,7 +206,9 @@ if (isset($_GET['quote_id'])) {
        -

        • +
      • +

        +
        • @@ -216,7 +217,9 @@ if (isset($_GET['quote_id'])) {
        -

        • +
      • +

        +
        • @@ -234,7 +237,7 @@ if (isset($_GET['quote_id'])) {
    - + @@ -250,151 +253,154 @@ if (isset($_GET['quote_id'])) {
    Subtotal
    Discount-
    Subtotal
    Tax
    Total
    Paid
    		 Date
    Expire
    - - - - - - - - - + + + + + + + + + - - - - + - - - - - - - + + + + + + + + + - ?> + > + + + "> + + + + + + - - - - - - - - + } + ?> + + + + +
    ItemDescriptionQuantityPriceTaxTotal
    ItemDescriptionQuantityPriceTaxTotal
    - -
    - -
    -
    - - - - -
    '; }?> - - -
    - - Edit - -
    - - Delete - + if ($item_order == $min_item_order) { + $up_hidden = "hidden"; + } else { + $up_hidden = ""; + } ?> + +
    + +
    + +
    +
    + + + + +
    '; + } ?> + + +
    + + Edit + +
    + + Delete + +
    - - -
    + + + + + + + + + - "> - - - - - - - - - - - -
    + +
    @@ -422,31 +428,26 @@ if (isset($_GET['quote_id'])) {
    - 0) { - ?> - - + + - - - - - - 0) { ?> + 0) { ?> + + + + + + 0) { ?> + + + + + - - + + - - - - -
    DiscountSubtotal
    Subtotal
    Discount-
    Tax
    TaxTotal
    Total
    @@ -475,29 +476,29 @@ if (isset($_GET['quote_id'])) {
    - - - - - + + + + + - - - - - - + + + + + + } + ?>
    DateStatusDescription
    DateStatusDescription
    @@ -506,7 +507,7 @@ if (isset($_GET['quote_id'])) {
    - + \ No newline at end of file diff --git a/quote_add_modal.php b/quote_add_modal.php index 08e232b6..fed4f2fc 100644 --- a/quote_add_modal.php +++ b/quote_add_modal.php @@ -71,7 +71,7 @@
    - +
    diff --git a/quote_edit_modal.php b/quote_edit_modal.php index 5188b69d..90563cf4 100644 --- a/quote_edit_modal.php +++ b/quote_edit_modal.php @@ -42,7 +42,7 @@
    - +
    @@ -54,7 +54,7 @@
    - + diff --git a/quotes.php b/quotes.php index a8c3e1d1..fc8f10dc 100644 --- a/quotes.php +++ b/quotes.php @@ -38,13 +38,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    - +
    @@ -206,7 +207,5 @@ require_once "quote_add_modal.php"; require_once "quote_edit_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; diff --git a/recurring_expense_create_modal.php b/recurring_expense_create_modal.php index b3b9be43..811bff14 100644 --- a/recurring_expense_create_modal.php +++ b/recurring_expense_create_modal.php @@ -68,7 +68,7 @@
    - + @@ -137,7 +137,7 @@ ?>
    - +
    @@ -182,7 +182,7 @@ ?>
    - +
    diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php index 48b5fc85..9ab5cb2f 100644 --- a/recurring_expense_edit_modal.php +++ b/recurring_expense_edit_modal.php @@ -69,7 +69,7 @@
    - + @@ -141,7 +141,7 @@ ?>
    - +
    @@ -186,7 +186,7 @@ ?>
    - +
    diff --git a/recurring_invoice.php b/recurring_invoice.php index 8bba5ac6..57a63b24 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -356,31 +356,25 @@ if (isset($_GET['recurring_id'])) {
    - 0) { - ?> - - - - - - + 0) { ?> + + + + + 0) { ?> - - - + + +
    Discount
    Subtotal
    Discount
    Tax
    Total
    Total
    @@ -441,9 +435,6 @@ if (isset($_GET['recurring_id'])) { require_once "recurring_invoice_note_modal.php"; - require_once "category_quick_add_modal.php"; - - } require_once "footer.php"; diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php index 324d8dd1..c3df89ca 100644 --- a/recurring_invoice_add_modal.php +++ b/recurring_invoice_add_modal.php @@ -98,7 +98,7 @@ ?>
    - +
    diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php index 42654ec9..0dfef318 100644 --- a/recurring_invoice_edit_modal.php +++ b/recurring_invoice_edit_modal.php @@ -75,7 +75,7 @@ ?>
    - +
    @@ -86,7 +86,7 @@
    - + diff --git a/recurring_invoices.php b/recurring_invoices.php index 7e70acc3..7d5097be 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -183,9 +183,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "recurring_invoice_add_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; - - -?> diff --git a/revenue_add_modal.php b/revenue_add_modal.php index 6aa58242..05fb8d7d 100644 --- a/revenue_add_modal.php +++ b/revenue_add_modal.php @@ -114,7 +114,7 @@ ?>
    - +
    diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php index d439d0e0..69f0a7cd 100644 --- a/revenue_edit_modal.php +++ b/revenue_edit_modal.php @@ -44,7 +44,7 @@
    - + @@ -120,7 +120,7 @@ ?>
    - +
    diff --git a/revenues.php b/revenues.php index e56d00b6..738fb8ea 100644 --- a/revenues.php +++ b/revenues.php @@ -105,7 +105,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $revenue_date = nullable_htmlentities($row['revenue_date']); $revenue_payment_method = nullable_htmlentities($row['revenue_payment_method']); - $revenue_amount = number_format(floatval($row['revenue_amount']),2); + $revenue_amount = floatval($row['revenue_amount']); $revenue_currency_code = nullable_htmlentities($row['revenue_currency_code']); $revenue_created_at = nullable_htmlentities($row['revenue_created_at']); $account_id = intval($row['account_id']); @@ -161,10 +161,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "revenue_add_modal.php"; -require_once "category_quick_add_modal.php"; - - require_once "footer.php"; - - -?> diff --git a/settings_defaults.php b/settings_defaults.php index 7bb782be..7557a3d8 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -16,7 +16,17 @@ require_once "inc_all_settings.php";
    - + @@ -197,6 +207,16 @@ require_once "inc_all_settings.php"; +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/side_nav.php b/side_nav.php index aa0a9649..26b82b14 100644 --- a/side_nav.php +++ b/side_nav.php @@ -43,9 +43,16 @@ - - if ($config_module_enable_accounting == 1) { ?> +
  • + "> + +

    Calendar

    +     +
    • + +
  • SALES
  • @@ -126,25 +133,17 @@

    Budget

    • - - - -
  • MORE
    • - -
  • - "> - -

    Calendar

    -     -
    • - -
  • +
  • ">

    Trips
    • + + +
  • MORE
    • +
  • "> diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 618db36d..f6c2d37c 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -169,8 +169,22 @@
    -
    - +
    +
    + +
    + +
    diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php index 5d74fe99..cf7f6f4e 100644 --- a/ticket_invoice_add_modal.php +++ b/ticket_invoice_add_modal.php @@ -155,7 +155,7 @@
    - + diff --git a/tickets.php b/tickets.php index 53ee893a..16e2ac8e 100644 --- a/tickets.php +++ b/tickets.php @@ -98,7 +98,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); max-width: 600px; } -
    +

    Support Tickets diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php index 524997c5..a32b5593 100644 --- a/transfer_edit_modal.php +++ b/transfer_edit_modal.php @@ -32,7 +32,7 @@
    - +

    diff --git a/trip_add_modal.php b/trip_add_modal.php index ee613ae3..8b6e7651 100644 --- a/trip_add_modal.php +++ b/trip_add_modal.php @@ -53,7 +53,25 @@
    - +
    @@ -72,8 +90,10 @@ 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + ); while ($row = mysqli_fetch_array($sql)) { $user_id = intval($row['user_id']); $user_name = nullable_htmlentities($row['user_name']); diff --git a/trip_copy_modal.php b/trip_copy_modal.php index 6ffd8b6e..624d7cf9 100644 --- a/trip_copy_modal.php +++ b/trip_copy_modal.php @@ -54,13 +54,32 @@
    - +
    - +
    @@ -73,9 +92,11 @@ 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']); $user_name_select = nullable_htmlentities($row['user_name']); ?> diff --git a/trip_edit_modal.php b/trip_edit_modal.php index 2a520c92..c9846ac1 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -56,7 +56,26 @@
    - +
    @@ -75,9 +94,11 @@ 1 AND user_archived_at > '$trip_created_at' ORDER BY user_name ASC" + ); + while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); ?> diff --git a/trips.php b/trips.php index fae2af1f..729f2796 100644 --- a/trips.php +++ b/trips.php @@ -47,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -81,6 +80,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
    +
    +
    + +
    +