diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..e10cd9eab --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,50 @@ +# Changelog + +All notable changes to ITFlow will be documented in this file. + +## [25.1] + +### Added / Changed +- Added ability to save cards in Stripe for automatic invoice payment +- Page titles now reflect the page name, client selection, company name, ticket info, invoice info etc. for easier multi tab navigation. +- Admin pages now once again use the new admin role-check +- Admin roles can now be archived +- Debug now shows the current git branch +- Auto-acknowledgement email for email-parsed tickets now contains a guest link +- Recurring tickets no longer require a contact +- Stripe online payment setup now prompts you to set the income/expense account +- New cron/cli scripts are in the scripts subfolder - please update your cron configurations! +- Moved all modal includes to /modals to tidy root directory +- Moved most include files to /includes to tidy root directory +- Moved guest pages to /guest to tidy directory structure +- Renamed include file pagination.php to filter_footer.php as it is used in conjunction with filter_header.php for page filtering +- Guest ticket feedback now shows friendly ticket prefix & number, rather than just the ID +- Individual POST handler logic pages can no longer be accessed directly +- Added payment deletion on Payments and client Payments Page +- Added Domains history tracking +- Added Asset Interface Linking / Connections to determine what interface is connected to what interface port of another asset +- Added Force Recurring Ticket in more places instead of just recurring tickets +- Row span and center devices that take up multiple units in a rack +- Added Tooltips to main nav badge counts to show what its actually counting +- Changed the Max records per page from 500 to 100 to prevent performance issues + +### Fixed +- Fixed ticket edit modal not showing multi-client/no-client projects +- Fixed asset interface losing DHCP setting +- Fixed creating / editing recurring expenses causing 500 error due to incorrect var name +- Fixed tickets created via portal/email not being marked as billable +- Fixed editing Recurring Expense +- Fixed a regression TinyMCE Editor not showing when adding or editing ticket templates + +### Removed / Deprecated +- Deprecated the current cron scripts in the root directory - change cron to use the ones in the scripts subfolder instead + +### BREAKING CHANGES +- Moved Client portal from /portal to /client - Links will be broken on previous emails, also you may need to update any other links for example website, support page etc? +- Moved guest links from / to /guest - Links will be broken on previous emails. + + +## [24.12] + +### Added / Changed +- First introduced versioned releases! diff --git a/README.md b/README.md index 6c1791cc6..4863620df 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,10 @@ [![Contributors][contributors-shield]][contributors-url] [![Stargazers][stars-shield]][stars-url] -[![Issues][issues-shield]][issues-url] [![Commits][commit-shield]][commit-url] [![GPL License][license-shield]][license-url] -
-

ITFlow

@@ -47,43 +42,26 @@ ### The Problem -- You're a busy MSP with 101 things to do. -- Information about your clients is unorganised and unstructured: scattered in random tickets or folders - when you do eventually find it, it's out of date. -- For some issues, you spend longer looking for the relevant documentation than actually working the ticket. +- You're a small but busy managed service provider with 101 things to do. Information about your clients is unorganised, unstructured and outdated. +- For some work, you seem to spend longer looking for the relevant documentation than actually working on the issue/project. - On top of the technical day to day, you also have to take care of the financial side of the business - consistent pricing, quotes/invoicing, and accounting. ### The Solution: ITFlow -- ITFlow consolidates common MSP needs (IT Documentation, ticketing and billing) into one system - -### In Beta -* This project is in beta with many ongoing changes. Updates may unintentionally introduce bugs/security issues. Writing functional, secure code is very difficult. -* Whilst we are confident the code is safe, nothing in life is 100% safe or risk-free. Use your best judgement before deciding to store highly confidential information in ITFlow. -* We are hoping to have a stable 1.0 release by early 2025. +- ITFlow consolidates common MSP needs (documentation, ticketing and billing) into one unified system. ## Getting Started -ITFlow is self-hosted. There is a full installation guide in the [docs](https://docs.itflow.org/installation). - - - -### Installation via Script (Recommended Method) - - **Requirements** - - Clean Install of Debian 12 or Ubuntu 22.04 - - A public IP Address - - Ports 80 (HTTP) and 443 (HTTPS) TCP accessible from the outside in - - A Fully Qualified Domain Name pointing to the public IP Address – example itflow.example.com +### Self Hosting +- The best installation method is to use the [install script](https://docs.itflow.org/installation_script) on Ubuntu/Debian. A video walk through is available [here](https://www.youtube.com/watch?v=kKz9NOU_1XE). +``` + wget -O itflow_install.sh https://github.com/itflow-org/itflow-install-script/raw/main/itflow_install.sh + bash itflow_install.sh +``` +- Other manual installation methods are available in the [docs](https://docs.itflow.org/installation). - **Process** - - Login as root - - Download & run install script - ``` - wget -O itflow_install.sh https://github.com/itflow-org/itflow-install-script/raw/main/itflow_install.sh - bash itflow_install.sh - ``` - - Follow Instructions & navigate to setup URL shown - - Leave us feedback in the [forum](https://forum.itflow.org/d/11-road-map) +### Managed Hosting +- If you'd prefer, we can [host ITFlow for you](https://services.itflow.org/hosting.php). ## Key Features @@ -95,14 +73,7 @@ ITFlow is self-hosted. There is a full installation guide in the [docs](https:// ## Roadmap / Future to-do -* Comprehensive API to allow custom third party integration -* CalDAV to integrate with 3rd party calendars -* CardDAV to integrate with 3rd party Address books -* Recent caller toast alerts to click and bring up the clients account right away -* FIDO2 WebAuthn Support for passwordless auth (TPM Fingerprint), (USB Hardware keys such as Yubikey) - -See the [forum](https://forum.itflow.org/t/added-to-roadmap) and the [open issues](https://github.com/itflow-org/itflow/issues) for a full list of proposed features & known issues. - +We track the implementation of confirmed features and bugs via [TaskFlow](https://tasks.dev.itflow.org/tasks.php). Use the [forum](https://forum.itflow.org) to request features or raise bug reports. ## Support & Contributions @@ -111,7 +82,7 @@ See the [forum](https://forum.itflow.org/t/added-to-roadmap) and the [open issue For help using ITFlow, bugs, feature requests, and general ideas / discussions please use the community [forum](https://forum.itflow.org). ### Contributing -If you want to improve ITFlow, feel free to fork the repo and create a pull request, but make sure to discuss significant changes or new features with fellow contributors on the forum first. This helps ensure that your contributions are aligned with project goals, and saves time for everyone. All contributions should follow our [code standards](https://docs.itflow.org/code_standards). +If you want to improve ITFlow, feel free to fork the repo and create a pull reques. Make sure to discuss significant changes or new features with fellow contributors on the forum first. This helps ensure that your contributions are aligned with project goals, and saves time for everyone. All contributions should follow our [code standards](https://docs.itflow.org/code_standards). See the [contributing guide](https://docs.itflow.org/contribute). #### Contributors @@ -122,13 +93,14 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to: - CompuMatter - F1 for HELP -- JetBrains - ## License - ITFlow is distributed "as is" under the GPL License, WITHOUT WARRANTY OF ANY KIND. See [`LICENSE`](https://github.com/itflow-org/itflow/blob/master/LICENSE) for details. +## Security +* As of 2025, we now have a stable release of the project. +* Whilst we are confident in the safety of the code, no system is risk-free. Nearly all software has bugs. Use your best judgement before storing highly confidential information in ITFlow. +* If you have a security concern, privately report it [here](https://github.com/itflow-org/itflow/security/policy). diff --git a/SECURITY.md b/SECURITY.md index f374eeacc..bd6ba7fd8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,25 +1,21 @@ # Security Policy -## **Please do NOT report security concerns/vulnerabilities publicly (Github issues/forum)** +## **Please do NOT report security concerns/vulnerabilities publicly (Issues/forum)** ---- +**We take security seriously** -## In Beta - -ITFlow is currently in beta and is a work in progress. - -**We take security seriously.** Whilst we are confident the code is safe, nothing in life is 100% safe or risk-free. You should use your best judgment before entering confidential information into the app. - -We attempt to follow security best practices where possible, including [automated code scanning](https://sonarcloud.io/component_measures?id=itflow-org_itflow&metric=security_rating&view=list). - -[![Security](https://sonarcloud.io/api/project_badges/measure?project=itflow-org_itflow&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=itflow-org_itflow) +- Whilst we are confident in the safety of the code, no system is risk-free. Nearly all software has bugs. Use your best judgement before storing highly confidential information in ITFlow. +- We attempt to follow security best practices where possible, including [automated code scanning](https://sonarcloud.io/component_measures?id=itflow-org_itflow&metric=security_rating&view=list). +- [![Security](https://sonarcloud.io/api/project_badges/measure?project=itflow-org_itflow&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=itflow-org_itflow) ## Supported Versions +We operate a rolling release model. Any bug fixes will be released into latest version of ITFlow, so you must stay up-to-date. | Version | Supported | | ------- | ------------------ | -| Beta | :white_check_mark: | -| 1.0 | Yet to be released | +| Beta | :x: | +| 24.12 | :white_check_mark: | +| 25.1 | :white_check_mark: (When released) | ## Reporting a Vulnerability via GitHub Security Advisories diff --git a/accounts.php b/accounts.php index f23a0f7ee..f5f972da9 100644 --- a/accounts.php +++ b/accounts.php @@ -4,7 +4,7 @@ $sort = "account_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -109,18 +109,18 @@
- + - @@ -174,7 +174,7 @@
- + - + @@ -184,10 +184,10 @@
-
- + - + @@ -127,14 +127,14 @@
- + - + @@ -295,11 +295,11 @@
-
@@ -34,5 +34,5 @@
Archived Archived - - ITFlow release version + + Current DB Version + + Current Code Commit - Current DB Version - + Current Branch + @@ -748,5 +755,5 @@ function getDirStats($dir) {
- + - - + + set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -74,4 +75,4 @@ - diff --git a/admin_role.php b/admin_role.php index 241a116f0..db315d070 100644 --- a/admin_role.php +++ b/admin_role.php @@ -4,7 +4,7 @@ $sort = "user_role_is_admin"; $order = "DESC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -110,11 +110,10 @@ -
- - - + + Archive + @@ -125,7 +124,7 @@ -
@@ -73,5 +73,5 @@
-
+

Company Details

-
- -
-
- -
- -
-
- -
-
- "> -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- +
+ + +
- -
-
- -
- -
-
- + +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
-
- -
- -
-
- -
- -
-
- -
- - -
-
@@ -120,5 +120,5 @@
@@ -249,4 +249,4 @@
@@ -39,5 +39,5 @@
-
@@ -102,5 +102,5 @@
@@ -327,5 +327,5 @@ -
@@ -78,5 +78,5 @@
@@ -193,4 +193,4 @@
@@ -25,7 +25,7 @@
">
- +
@@ -35,7 +35,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -151,5 +151,5 @@
+ +
+
+

Online Payment - Client info

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
ClientStripe Customer IDStripe Payment ID
+ +
+ +
+ +
@@ -41,4 +41,4 @@
@@ -54,5 +54,5 @@
@@ -44,7 +44,7 @@
- +
@@ -62,5 +62,5 @@
@@ -38,5 +38,5 @@
@@ -63,5 +63,5 @@
@@ -82,5 +82,5 @@
-
-
5 ) { - require "admin_ticket_status_edit_modal.php"; + require "modals/admin_ticket_status_edit_modal.php"; } } @@ -123,13 +123,13 @@
-
- set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -124,7 +125,7 @@ @@ -139,5 +140,5 @@ - @@ -231,13 +231,13 @@ function generatePassword() { - "; + $history_html .= "DateColumnOld ValueNew Value"; + while ($row = mysqli_fetch_array($history_sql)) { + // Fetch data from the query and create table rows + $history_html .= ""; + $history_html .= "" . htmlspecialchars(date('Y-m-d', strtotime($row['domain_history_modified_at']))) . ""; + $history_html .= "" . htmlspecialchars($row['domain_history_column']) . ""; + $history_html .= "" . htmlspecialchars($row['domain_history_old_value']) . ""; + $history_html .= "" . htmlspecialchars($row['domain_history_new_value']) . ""; + $history_html .= ""; + } + $history_html .= ""; + + // Return the HTML content to JavaScript + $response['history'] = $history_html; + echo json_encode($response); } @@ -306,10 +320,10 @@ // Return URL if ($item_type == "Login") { - $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key"; + $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key"; } else { - $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key"; + $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key"; } $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); @@ -346,7 +360,7 @@ ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } diff --git a/blank.php b/blank.php index 2e83e0bf7..b5cf1f1de 100644 --- a/blank.php +++ b/blank.php @@ -1,4 +1,4 @@ - +
    @@ -52,4 +52,4 @@ - diff --git a/budget_edit.php b/budget_edit.php index 76051bd07..c4b09abce 100644 --- a/budget_edit.php +++ b/budget_edit.php @@ -1,6 +1,6 @@ diff --git a/calendar_events.php b/calendar_events.php index 1b7ee7efc..48f6e0190 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -1,6 +1,6 @@ "> @@ -69,9 +69,9 @@ - diff --git a/client/autopay.php b/client/autopay.php new file mode 100644 index 000000000..44280785d --- /dev/null +++ b/client/autopay.php @@ -0,0 +1,134 @@ + + +

    AutoPay

    +
    + +
    + + + + + Save card details
    + In order to set up automatic payments, you must create a customer record in Stripe.
    + First, you must authorize Stripe to store your card details for the purpose of automatic payment. +

    + +
    +
    + +
    +
    + + +
    +
    + +
    + +
    +
    +
    + + + elseif (empty($stripe_pm)) { ?> + + Save card details
    + Please add the payment details you would like to save.
    + By adding payment details here, you grant consent for future automatic payments of invoices.

    + + + + +
    + +
    + + + + Manage saved card details + + customers->retrievePaymentMethod( + $stripe_id, + $stripe_pm, + [] + ); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when fetching payment method info for $stripe_pm: $error"); + logApp("Stripe", "error", "Exception when fetching payment method info for $stripe_pm: $error"); + } + + $card_name = nullable_htmlentities($payment_method->billing_details->name); + $card_brand = nullable_htmlentities($payment_method->card->display_brand); + $card_last4 = nullable_htmlentities($payment_method->card->last4); + $card_expires = nullable_htmlentities($payment_method->card->exp_month) . "/" . nullable_htmlentities($payment_method->card->exp_year); + + ?> + +
    + +
    + Actions
    + - Remove saved card + + + + +
    + +
    + + +
    -
    + @@ -93,4 +93,4 @@
    - + @@ -126,4 +126,4 @@ set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -41,7 +42,7 @@ $document_name = nullable_htmlentities($row['document_name']); $document_content = $purifier->purify($row['document_content']); } else { - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -67,4 +68,4 @@
    - + diff --git a/portal/portal_header.php b/client/includes/header.php similarity index 68% rename from portal/portal_header.php rename to client/includes/header.php index 68614c19c..bc3606471 100644 --- a/portal/portal_header.php +++ b/client/includes/header.php @@ -27,7 +27,7 @@ - + @@ -50,28 +50,34 @@ -
  1. - " href="invoices.php">Invoices -
    2. -
  2. - " href="quotes.php">Quotes +
  3. + +
    + Invoices + Quotes + Auto Payment +
    4. + -
  4. - " href="documents.php">Documents -
    5. -
  5. - " href="contacts.php">Contacts -
    6. -
  6. - " href="domains.php">Domains -
    7. -
  7. - " href="certificates.php">Certificates +
  8. + +
    + Contacts + Documents + Domains + Certificates + All tickets +
    9. - + + @@ -100,7 +106,6 @@ " alt="..." height="50" width="50" class="img-circle img-responsive"> - diff --git a/portal/inc_portal.php b/client/includes/inc_all.php similarity index 72% rename from portal/inc_portal.php rename to client/includes/inc_all.php index acee6648c..d0ea5d15d 100644 --- a/portal/inc_portal.php +++ b/client/includes/inc_all.php @@ -5,13 +5,8 @@ */ require_once '../config.php'; - require_once '../get_settings.php'; - require_once '../functions.php'; - require_once 'check_login.php'; - -require_once 'portal_functions.php'; - -require_once "portal_header.php"; +require_once 'functions.php'; +require_once "header.php"; diff --git a/portal/index.php b/client/index.php similarity index 75% rename from portal/index.php rename to client/index.php index a80c9bf98..856a36bfe 100644 --- a/portal/index.php +++ b/client/index.php @@ -6,12 +6,11 @@ header("Content-Security-Policy: default-src 'self'"); -require_once "inc_portal.php"; - +require_once "includes/inc_all.php"; ?>
    New ticket
    - + diff --git a/portal/invoices.php b/client/invoices.php similarity index 92% rename from portal/invoices.php rename to client/invoices.php index d0fe2e8f1..654a4bd36 100644 --- a/portal/invoices.php +++ b/client/invoices.php @@ -6,11 +6,11 @@ header("Content-Security-Policy: default-src 'self'"); -require_once "inc_portal.php"; +require_once "includes/inc_all.php"; if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -76,7 +76,7 @@ ?> - "> + "> @@ -99,5 +99,5 @@ - + @@ -215,7 +215,7 @@ - + diff --git a/portal/login_microsoft.php b/client/login_microsoft.php similarity index 100% rename from portal/login_microsoft.php rename to client/login_microsoft.php diff --git a/portal/login_reset.php b/client/login_reset.php similarity index 97% rename from portal/login_reset.php rename to client/login_reset.php index e01c304d0..43f17c7b4 100644 --- a/portal/login_reset.php +++ b/client/login_reset.php @@ -73,7 +73,7 @@ $client = intval($row['contact_client_id']); $token = randomString(156); - $url = "https://$config_base_url/portal/login_reset.php?email=$email&token=$token&client=$client"; + $url = "https://$config_base_url/client/login_reset.php?email=$email&token=$token&client=$client"; mysqli_query($mysqli, "UPDATE users SET user_password_reset_token = '$token' WHERE user_id = $user_id LIMIT 1"); mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Modify', log_description = 'Sent a portal password reset e-mail for $email.', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client"); @@ -91,7 +91,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Error handling if ($mail !== true) { @@ -147,7 +147,7 @@ ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Error handling if ($mail !== true) { @@ -193,7 +193,7 @@ - + @@ -294,7 +294,7 @@ - + diff --git a/portal/portal_post.php b/client/post.php similarity index 60% rename from portal/portal_post.php rename to client/post.php index 37855e0d0..7118407ce 100644 --- a/portal/portal_post.php +++ b/client/post.php @@ -4,8 +4,11 @@ * Process GET/POST requests */ -require_once "inc_portal.php"; - +require_once '../config.php'; +require_once '../get_settings.php'; +require_once '../functions.php'; +require_once 'check_login.php'; +require_once 'functions.php'; if (isset($_POST['add_ticket'])) { @@ -34,7 +37,7 @@ $new_config_ticket_next_number = $config_ticket_next_number + 1; mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); $ticket_id = mysqli_insert_id($mysqli); // Notify agent DL of the new ticket, if populated with a valid email @@ -57,7 +60,7 @@ 'body' => $email_body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Custom action/notif handler @@ -122,7 +125,7 @@ ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } @@ -171,7 +174,7 @@ } else { // The client does not have access to this ticket - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } } @@ -200,7 +203,7 @@ header("Location: " . $_SERVER["HTTP_REFERER"]); } else { // The client does not have access to this ticket - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -327,6 +330,12 @@ } if (isset($_POST['add_contact'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + $contact_name = sanitizeInput($_POST['contact_name']); $contact_email = sanitizeInput($_POST['contact_email']); $contact_technical = intval($_POST['contact_technical']); @@ -368,6 +377,12 @@ } if (isset($_POST['edit_contact'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + $contact_id = intval($_POST['contact_id']); $contact_name = sanitizeInput($_POST['contact_name']); $contact_email = sanitizeInput($_POST['contact_email']); @@ -413,3 +428,258 @@ customAction('contact_update', $contact_id); } + +if (isset($_POST['create_stripe_customer'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Include stripe SDK + require_once '../vendor/stripe-php-10.5.0/init.php'; + + // Get client's StripeID from database (should be none) + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); + if (!$stripe_client_details) { + + try { + // Initiate Stripe + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Create customer + $customer = $stripe->customers->create([ + 'name' => $session_client_name, + 'email' => $session_contact_email, + 'metadata' => [ + 'itflow_client_id' => $session_client_id, + 'consent' => $session_contact_name + ] + ]); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when creating customer record for $session_client_name: $error"); + logApp("Stripe", "error", "Exception creating customer $session_client_name: $error"); + } + + // Get & Store customer ID + $stripe_id = sanitizeInput($customer->id); + + mysqli_query($mysqli, "INSERT INTO client_stripe SET client_id = $session_client_id, stripe_id = '$stripe_id'"); + + // Logging + logAction("Stripe", "Create", "$session_contact_name created Stripe customer for $session_client_name as $stripe_id and authorised future automatic payments", $session_client_id, $session_client_id); + + $_SESSION['alert_message'] = "Stripe customer created, thank you for your consent"; + + } else { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe customer already exists"; + } + + header('Location: autopay.php'); +} + +if (isset($_GET['create_stripe_checkout'])) { + + // This page is called by the autopay_setup_stripe.js, it returns a checkout session client secret + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Client Currency + $client_currency_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT client_currency_code FROM clients WHERE client_id = $session_client_id LIMIT 1")); + $client_currency = $client_currency_details['client_currency_code']; + + // Define return URL that user is redirected to once payment method is verified by Stripe + $return_url = "https://$config_base_url/client/post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}"; + + try { + // Initialize stripe + require_once '../vendor/stripe-php-10.5.0/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Create checkout session (server side) + $checkout_session = $stripe->checkout->sessions->create([ + 'currency' => $client_currency, + 'mode' => 'setup', + 'ui_mode' => 'embedded', + 'return_url' => $return_url, + ]); + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when creating checkout session: $error"); + logApp("Stripe", "error", "Exception creating checkout: $error"); + } + + // Return the client secret to the js script + echo json_encode(array('clientSecret' => $checkout_session->client_secret)); + + // No redirect & no point logging this +} + +if (isset($_GET['stripe_save_card'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Get session ID from URL + $checkout_session_id = sanitizeInput($_GET['session_id']); + + // Get client's StripeID from database + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); + $client_stripe_id = sanitizeInput($stripe_client_details['stripe_id']); + + try { + // Initialize stripe + require_once '../vendor/stripe-php-10.5.0/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Retrieve checkout session + $checkout_session = $stripe->checkout->sessions->retrieve($checkout_session_id,[]); + + // Get setup intent + $setup_intent_id = $checkout_session->setup_intent; + + // Retrieve the setup intent details + $setup_intent = $stripe->setupIntents->retrieve($setup_intent_id, []); + + // Get the payment method token + $payment_method = sanitizeInput($setup_intent->payment_method); + + // Attach the payment method to the client in Stripe + $stripe->paymentMethods->attach($payment_method, ['customer' => $client_stripe_id]); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when adding payment method info: $error"); + logApp("Stripe", "error", "Exception adding payment method: $error"); + } + + // Update ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = '$payment_method' WHERE client_id = $session_client_id LIMIT 1"); + + // Get some card/payment method details for the email/logging + $payment_method_details = $stripe->paymentMethods->retrieve($payment_method); + $card_info = sanitizeInput($payment_method_details->card->display_brand) . " " . sanitizeInput($payment_method_details->card->last4); + + // Send email confirmation + + // Company Details & Settings + $sql_settings = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); + $row = mysqli_fetch_array($sql_settings); + $company_name = sanitizeInput($row['company_name']); + $config_smtp_host = $row['config_smtp_host']; + $config_smtp_port = intval($row['config_smtp_port']); + $config_smtp_encryption = $row['config_smtp_encryption']; + $config_smtp_username = $row['config_smtp_username']; + $config_smtp_password = $row['config_smtp_password']; + $config_invoice_from_name = sanitizeInput($row['config_invoice_from_name']); + $config_invoice_from_email = sanitizeInput($row['config_invoice_from_email']); + $config_base_url = sanitizeInput($config_base_url); + + if (!empty($config_smtp_host)) { + $subject = "Payment method saved"; + $body = "Hello $session_contact_name,

    We’re writing to confirm that your payment details have been securely stored with Stripe, our trusted payment processor.

    By agreeing to save your payment information, you have authorized us to automatically bill your card ($card_info) for any future invoices. The payment details you’ve provided are securely stored with Stripe and will be used solely for invoices. We do not have access to your full card details.

    You may update or remove your payment information at any time using the portal.

    Thank you for your business!

    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + $data = [ + [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $session_contact_email, + 'recipient_name' => $session_contact_name, + 'subject' => $subject, + 'body' => $body, + ] + ]; + + $mail = addToMailQueue($data); + + } + + // Logging + logAction("Stripe", "Update", "$session_contact_name added saved card ($card_info) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); + + // Redirect + $_SESSION['alert_message'] = "Card saved - thank you"; + header('Location: autopay.php'); + +} + +if (isset($_GET['stripe_remove_card'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + $payment_method = sanitizeInput($_GET['pm']); + + try { + // Initialize stripe + require_once '../vendor/stripe-php-10.5.0/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Detach PM + $stripe->paymentMethods->detach($payment_method, []); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); + logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + } + + // Remove payment method from ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $session_client_id LIMIT 1"); + + // Logging & Redirect + logAction("Stripe", "Update", "$session_contact_name deleted saved card (PM: $payment_method)", $session_client_id, $session_client_id); + + $_SESSION['alert_message'] = "Card removed"; + header('Location: autopay.php'); +} \ No newline at end of file diff --git a/portal/profile.php b/client/profile.php similarity index 92% rename from portal/profile.php rename to client/profile.php index 600892775..6209fed5f 100644 --- a/portal/profile.php +++ b/client/profile.php @@ -6,7 +6,7 @@ header("Content-Security-Policy: default-src 'self'"); -require_once 'inc_portal.php'; +require_once 'includes/inc_all.php'; ?> @@ -30,7 +30,7 @@

    Password

    - +
    @@ -46,5 +46,5 @@ - "> + "> @@ -88,4 +88,4 @@
    set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -90,7 +91,7 @@ Ticket - Resolve ticket + Resolve ticket
    @@ -134,7 +135,7 @@ - +
    @@ -153,11 +154,11 @@
    - Reopen ticket + Reopen ticket
    - Close ticket + Close ticket
    @@ -167,7 +168,7 @@

    Ticket closed. Please rate your ticket

    - +
    - +
    @@ -317,64 +348,63 @@
    -

    Network Interfaces

    +

    Network Interfaces

    - +
    - +
    "> - - - - - - - - + + + + + + + + + - $network_name"; - } else { - $network_name_display = "-"; - } - $interface_notes = nullable_htmlentities($row['interface_notes']); - - + + $network_name $network_id" + : '-'; + + // Connected interface details + $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); + $connected_interface_port = nullable_htmlentities($row['connected_interface_port']); + + // Show either "-" or "AssetName - Port" + if ($connected_asset_name) { + $connected_to_display = "$connected_asset_name - $connected_interface_port"; + } else { + $connected_to_display = "-"; + } ?> + - - + +
    NameMACIPPortConnected ToAction
    NameMACIPPortNetworkConnected ToAction
    - + @@ -383,6 +413,7 @@
    -
    @@ -532,7 +556,7 @@ )"> Edit +
    + + Force Reoccur +
    @@ -860,13 +888,12 @@ - - diff --git a/client_certificates.php b/client_certificates.php index c606fdf04..f91d97d0e 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -4,7 +4,7 @@ $sort = "certificate_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -200,17 +200,15 @@
    - @@ -218,5 +216,5 @@ - diff --git a/client_contact_details.php b/client_contact_details.php index 1599b9413..7e2dabf41 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -1,6 +1,6 @@
    - @@ -414,9 +417,9 @@ class="btn btn-secondary btn-sm" title="Unlink"> data-target="#editRecurringTicketModal" onclick="populateRecurringTicketEditModal()"> Edit +
    + + Force Reoccur +
    @@ -1063,7 +1070,7 @@ class="btn btn-secondary btn-sm" title="Unlink"> @@ -1125,16 +1132,16 @@ function(data) {
    - + - + @@ -396,7 +396,7 @@ class="btn btn- @@ -404,9 +404,9 @@ class="btn btn-
    - + - @@ -421,12 +421,12 @@ class="btn btn- - @@ -244,4 +244,4 @@ + @@ -114,6 +115,7 @@ $invoice_amount = floatval($row['invoice_amount']); $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']); $invoice_date = nullable_htmlentities($row['invoice_date']); + $payment_id = intval($row['payment_id']); $payment_date = nullable_htmlentities($row['payment_date']); $payment_method = nullable_htmlentities($row['payment_method']); $payment_reference = nullable_htmlentities($row['payment_reference']); @@ -137,6 +139,18 @@ + +
    + +
    + + Delete + +
    +
    + @@ -144,13 +158,11 @@ - -
    - rack_photo"> + rack_photo"> - +
    - - + + + + @@ -168,7 +170,9 @@ class="btn btn- - + + + @@ -176,61 +180,161 @@ class="btn btn-
    -
    DescriptionDescription
    NotesNotes
    +
    + + + + + + + + = 1; $i--) { + // Keep track of which device_ids we've already printed + $printedDevices = []; + + for ($i = $rack_units; $i >= 1; $i--) { + + // Find all devices that occupy the current unit $i $unit_devices = []; foreach ($rack_units_data as $unit_data) { - if ($i >= $unit_data['unit_start_number'] && $i <= $unit_data['unit_end_number']) { + $start = (int) $unit_data['unit_start_number']; + $end = (int) $unit_data['unit_end_number']; + + // If $i is between start and end, device occupies this unit + if ($i >= $start && $i <= $end) { $unit_devices[] = [ - 'unit_id' => intval($unit_data['unit_id']), - 'device' => nullable_htmlentities($unit_data['unit_device']), - 'asset_id' => intval($unit_data['asset_id']), - 'asset_name' => nullable_htmlentities($unit_data['asset_name']), - 'asset_type' => nullable_htmlentities($unit_data['asset_type']), - 'icon' => getAssetIcon($unit_data['asset_type']) + 'unit_id' => (int) $unit_data['unit_id'], + 'unit_device' => nullable_htmlentities($unit_data['unit_device']), + 'unit_start_number'=> $start, + 'unit_end_number' => $end, + 'asset_id' => (int) $unit_data['asset_id'], + 'asset_name' => nullable_htmlentities($unit_data['asset_name']), + 'asset_type' => nullable_htmlentities($unit_data['asset_type']), + 'icon' => getAssetIcon($unit_data['asset_type']) ]; } } + ?> - - - - + + + 1) { + // If your data might have multiple devices in the same row, + // you have to decide how to handle them. + // For now, we can fallback to older logic or display them all in one cell, etc. + ?> + + + - + + + + + - + +
    UDevice
    - - - - - - - + + + -
    - -
    - - - Remove - - + + +
    		+ + + + + + + + + + +
    + +
    + + Remove + +
    +
    +     		+ +
    + + +     		+
    + +
    + + + Remove + + +
    - -     		No device
    +
    - - + + @@ -241,6 +345,6 @@ class="btn btn- diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 19e4e6688..8b8da97f6 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -4,7 +4,7 @@ $sort = "recurring_last_sent"; $order = "DESC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_sales'); @@ -161,7 +161,7 @@ Create "; - require "recurring_payment_add_modal.php"; + require "modals/recurring_payment_add_modal.php"; } ?> @@ -211,15 +211,12 @@ - )"> Edit +
    + + Force Reoccur +
    @@ -166,7 +170,7 @@ - @@ -176,9 +180,9 @@ - - - + - @@ -259,7 +259,7 @@ class="btn btn- - @@ -267,11 +267,11 @@ class="btn btn-
    -

    Management

    +

    Management

    = 2) { ?>
    @@ -119,12 +114,12 @@
    - +
    - " autofocus> + " autofocus>
    @@ -134,8 +129,8 @@
    - ">Clients - ">Leads + ">Clients + ">Leads
    @@ -152,8 +147,8 @@ class="collapse mt-3 - + - + @@ -312,6 +307,11 @@ class="collapse mt-3 $client_archived_at = nullable_htmlentities($row['client_archived_at']); $client_is_lead = intval($row['client_lead']); + // Abbreviation + if (empty($client_abbreviation)) { + $client_abbreviation = shortenClient($client_name); + } + // Client Tags $client_tag_name_display_array = array(); @@ -387,7 +387,8 @@ class="collapse mt-3
    - Created: + Abbreviation:
    + Created:
    @@ -400,7 +401,7 @@ class="collapse mt-3 if (!empty($contact_name)) { ?>
    - +
    @@ -478,17 +479,17 @@ class="collapse mt-3
    -
    ##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been automatically created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: https://$config_base_url/portal/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $email_body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been automatically created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: https://$config_base_url/client/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; $email = [ 'from' => $config_ticket_from_email, @@ -360,7 +363,7 @@ } // Add to the mail queue - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Set the next run date if ($frequency == "weekly") { @@ -482,9 +485,9 @@ $subject = "Overdue Invoice $invoice_prefix$invoice_number"; $body = "Hello $contact_name,

    Our records indicate that we have not yet received payment for the invoice $invoice_prefix$invoice_number. We kindly request that you submit your payment as soon as possible. If you have any questions or concerns, please do not hesitate to contact us at $company_email or $company_phone.

    - Kindly review the invoice details mentioned below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
    Due Date: $invoice_due
    Over Due By: $day Days


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + Kindly review the invoice details mentioned below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
    Due Date: $invoice_due
    Over Due By: $day Days


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; - $mail = addToMailQueue($mysqli, [ + $mail = addToMailQueue([ [ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, @@ -493,7 +496,7 @@ 'subject' => $subject, 'body' => $body ] - ]); + ]); if ($mail === true) { mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_invoice_id = $invoice_id"); @@ -614,9 +617,9 @@ $contact_email = sanitizeInput($row['contact_email']); $subject = "Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; - $mail = addToMailQueue($mysqli, [ + $mail = addToMailQueue([ [ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, @@ -663,7 +666,7 @@ ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } } //End if Autosend is on @@ -1003,8 +1006,9 @@ * ############################################################################################################### */ -// Send Alert to inform Cron was run -appNotify("Cron", "Cron successfully executed", "admin_audit_log.php"); +// Alert we're using the old cron path +appNotify("Cron", "Cron ran OK, but paths need updating - cron scripts are now in the scripts subfolder", "admin_audit_log.php"); // Logging logApp("Cron", "info", "Cron executed successfully"); +logApp("Cron", "warning", "Cron ran using an old script path"); \ No newline at end of file diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index e8b3e6376..61bcca501 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -155,7 +155,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date $data = []; if ($config_ticket_client_general_notifications == 1) { $subject_email = "Ticket created - [$config_ticket_prefix$ticket_number] - $subject"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.

    Ticket: $config_ticket_prefix$ticket_number
    Subject: $subject
    Status: New
    https://$config_base_url/portal/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.

    Ticket: $config_ticket_prefix$ticket_number
    Subject: $subject
    Status: New
    https://$config_base_url/client/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; $data[] = [ 'from' => $config_ticket_from_email, 'from_name' => $config_ticket_from_name, @@ -187,7 +187,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Custom action/notif handler customAction('ticket_create', $id); @@ -249,7 +249,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); return true; } @@ -319,7 +319,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } } diff --git a/dashboard.php b/dashboard.php index 20a9d4cde..79d89916c 100644 --- a/dashboard.php +++ b/dashboard.php @@ -1,5 +1,5 @@ - + diff --git a/database_updates.php b/database_updates.php index c29c68edf..0cabb96d3 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2404,12 +2404,71 @@ function processFile($file_path, $file_name, $mysqli) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.5'"); } - // if (CURRENT_DATABASE_VERSION == '1.7.5') { - // // Insert queries here required to update to DB version 1.7.6 + if (CURRENT_DATABASE_VERSION == '1.7.5') { + mysqli_query($mysqli, "CREATE TABLE `client_stripe` (`client_id` INT(11) NOT NULL, `stripe_id` VARCHAR(255) NOT NULL, `stripe_pm` varchar(255) NULL) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci; "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.6'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.6') { + // Create a field to show connected interface of a foreign asset + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` ADD `interface_connected_asset_interface` INT(11) NOT NULL DEFAULT 0 AFTER `interface_network_id`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.7'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.7') { + // Domain history + mysqli_query($mysqli, "CREATE TABLE `domain_history` (`domain_history_id` INT(11) NOT NULL AUTO_INCREMENT , `domain_history_column` VARCHAR(200) NOT NULL , `domain_history_old_value` TEXT NOT NULL , `domain_history_new_value` TEXT NOT NULL , `domain_history_domain_id` INT(11) NOT NULL , `domain_history_modified_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , PRIMARY KEY (`domain_history_id`)) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.8'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.8') { + + // Use a seperate table for Interface connections / links. This will make it easier to manage. + $createInterfaceLinksTable = " + CREATE TABLE IF NOT EXISTS `asset_interface_links` ( + `interface_link_id` INT AUTO_INCREMENT PRIMARY KEY, + `interface_a_id` INT NOT NULL, + `interface_b_id` INT NOT NULL, + `interface_link_type` VARCHAR(100) NULL, + `interface_link_status` VARCHAR(50) NULL, + `interface_link_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `interface_link_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + + CONSTRAINT `fk_interface_a` + FOREIGN KEY (`interface_a_id`) + REFERENCES `asset_interfaces` (`interface_id`) + ON DELETE CASCADE + ON UPDATE CASCADE, + + CONSTRAINT `fk_interface_b` + FOREIGN KEY (`interface_b_id`) + REFERENCES `asset_interfaces` (`interface_id`) + ON DELETE CASCADE + ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + "; + mysqli_query($mysqli, $createInterfaceLinksTable) or die(mysqli_error($mysqli)); + + // Drop the old column from asset_interfaces if it exists + $dropConnectedColumn = " + ALTER TABLE `asset_interfaces` + DROP COLUMN IF EXISTS `interface_connected_asset_interface` + "; + mysqli_query($mysqli, $dropConnectedColumn) or die(mysqli_error($mysqli)); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.7.9') { + // // Insert queries here required to update to DB version 1.8.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.6'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.0'"); // } } else { // Up-to-date } + diff --git a/database_version.php b/database_version.php index 589a6c56b..3627c05e1 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.7.5"); +DEFINE("LATEST_DATABASE_VERSION", "1.7.9"); diff --git a/db.sql b/db.sql index 664915d83..48aaa2731 100644 --- a/db.sql +++ b/db.sql @@ -134,6 +134,29 @@ CREATE TABLE `asset_history` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `asset_interface_links` +-- + +DROP TABLE IF EXISTS `asset_interface_links`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `asset_interface_links` ( + `interface_link_id` int(11) NOT NULL AUTO_INCREMENT, + `interface_a_id` int(11) NOT NULL, + `interface_b_id` int(11) NOT NULL, + `interface_link_type` varchar(100) DEFAULT NULL, + `interface_link_status` varchar(50) DEFAULT NULL, + `interface_link_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `interface_link_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`interface_link_id`), + KEY `fk_interface_a` (`interface_a_id`), + KEY `fk_interface_b` (`interface_b_id`), + CONSTRAINT `fk_interface_a` FOREIGN KEY (`interface_a_id`) REFERENCES `asset_interfaces` (`interface_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_interface_b` FOREIGN KEY (`interface_b_id`) REFERENCES `asset_interfaces` (`interface_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `asset_interfaces` -- @@ -342,6 +365,21 @@ CREATE TABLE `client_notes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `client_stripe` +-- + +DROP TABLE IF EXISTS `client_stripe`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `client_stripe` ( + `client_id` int(11) NOT NULL, + `stripe_id` varchar(255) NOT NULL, + `stripe_pm` varchar(255) DEFAULT NULL, + PRIMARY KEY (`client_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `client_tags` -- @@ -636,6 +674,24 @@ CREATE TABLE `documents` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `domain_history` +-- + +DROP TABLE IF EXISTS `domain_history`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `domain_history` ( + `domain_history_id` int(11) NOT NULL AUTO_INCREMENT, + `domain_history_column` varchar(200) NOT NULL, + `domain_history_old_value` text NOT NULL, + `domain_history_new_value` text NOT NULL, + `domain_history_domain_id` int(11) NOT NULL, + `domain_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`domain_history_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `domains` -- @@ -2287,4 +2343,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-12-21 20:24:14 +-- Dump completed on 2025-01-18 13:03:55 diff --git a/expenses.php b/expenses.php index e3c7d7ccc..dffee9dad 100644 --- a/expenses.php +++ b/expenses.php @@ -4,7 +4,7 @@ $sort = "expense_date"; $order = "DESC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -12,31 +12,31 @@ // Account Filter if (isset($_GET['account']) & !empty($_GET['account'])) { $account_query = 'AND (expense_account_id = ' . intval($_GET['account']) . ')'; - $account = intval($_GET['account']); + $account_filter = intval($_GET['account']); } else { // Default - any $account_query = ''; - $account = ''; + $account_filter = ''; } // Vendor Filter if (isset($_GET['vendor']) & !empty($_GET['vendor'])) { $vendor_query = 'AND (vendor_id = ' . intval($_GET['vendor']) . ')'; - $vendor = intval($_GET['vendor']); + $vendor_filter = intval($_GET['vendor']); } else { // Default - any $vendor_query = ''; - $vendor = ''; + $vendor_filter = ''; } // Category Filter if (isset($_GET['category']) & !empty($_GET['category'])) { $category_query = 'AND (category_id = ' . intval($_GET['category']) . ')'; - $category = intval($_GET['category']); + $category_filter = intval($_GET['category']); } else { // Default - any $category_query = ''; - $category = ''; + $category_filter = ''; } //Rebuild URL @@ -120,7 +120,7 @@
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -154,7 +154,7 @@
    - + - + @@ -194,7 +194,7 @@
    diff --git a/filter_header.php b/includes/filter_header.php similarity index 82% rename from filter_header.php rename to includes/filter_header.php index 1b9e33944..f8be84534 100644 --- a/filter_header.php +++ b/includes/filter_header.php @@ -24,30 +24,23 @@ $page = 1; } -// Order -if (isset($_GET['order'])) { - if ($_GET['order'] == 'ASC') { - $order = "ASC"; - $disp = "DESC"; - } else { - $order = "DESC"; - $disp = "ASC"; - } -} elseif(isset($order)) { - if ($order == "ASC") { - $disp = "DESC"; - } else { - $disp = "ASC"; - } +if (isset($_GET['order']) && $_GET['order'] == 'ASC') { + $order = "ASC"; + $disp = "DESC"; } -// Set the order Icon -if (isset($sort)) { - if ($order == "ASC") { - $order_icon = ""; - } else { - $order_icon = ""; - } +if (isset($_GET['order']) && $_GET['order'] == 'DESC') { + $order = "DESC"; + $disp = "ASC"; +} + +// Order +if(isset($order) && $order == "ASC") { + $disp = "DESC"; + $order_icon = ""; +} else { + $disp = "ASC"; + $order_icon = ""; } // Search @@ -109,15 +102,10 @@ } // Archived - -$archived = 0; - -if (isset($_GET['archived'])) { - $archived = intval($_GET['archived']); -} - -if ($archived == 1){ +if (isset($_GET['archived']) && $_GET['archived'] == 1) { + $archived = 1; $archive_query = "archived_at IS NOT NULL"; } else { + $archived = 0; $archive_query = "archived_at IS NULL"; } diff --git a/footer.php b/includes/footer.php similarity index 90% rename from footer.php rename to includes/footer.php index 67e6cdb91..2d7a3247e 100644 --- a/footer.php +++ b/includes/footer.php @@ -13,6 +13,9 @@
    + + + @@ -33,7 +36,7 @@ - + diff --git a/header.php b/includes/header.php similarity index 95% rename from header.php rename to includes/header.php index 7d8bd8bfb..ac886ac69 100644 --- a/header.php +++ b/includes/header.php @@ -30,7 +30,7 @@ - + diff --git a/inc_alert_feedback.php b/includes/inc_alert_feedback.php similarity index 100% rename from inc_alert_feedback.php rename to includes/inc_alert_feedback.php diff --git a/inc_all.php b/includes/inc_all.php similarity index 97% rename from inc_all.php rename to includes/inc_all.php index d2280fec0..9399ea569 100644 --- a/inc_all.php +++ b/includes/inc_all.php @@ -1,13 +1,10 @@ Tell your admin: Your role does not have admin access."); +} require_once "header.php"; - require_once "top_nav.php"; - require_once "admin_side_nav.php"; - require_once "inc_wrapper.php"; - require_once "inc_alert_feedback.php"; - require_once "filter_header.php"; - require_once "app_version.php"; diff --git a/inc_all_client.php b/includes/inc_all_client.php similarity index 98% rename from inc_all_client.php rename to includes/inc_all_client.php index 064ec7af3..2588e9fa9 100644 --- a/inc_all_client.php +++ b/includes/inc_all_client.php @@ -1,10 +1,9 @@ - - - diff --git a/inc_all_reports.php b/includes/inc_all_reports.php similarity index 93% rename from inc_all_reports.php rename to includes/inc_all_reports.php index 51bb53ad4..37354007f 100644 --- a/inc_all_reports.php +++ b/includes/inc_all_reports.php @@ -1,24 +1,16 @@ Clients - +

    @@ -43,7 +43,7 @@

    Tickets - +

    @@ -54,7 +54,7 @@

    Recurring Tickets - +

    @@ -65,7 +65,7 @@

    Projects - +

    @@ -87,7 +87,7 @@

    Quotes - +

    @@ -98,7 +98,7 @@

    Invoices - +

    @@ -109,7 +109,7 @@

    Recurring Invoices - +

    @@ -153,7 +153,7 @@

    Recurring Expenses - +

    diff --git a/top_nav.php b/includes/top_nav.php similarity index 96% rename from top_nav.php rename to includes/top_nav.php index 276bc203d..560ed438e 100644 --- a/top_nav.php +++ b/includes/top_nav.php @@ -161,8 +161,8 @@ class="d-none d-md-inline dropdown-toggle">
  9. - - Administration + + Administration Account Logout @@ -174,6 +174,6 @@ class="d-none d-md-inline dropdown-toggle"> diff --git a/user_side_nav.php b/includes/user_side_nav.php similarity index 100% rename from user_side_nav.php rename to includes/user_side_nav.php diff --git a/index.php b/index.php index cb69e797b..ab0d6145c 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@
      @@ -16,7 +16,7 @@
      Nothing to see here'; - require_once "footer.php"; + require_once "includes/footer.php"; exit(); } @@ -59,6 +59,10 @@ $client_net_terms = $config_default_net_terms; } + // Override Tab Title // No Sanitizing needed as this var will opnly be used in the tab title + $tab_title = $row['client_name']; + $page_title = "{$row['invoice_prefix']}{$row['invoice_number']}"; + $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); $row = mysqli_fetch_array($sql); $company_id = intval($row['company_id']); @@ -141,6 +145,17 @@ $json_products = json_encode($products); } + // Payment with saved card (auto-pay) + if ($config_stripe_enable) { + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); + if ($stripe_client_details) { + $stripe_id = sanitizeInput($stripe_client_details['stripe_id']); + $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); + } + } + + + ?>
        @@ -193,6 +208,11 @@ Add Payment + + + Pay via saved card + + @@ -231,7 +251,7 @@ Send Email - "> + "> Guest URL @@ -387,7 +407,7 @@ @@ -660,21 +680,21 @@
    10. diff --git a/invoices.php b/invoices.php index de38e53e4..87ad25990 100644 --- a/invoices.php +++ b/invoices.php @@ -2,9 +2,9 @@ // Default Column Sortby/Order Filter $sort = "invoice_number"; -$order = "DESC"; +$order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -337,9 +337,9 @@
    -
    { + const response = await fetch("/portal/portal_post.php?create_stripe_checkout", { + method: "POST", + }); + const { clientSecret } = await response.json(); + return clientSecret; + }; + + // Initialize Checkout + const checkout = await stripe.initEmbeddedCheckout({ + fetchClientSecret, + }); + + // Mount Checkout + checkout.mount('#checkout'); +} diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js index a0206b33d..d8642d63a 100644 --- a/js/domain_edit_modal.js +++ b/js/domain_edit_modal.js @@ -12,6 +12,7 @@ function populateDomainEditModal(client_id, domain_id) { // Access the domain info (one), registrars (multiple) and webhosts (multiple) const domain = response.domain[0]; const vendors = response.vendors; + const history = response.history; // Populate the domain modal fields document.getElementById("editDomainHeader").innerText = domain.domain_name; @@ -112,6 +113,9 @@ function populateDomainEditModal(client_id, domain_id) { } }); + // Domain History + document.getElementById('editDomainHistoryContainer').innerHTML = history; + } ); } diff --git a/login.php b/login.php index c4c105456..5b8602e3d 100644 --- a/login.php +++ b/login.php @@ -185,7 +185,7 @@ 'body' => $body ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Logging @@ -262,7 +262,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } // HTML feedback for incorrect 2FA code @@ -315,7 +315,7 @@ - + @@ -333,7 +333,7 @@
    diff --git a/account_edit_modal.php b/modals/account_edit_modal.php similarity index 95% rename from account_edit_modal.php rename to modals/account_edit_modal.php index 58df3b625..8b46ffc83 100644 --- a/account_edit_modal.php +++ b/modals/account_edit_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_api_key_add_modal.php b/modals/admin_api_key_add_modal.php similarity index 98% rename from admin_api_key_add_modal.php rename to modals/admin_api_key_add_modal.php index 208593cc1..61510e4dc 100644 --- a/admin_api_key_add_modal.php +++ b/modals/admin_api_key_add_modal.php @@ -37,7 +37,7 @@
    - +
    diff --git a/admin_category_add_modal.php b/modals/admin_category_add_modal.php similarity index 96% rename from admin_category_add_modal.php rename to modals/admin_category_add_modal.php index 7390793a2..bf193e382 100644 --- a/admin_category_add_modal.php +++ b/modals/admin_category_add_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/admin_category_edit_modal.php b/modals/admin_category_edit_modal.php similarity index 96% rename from admin_category_edit_modal.php rename to modals/admin_category_edit_modal.php index 9bc39fbf3..45dc29eb0 100644 --- a/admin_category_edit_modal.php +++ b/modals/admin_category_edit_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/admin_custom_link_add_modal.php b/modals/admin_custom_link_add_modal.php similarity index 95% rename from admin_custom_link_add_modal.php rename to modals/admin_custom_link_add_modal.php index b10a3a4ae..34aa75091 100644 --- a/admin_custom_link_add_modal.php +++ b/modals/admin_custom_link_add_modal.php @@ -17,7 +17,7 @@
    - + @@ -37,7 +37,7 @@
    - +
    @@ -52,7 +52,7 @@
    - +
    diff --git a/admin_custom_link_edit_modal.php b/modals/admin_custom_link_edit_modal.php similarity index 93% rename from admin_custom_link_edit_modal.php rename to modals/admin_custom_link_edit_modal.php index 63124b911..66f2a7595 100644 --- a/admin_custom_link_edit_modal.php +++ b/modals/admin_custom_link_edit_modal.php @@ -19,7 +19,7 @@
    - + @@ -39,7 +39,7 @@
    - +
    > @@ -54,7 +54,7 @@
    - +
    diff --git a/admin_document_template_add_modal.php b/modals/admin_document_template_add_modal.php similarity index 97% rename from admin_document_template_add_modal.php rename to modals/admin_document_template_add_modal.php index 521d0a67c..083e0ce01 100644 --- a/admin_document_template_add_modal.php +++ b/modals/admin_document_template_add_modal.php @@ -11,7 +11,7 @@
    - +
    diff --git a/admin_document_template_edit_modal.php b/modals/admin_document_template_edit_modal.php similarity index 94% rename from admin_document_template_edit_modal.php rename to modals/admin_document_template_edit_modal.php index f142baa74..402da52e7 100644 --- a/admin_document_template_edit_modal.php +++ b/modals/admin_document_template_edit_modal.php @@ -12,7 +12,7 @@
    - +
    diff --git a/admin_project_template_add_modal.php b/modals/admin_project_template_add_modal.php similarity index 95% rename from admin_project_template_add_modal.php rename to modals/admin_project_template_add_modal.php index bf881aeea..259e506ab 100644 --- a/admin_project_template_add_modal.php +++ b/modals/admin_project_template_add_modal.php @@ -16,7 +16,7 @@
    - +
    diff --git a/admin_project_template_edit_modal.php b/modals/admin_project_template_edit_modal.php similarity index 94% rename from admin_project_template_edit_modal.php rename to modals/admin_project_template_edit_modal.php index 149f12947..5cbca4df9 100644 --- a/admin_project_template_edit_modal.php +++ b/modals/admin_project_template_edit_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_project_template_ticket_template_add_modal.php b/modals/admin_project_template_ticket_template_add_modal.php similarity index 100% rename from admin_project_template_ticket_template_add_modal.php rename to modals/admin_project_template_ticket_template_add_modal.php diff --git a/admin_role_add_modal.php b/modals/admin_role_add_modal.php similarity index 95% rename from admin_role_add_modal.php rename to modals/admin_role_add_modal.php index e860128f6..0112960d1 100644 --- a/admin_role_add_modal.php +++ b/modals/admin_role_add_modal.php @@ -18,7 +18,7 @@
    - + @@ -28,7 +28,7 @@
    - + diff --git a/admin_role_edit_modal.php b/modals/admin_role_edit_modal.php similarity index 97% rename from admin_role_edit_modal.php rename to modals/admin_role_edit_modal.php index 98356760b..500d013a6 100644 --- a/admin_role_edit_modal.php +++ b/modals/admin_role_edit_modal.php @@ -34,7 +34,7 @@
    - + @@ -44,7 +44,7 @@
    - + diff --git a/admin_software_template_add_modal.php b/modals/admin_software_template_add_modal.php similarity index 96% rename from admin_software_template_add_modal.php rename to modals/admin_software_template_add_modal.php index 2454dfb17..e0881339f 100644 --- a/admin_software_template_add_modal.php +++ b/modals/admin_software_template_add_modal.php @@ -16,7 +16,7 @@
    - + @@ -26,7 +26,7 @@
    - + diff --git a/admin_software_template_edit_modal.php b/modals/admin_software_template_edit_modal.php similarity index 95% rename from admin_software_template_edit_modal.php rename to modals/admin_software_template_edit_modal.php index c51df9e80..a5d3b92d4 100644 --- a/admin_software_template_edit_modal.php +++ b/modals/admin_software_template_edit_modal.php @@ -17,7 +17,7 @@
    - + @@ -27,7 +27,7 @@
    - + diff --git a/admin_tag_add_modal.php b/modals/admin_tag_add_modal.php similarity index 97% rename from admin_tag_add_modal.php rename to modals/admin_tag_add_modal.php index 4406de2ee..91e6dd785 100644 --- a/admin_tag_add_modal.php +++ b/modals/admin_tag_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/admin_tag_edit_modal.php b/modals/admin_tag_edit_modal.php similarity index 98% rename from admin_tag_edit_modal.php rename to modals/admin_tag_edit_modal.php index 80f3df07c..17bfbe638 100644 --- a/admin_tag_edit_modal.php +++ b/modals/admin_tag_edit_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/admin_tax_add_modal.php b/modals/admin_tax_add_modal.php similarity index 95% rename from admin_tax_add_modal.php rename to modals/admin_tax_add_modal.php index 59cfadb7f..95bf4f78b 100644 --- a/admin_tax_add_modal.php +++ b/modals/admin_tax_add_modal.php @@ -13,7 +13,7 @@
    - +
    diff --git a/admin_tax_edit_modal.php b/modals/admin_tax_edit_modal.php similarity index 96% rename from admin_tax_edit_modal.php rename to modals/admin_tax_edit_modal.php index 89e625e48..198ac6615 100644 --- a/admin_tax_edit_modal.php +++ b/modals/admin_tax_edit_modal.php @@ -15,7 +15,7 @@
    - +
    diff --git a/admin_ticket_status_add_modal.php b/modals/admin_ticket_status_add_modal.php similarity index 96% rename from admin_ticket_status_add_modal.php rename to modals/admin_ticket_status_add_modal.php index 595a162e5..ceb78a246 100644 --- a/admin_ticket_status_add_modal.php +++ b/modals/admin_ticket_status_add_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_ticket_status_edit_modal.php b/modals/admin_ticket_status_edit_modal.php similarity index 97% rename from admin_ticket_status_edit_modal.php rename to modals/admin_ticket_status_edit_modal.php index 5f9d16b8d..836ac71c6 100644 --- a/admin_ticket_status_edit_modal.php +++ b/modals/admin_ticket_status_edit_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_ticket_template_add_modal.php b/modals/admin_ticket_template_add_modal.php similarity index 80% rename from admin_ticket_template_add_modal.php rename to modals/admin_ticket_template_add_modal.php index c95fd372f..84dbb4308 100644 --- a/admin_ticket_template_add_modal.php +++ b/modals/admin_ticket_template_add_modal.php @@ -16,7 +16,7 @@
    - + @@ -26,24 +26,13 @@
    - + - -
    - -
    - -
    - - -
    - -
    - +
    +
    -
    diff --git a/admin_ticket_template_edit_modal.php b/modals/admin_ticket_template_edit_modal.php similarity index 72% rename from admin_ticket_template_edit_modal.php rename to modals/admin_ticket_template_edit_modal.php index 1555057b0..76678dc10 100644 --- a/admin_ticket_template_edit_modal.php +++ b/modals/admin_ticket_template_edit_modal.php @@ -18,7 +18,7 @@
    - +
    @@ -28,25 +28,14 @@
    - + -
    - +
    -
    - - -
    - -
    - -
    - -
    diff --git a/admin_user_add_modal.php b/modals/admin_user_add_modal.php similarity index 97% rename from admin_user_add_modal.php rename to modals/admin_user_add_modal.php index 9d54bb0b9..954b5b7d2 100644 --- a/admin_user_add_modal.php +++ b/modals/admin_user_add_modal.php @@ -32,7 +32,7 @@
    - +
    @@ -42,7 +42,7 @@
    - + @@ -52,7 +52,7 @@
    - +
    diff --git a/admin_user_all_reset_password_modal.php b/modals/admin_user_all_reset_password_modal.php similarity index 96% rename from admin_user_all_reset_password_modal.php rename to modals/admin_user_all_reset_password_modal.php index 746bfaa13..a68dfdc51 100644 --- a/admin_user_all_reset_password_modal.php +++ b/modals/admin_user_all_reset_password_modal.php @@ -15,7 +15,7 @@
    - +
    diff --git a/admin_user_archive_modal.php b/modals/admin_user_archive_modal.php similarity index 100% rename from admin_user_archive_modal.php rename to modals/admin_user_archive_modal.php diff --git a/admin_user_edit_modal.php b/modals/admin_user_edit_modal.php similarity index 98% rename from admin_user_edit_modal.php rename to modals/admin_user_edit_modal.php index 491c7de6d..11aa7e1b3 100644 --- a/admin_user_edit_modal.php +++ b/modals/admin_user_edit_modal.php @@ -45,7 +45,7 @@
    - @@ -56,7 +56,7 @@
    - diff --git a/admin_user_export_modal.php b/modals/admin_user_export_modal.php similarity index 100% rename from admin_user_export_modal.php rename to modals/admin_user_export_modal.php diff --git a/admin_user_invite_modal.php b/modals/admin_user_invite_modal.php similarity index 89% rename from admin_user_invite_modal.php rename to modals/admin_user_invite_modal.php index 4feb00bab..21c93356b 100644 --- a/admin_user_invite_modal.php +++ b/modals/admin_user_invite_modal.php @@ -17,7 +17,7 @@
    - + @@ -29,9 +29,7 @@ diff --git a/admin_vendor_template_add_modal.php b/modals/admin_vendor_template_add_modal.php similarity index 92% rename from admin_vendor_template_add_modal.php rename to modals/admin_vendor_template_add_modal.php index f7b014ad1..4e5f5dcbf 100644 --- a/admin_vendor_template_add_modal.php +++ b/modals/admin_vendor_template_add_modal.php @@ -37,7 +37,7 @@
    - + @@ -47,7 +47,7 @@
    - + @@ -57,7 +57,7 @@
    - + @@ -67,7 +67,7 @@
    - + @@ -83,12 +83,12 @@
    - +
    - +
    @@ -98,7 +98,7 @@
    - + @@ -108,7 +108,7 @@
    - + @@ -118,7 +118,7 @@
    - + @@ -128,7 +128,7 @@
    - + @@ -138,7 +138,7 @@
    - + diff --git a/admin_vendor_template_edit_modal.php b/modals/admin_vendor_template_edit_modal.php similarity index 91% rename from admin_vendor_template_edit_modal.php rename to modals/admin_vendor_template_edit_modal.php index 7aa3cb39d..ef9a47703 100644 --- a/admin_vendor_template_edit_modal.php +++ b/modals/admin_vendor_template_edit_modal.php @@ -38,7 +38,7 @@
    - " required> + " required>
    @@ -53,7 +53,7 @@
    - +
    @@ -68,7 +68,7 @@
    - +
    @@ -83,7 +83,7 @@
    - +
    @@ -111,7 +111,7 @@
    - +
    @@ -121,7 +121,7 @@
    - +
    @@ -131,7 +131,7 @@
    - +
    @@ -146,7 +146,7 @@
    - +
    @@ -161,7 +161,7 @@
    - +
    @@ -176,7 +176,7 @@
    - +
    @@ -191,7 +191,7 @@
    - +
    diff --git a/budget_create_modal.php b/modals/budget_create_modal.php similarity index 98% rename from budget_create_modal.php rename to modals/budget_create_modal.php index 75fddfee9..5f3bb0afe 100644 --- a/budget_create_modal.php +++ b/modals/budget_create_modal.php @@ -54,7 +54,7 @@
    - +
    diff --git a/budget_edit_modal.php b/modals/budget_edit_modal.php similarity index 98% rename from budget_edit_modal.php rename to modals/budget_edit_modal.php index b86f24f5e..a23376ac5 100644 --- a/budget_edit_modal.php +++ b/modals/budget_edit_modal.php @@ -51,7 +51,7 @@
    - +
    diff --git a/calendar_add_modal.php b/modals/calendar_add_modal.php similarity index 95% rename from calendar_add_modal.php rename to modals/calendar_add_modal.php index 4a67741a1..5a0dae617 100644 --- a/calendar_add_modal.php +++ b/modals/calendar_add_modal.php @@ -16,7 +16,7 @@
    - +
    diff --git a/calendar_edit_modal.php b/modals/calendar_edit_modal.php similarity index 95% rename from calendar_edit_modal.php rename to modals/calendar_edit_modal.php index c0ead624b..4747bd243 100644 --- a/calendar_edit_modal.php +++ b/modals/calendar_edit_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/calendar_event_add_modal.php b/modals/calendar_event_add_modal.php similarity index 99% rename from calendar_event_add_modal.php rename to modals/calendar_event_add_modal.php index a65c380d0..401fc1634 100644 --- a/calendar_event_add_modal.php +++ b/modals/calendar_event_add_modal.php @@ -34,7 +34,7 @@
    - +
    diff --git a/calendar_event_edit_modal.php b/modals/calendar_event_edit_modal.php similarity index 98% rename from calendar_event_edit_modal.php rename to modals/calendar_event_edit_modal.php index da0bd3d8f..9debcc423 100644 --- a/calendar_event_edit_modal.php +++ b/modals/calendar_event_edit_modal.php @@ -37,7 +37,7 @@
    - +
    diff --git a/client_add_modal.php b/modals/client_add_modal.php similarity index 78% rename from client_add_modal.php rename to modals/client_add_modal.php index 8e58f766f..4f9b53380 100644 --- a/client_add_modal.php +++ b/modals/client_add_modal.php @@ -2,7 +2,7 @@
    -
    Creating New
    +
    Creating New
    @@ -22,9 +22,9 @@ Contact -
  10. - Billing -
    11. +
  11. + Billing +
  12. Notes @@ -43,10 +43,10 @@
    - +
    - > + >
    13. @@ -68,7 +68,7 @@
    - +
    @@ -98,7 +98,7 @@
    - +
    @@ -133,7 +133,7 @@
    - +
    @@ -143,7 +143,7 @@
    - +
    @@ -153,7 +153,7 @@
    - +
    @@ -163,7 +163,7 @@
    - +
    @@ -173,7 +173,7 @@
    - +
    @@ -183,7 +183,7 @@
    - + @@ -212,7 +212,7 @@
    - + @@ -222,7 +222,7 @@
    - + @@ -234,12 +234,12 @@
    - +
    - +
    @@ -250,7 +250,7 @@
    - + @@ -260,7 +260,7 @@
    - + @@ -268,58 +268,58 @@ -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + ">
    - ">
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    +
    diff --git a/client_asset_add_modal.php b/modals/client_asset_add_modal.php similarity index 97% rename from client_asset_add_modal.php rename to modals/client_asset_add_modal.php index 83032aa71..ef42aec1b 100644 --- a/client_asset_add_modal.php +++ b/modals/client_asset_add_modal.php @@ -47,7 +47,7 @@
    - +
    @@ -57,7 +57,7 @@
    - +
    @@ -84,7 +84,7 @@
    - +
    @@ -94,7 +94,7 @@
    - +
    @@ -104,7 +104,7 @@
    - + @@ -116,7 +116,7 @@
    - + @@ -170,7 +170,7 @@
    - + @@ -180,7 +180,7 @@
    - + @@ -190,7 +190,7 @@
    - + @@ -200,7 +200,7 @@
    - + @@ -210,7 +210,7 @@
    - + @@ -224,7 +224,7 @@
    - + diff --git a/client_asset_bulk_add_ticket_modal.php b/modals/client_asset_bulk_add_ticket_modal.php similarity index 99% rename from client_asset_bulk_add_ticket_modal.php rename to modals/client_asset_bulk_add_ticket_modal.php index 1749e9022..941b3f6bb 100644 --- a/client_asset_bulk_add_ticket_modal.php +++ b/modals/client_asset_bulk_add_ticket_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/client_asset_bulk_assign_contact_modal.php b/modals/client_asset_bulk_assign_contact_modal.php similarity index 100% rename from client_asset_bulk_assign_contact_modal.php rename to modals/client_asset_bulk_assign_contact_modal.php diff --git a/client_asset_bulk_assign_location_modal.php b/modals/client_asset_bulk_assign_location_modal.php similarity index 100% rename from client_asset_bulk_assign_location_modal.php rename to modals/client_asset_bulk_assign_location_modal.php diff --git a/client_asset_bulk_edit_status_modal.php b/modals/client_asset_bulk_edit_status_modal.php similarity index 100% rename from client_asset_bulk_edit_status_modal.php rename to modals/client_asset_bulk_edit_status_modal.php diff --git a/client_asset_copy_modal.php b/modals/client_asset_copy_modal.php similarity index 100% rename from client_asset_copy_modal.php rename to modals/client_asset_copy_modal.php diff --git a/client_asset_documents_modal.php b/modals/client_asset_documents_modal.php similarity index 100% rename from client_asset_documents_modal.php rename to modals/client_asset_documents_modal.php diff --git a/client_asset_edit_modal.php b/modals/client_asset_edit_modal.php similarity index 95% rename from client_asset_edit_modal.php rename to modals/client_asset_edit_modal.php index 2083d5a95..1289c9023 100644 --- a/client_asset_edit_modal.php +++ b/modals/client_asset_edit_modal.php @@ -47,7 +47,7 @@
    - + @@ -57,7 +57,7 @@
    - + @@ -83,7 +83,7 @@
    - + @@ -93,7 +93,7 @@
    - + @@ -103,7 +103,7 @@
    - + @@ -115,7 +115,7 @@
    - + @@ -160,7 +160,7 @@
    - +
    > @@ -175,7 +175,7 @@
    - +
    @@ -185,7 +185,7 @@
    - + @@ -195,7 +195,7 @@
    - + @@ -205,7 +205,7 @@
    - + @@ -215,7 +215,7 @@
    - + @@ -229,7 +229,7 @@
    - + diff --git a/client_asset_export_modal.php b/modals/client_asset_export_modal.php similarity index 100% rename from client_asset_export_modal.php rename to modals/client_asset_export_modal.php diff --git a/client_asset_import_modal.php b/modals/client_asset_import_modal.php similarity index 100% rename from client_asset_import_modal.php rename to modals/client_asset_import_modal.php diff --git a/client_asset_interface_add_modal.php b/modals/client_asset_interface_add_modal.php similarity index 59% rename from client_asset_interface_add_modal.php rename to modals/client_asset_interface_add_modal.php index b2183a7c5..b4c5ee1d0 100644 --- a/client_asset_interface_add_modal.php +++ b/modals/client_asset_interface_add_modal.php @@ -14,58 +14,69 @@
    +
    - +
    +
    - +
    +
    - +
    - + +
    +
    + +
    +
    +
    - +
    +
    - +
    +
    - +
    @@ -73,20 +84,55 @@ +
    +
    + +
    + +
    +
    + +
    +
    +
    @@ -94,7 +140,9 @@
    - +
    diff --git a/modals/client_asset_interface_edit_modal.php b/modals/client_asset_interface_edit_modal.php new file mode 100644 index 000000000..df6bba760 --- /dev/null +++ b/modals/client_asset_interface_edit_modal.php @@ -0,0 +1,236 @@ + + + diff --git a/client_asset_transfer_modal.php b/modals/client_asset_transfer_modal.php similarity index 100% rename from client_asset_transfer_modal.php rename to modals/client_asset_transfer_modal.php diff --git a/client_certificate_add_modal.php b/modals/client_certificate_add_modal.php similarity index 97% rename from client_certificate_add_modal.php rename to modals/client_certificate_add_modal.php index b25b058dd..8f3428c83 100644 --- a/client_certificate_add_modal.php +++ b/modals/client_certificate_add_modal.php @@ -35,7 +35,7 @@
    - + @@ -81,7 +81,7 @@
     https://
    - +
    @@ -94,7 +94,7 @@
    - + diff --git a/client_certificate_edit_modal.php b/modals/client_certificate_edit_modal.php similarity index 97% rename from client_certificate_edit_modal.php rename to modals/client_certificate_edit_modal.php index 737ed6f9a..c43991ced 100644 --- a/client_certificate_edit_modal.php +++ b/modals/client_certificate_edit_modal.php @@ -36,7 +36,7 @@
    - + @@ -71,7 +71,7 @@
     https://
    - +
    @@ -84,7 +84,7 @@
    - + diff --git a/client_certificate_export_modal.php b/modals/client_certificate_export_modal.php similarity index 100% rename from client_certificate_export_modal.php rename to modals/client_certificate_export_modal.php diff --git a/client_contact_add_modal.php b/modals/client_contact_add_modal.php similarity index 96% rename from client_contact_add_modal.php rename to modals/client_contact_add_modal.php index 486447df7..0517520d1 100644 --- a/client_contact_add_modal.php +++ b/modals/client_contact_add_modal.php @@ -38,7 +38,7 @@
    - +
    @@ -53,7 +53,7 @@
    - +
    @@ -63,7 +63,7 @@
    - + @@ -75,12 +75,12 @@
    - +
    - +
    @@ -90,7 +90,7 @@
    - + @@ -100,7 +100,7 @@
    - + @@ -145,7 +145,7 @@
    - + diff --git a/client_contact_archive_modal.php b/modals/client_contact_archive_modal.php similarity index 100% rename from client_contact_archive_modal.php rename to modals/client_contact_archive_modal.php diff --git a/client_contact_bulk_assign_location_modal.php b/modals/client_contact_bulk_assign_location_modal.php similarity index 100% rename from client_contact_bulk_assign_location_modal.php rename to modals/client_contact_bulk_assign_location_modal.php diff --git a/client_contact_bulk_assign_tags_modal.php b/modals/client_contact_bulk_assign_tags_modal.php similarity index 100% rename from client_contact_bulk_assign_tags_modal.php rename to modals/client_contact_bulk_assign_tags_modal.php diff --git a/client_contact_bulk_edit_department_modal.php b/modals/client_contact_bulk_edit_department_modal.php similarity index 94% rename from client_contact_bulk_edit_department_modal.php rename to modals/client_contact_bulk_edit_department_modal.php index ae6192cb1..dfa1b7330 100644 --- a/client_contact_bulk_edit_department_modal.php +++ b/modals/client_contact_bulk_edit_department_modal.php @@ -16,7 +16,7 @@
    - + diff --git a/client_contact_bulk_edit_phone_modal.php b/modals/client_contact_bulk_edit_phone_modal.php similarity index 95% rename from client_contact_bulk_edit_phone_modal.php rename to modals/client_contact_bulk_edit_phone_modal.php index cc27c3173..8f1df37c8 100644 --- a/client_contact_bulk_edit_phone_modal.php +++ b/modals/client_contact_bulk_edit_phone_modal.php @@ -16,7 +16,7 @@
    - + diff --git a/client_contact_bulk_edit_role_modal.php b/modals/client_contact_bulk_edit_role_modal.php similarity index 100% rename from client_contact_bulk_edit_role_modal.php rename to modals/client_contact_bulk_edit_role_modal.php diff --git a/client_contact_bulk_email_modal.php b/modals/client_contact_bulk_email_modal.php similarity index 96% rename from client_contact_bulk_email_modal.php rename to modals/client_contact_bulk_email_modal.php index df04478bc..b0b92ef0a 100644 --- a/client_contact_bulk_email_modal.php +++ b/modals/client_contact_bulk_email_modal.php @@ -24,12 +24,12 @@
    -
    - +
    diff --git a/client_contact_create_note_modal.php b/modals/client_contact_create_note_modal.php similarity index 100% rename from client_contact_create_note_modal.php rename to modals/client_contact_create_note_modal.php diff --git a/client_contact_edit_modal.php b/modals/client_contact_edit_modal.php similarity index 95% rename from client_contact_edit_modal.php rename to modals/client_contact_edit_modal.php index ff78a2953..3205850f5 100644 --- a/client_contact_edit_modal.php +++ b/modals/client_contact_edit_modal.php @@ -39,7 +39,7 @@
    - +
    > @@ -54,7 +54,7 @@
    - +
    @@ -64,7 +64,7 @@
    - +
    @@ -76,12 +76,12 @@
    - +
    - +
    @@ -91,7 +91,7 @@
    - + @@ -101,7 +101,7 @@
    - + @@ -145,7 +145,7 @@
    - + diff --git a/client_contact_export_modal.php b/modals/client_contact_export_modal.php similarity index 100% rename from client_contact_export_modal.php rename to modals/client_contact_export_modal.php diff --git a/client_contact_import_modal.php b/modals/client_contact_import_modal.php similarity index 100% rename from client_contact_import_modal.php rename to modals/client_contact_import_modal.php diff --git a/client_contact_invite_modal.php b/modals/client_contact_invite_modal.php similarity index 98% rename from client_contact_invite_modal.php rename to modals/client_contact_invite_modal.php index baa87a272..0ea124c31 100644 --- a/client_contact_invite_modal.php +++ b/modals/client_contact_invite_modal.php @@ -19,7 +19,7 @@
    - + @@ -81,4 +81,4 @@ - + \ No newline at end of file diff --git a/client_contact_link_asset_modal.php b/modals/client_contact_link_asset_modal.php similarity index 100% rename from client_contact_link_asset_modal.php rename to modals/client_contact_link_asset_modal.php diff --git a/client_contact_link_credential_modal.php b/modals/client_contact_link_credential_modal.php similarity index 100% rename from client_contact_link_credential_modal.php rename to modals/client_contact_link_credential_modal.php diff --git a/client_contact_link_document_modal.php b/modals/client_contact_link_document_modal.php similarity index 100% rename from client_contact_link_document_modal.php rename to modals/client_contact_link_document_modal.php diff --git a/client_contact_link_file_modal.php b/modals/client_contact_link_file_modal.php similarity index 100% rename from client_contact_link_file_modal.php rename to modals/client_contact_link_file_modal.php diff --git a/client_contact_link_service_modal.php b/modals/client_contact_link_service_modal.php similarity index 100% rename from client_contact_link_service_modal.php rename to modals/client_contact_link_service_modal.php diff --git a/client_contact_link_software_modal.php b/modals/client_contact_link_software_modal.php similarity index 100% rename from client_contact_link_software_modal.php rename to modals/client_contact_link_software_modal.php diff --git a/client_delete_modal.php b/modals/client_delete_modal.php similarity index 100% rename from client_delete_modal.php rename to modals/client_delete_modal.php diff --git a/client_document_add_file_relation_modal.php b/modals/client_document_add_file_relation_modal.php similarity index 100% rename from client_document_add_file_relation_modal.php rename to modals/client_document_add_file_relation_modal.php diff --git a/client_document_add_from_template_modal.php b/modals/client_document_add_from_template_modal.php similarity index 100% rename from client_document_add_from_template_modal.php rename to modals/client_document_add_from_template_modal.php diff --git a/client_document_add_modal.php b/modals/client_document_add_modal.php similarity index 98% rename from client_document_add_modal.php rename to modals/client_document_add_modal.php index f493fb11b..e4010942c 100644 --- a/client_document_add_modal.php +++ b/modals/client_document_add_modal.php @@ -12,7 +12,7 @@
    - +
    diff --git a/client_document_bulk_move_modal.php b/modals/client_document_bulk_move_modal.php similarity index 100% rename from client_document_bulk_move_modal.php rename to modals/client_document_bulk_move_modal.php diff --git a/client_document_edit_modal.php b/modals/client_document_edit_modal.php similarity index 97% rename from client_document_edit_modal.php rename to modals/client_document_edit_modal.php index 4a6904d71..7fd53b3ec 100644 --- a/client_document_edit_modal.php +++ b/modals/client_document_edit_modal.php @@ -15,7 +15,7 @@
    - +
    diff --git a/client_document_link_asset_modal.php b/modals/client_document_link_asset_modal.php similarity index 100% rename from client_document_link_asset_modal.php rename to modals/client_document_link_asset_modal.php diff --git a/client_document_link_contact_modal.php b/modals/client_document_link_contact_modal.php similarity index 100% rename from client_document_link_contact_modal.php rename to modals/client_document_link_contact_modal.php diff --git a/client_document_link_file_modal.php b/modals/client_document_link_file_modal.php similarity index 100% rename from client_document_link_file_modal.php rename to modals/client_document_link_file_modal.php diff --git a/client_document_link_software_modal.php b/modals/client_document_link_software_modal.php similarity index 100% rename from client_document_link_software_modal.php rename to modals/client_document_link_software_modal.php diff --git a/client_document_link_vendor_modal.php b/modals/client_document_link_vendor_modal.php similarity index 100% rename from client_document_link_vendor_modal.php rename to modals/client_document_link_vendor_modal.php diff --git a/client_document_move_modal.php b/modals/client_document_move_modal.php similarity index 100% rename from client_document_move_modal.php rename to modals/client_document_move_modal.php diff --git a/client_document_rename_modal.php b/modals/client_document_rename_modal.php similarity index 95% rename from client_document_rename_modal.php rename to modals/client_document_rename_modal.php index fbfb1e76f..7a05f6b82 100644 --- a/client_document_rename_modal.php +++ b/modals/client_document_rename_modal.php @@ -18,7 +18,7 @@
    - +
    diff --git a/client_document_view_modal.php b/modals/client_document_view_modal.php similarity index 100% rename from client_document_view_modal.php rename to modals/client_document_view_modal.php diff --git a/client_domain_add_modal.php b/modals/client_domain_add_modal.php similarity index 99% rename from client_domain_add_modal.php rename to modals/client_domain_add_modal.php index abe56508e..70049ea81 100644 --- a/client_domain_add_modal.php +++ b/modals/client_domain_add_modal.php @@ -33,7 +33,7 @@
    - +
    diff --git a/client_domain_edit_modal.php b/modals/client_domain_edit_modal.php similarity index 94% rename from client_domain_edit_modal.php rename to modals/client_domain_edit_modal.php index f7d27e989..9c7c0af46 100644 --- a/client_domain_edit_modal.php +++ b/modals/client_domain_edit_modal.php @@ -22,6 +22,9 @@
  13. Notes
    14. +
  14. + History +
    15. @@ -36,7 +39,7 @@
    - + @@ -166,6 +169,14 @@ +
    +
    +
    +
    +
    +
    +
    + diff --git a/client_domain_export_modal.php b/modals/client_domain_export_modal.php similarity index 100% rename from client_domain_export_modal.php rename to modals/client_domain_export_modal.php diff --git a/client_download_pdf_modal.php b/modals/client_download_pdf_modal.php similarity index 100% rename from client_download_pdf_modal.php rename to modals/client_download_pdf_modal.php diff --git a/client_edit_modal.php b/modals/client_edit_modal.php similarity index 64% rename from client_edit_modal.php rename to modals/client_edit_modal.php index eedaa4ea9..75744465f 100644 --- a/client_edit_modal.php +++ b/modals/client_edit_modal.php @@ -11,7 +11,7 @@
    - +
    @@ -104,8 +104,8 @@
    - + @@ -134,70 +134,70 @@ -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    +
    @@ -205,7 +205,7 @@
    + name="notes">
    diff --git a/client_export_modal.php b/modals/client_export_modal.php similarity index 100% rename from client_export_modal.php rename to modals/client_export_modal.php diff --git a/client_file_bulk_move_modal.php b/modals/client_file_bulk_move_modal.php similarity index 100% rename from client_file_bulk_move_modal.php rename to modals/client_file_bulk_move_modal.php diff --git a/client_file_delete_modal.php b/modals/client_file_delete_modal.php similarity index 100% rename from client_file_delete_modal.php rename to modals/client_file_delete_modal.php diff --git a/client_file_link_asset_modal.php b/modals/client_file_link_asset_modal.php similarity index 100% rename from client_file_link_asset_modal.php rename to modals/client_file_link_asset_modal.php diff --git a/client_file_move_modal.php b/modals/client_file_move_modal.php similarity index 100% rename from client_file_move_modal.php rename to modals/client_file_move_modal.php diff --git a/client_file_rename_modal.php b/modals/client_file_rename_modal.php similarity index 90% rename from client_file_rename_modal.php rename to modals/client_file_rename_modal.php index 8f50485f1..ceefe30b5 100644 --- a/client_file_rename_modal.php +++ b/modals/client_file_rename_modal.php @@ -17,7 +17,7 @@
    - +
    @@ -27,7 +27,7 @@
    - +
    diff --git a/client_file_upload_modal.php b/modals/client_file_upload_modal.php similarity index 98% rename from client_file_upload_modal.php rename to modals/client_file_upload_modal.php index 10b8967fd..12246ef15 100644 --- a/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -18,7 +18,7 @@
    - +
    diff --git a/client_file_view_modal.php b/modals/client_file_view_modal.php similarity index 100% rename from client_file_view_modal.php rename to modals/client_file_view_modal.php diff --git a/client_import_modal.php b/modals/client_import_modal.php similarity index 100% rename from client_import_modal.php rename to modals/client_import_modal.php diff --git a/client_invoice_export_modal.php b/modals/client_invoice_export_modal.php similarity index 100% rename from client_invoice_export_modal.php rename to modals/client_invoice_export_modal.php diff --git a/client_location_add_modal.php b/modals/client_location_add_modal.php similarity index 95% rename from client_location_add_modal.php rename to modals/client_location_add_modal.php index 541a05274..463e7d0c0 100644 --- a/client_location_add_modal.php +++ b/modals/client_location_add_modal.php @@ -40,7 +40,7 @@
    - +
    @@ -74,7 +74,7 @@
    - +
    @@ -84,7 +84,7 @@
    - +
    @@ -94,7 +94,7 @@
    - + @@ -104,7 +104,7 @@
    - + @@ -155,7 +155,7 @@
    - + @@ -165,7 +165,7 @@
    - + @@ -175,7 +175,7 @@
    - + diff --git a/client_location_bulk_assign_tags_modal.php b/modals/client_location_bulk_assign_tags_modal.php similarity index 100% rename from client_location_bulk_assign_tags_modal.php rename to modals/client_location_bulk_assign_tags_modal.php diff --git a/client_location_edit_modal.php b/modals/client_location_edit_modal.php similarity index 94% rename from client_location_edit_modal.php rename to modals/client_location_edit_modal.php index fdec329a7..5dab330cc 100644 --- a/client_location_edit_modal.php +++ b/modals/client_location_edit_modal.php @@ -40,7 +40,7 @@
    - +
    > @@ -80,7 +80,7 @@
    - +
    @@ -90,7 +90,7 @@
    - + @@ -100,7 +100,7 @@
    - + @@ -110,7 +110,7 @@
    - + @@ -168,7 +168,7 @@
    - + @@ -178,7 +178,7 @@
    - + @@ -188,7 +188,7 @@
    - + diff --git a/client_location_export_modal.php b/modals/client_location_export_modal.php similarity index 100% rename from client_location_export_modal.php rename to modals/client_location_export_modal.php diff --git a/client_location_import_modal.php b/modals/client_location_import_modal.php similarity index 100% rename from client_location_import_modal.php rename to modals/client_location_import_modal.php diff --git a/client_login_add_modal.php b/modals/client_login_add_modal.php similarity index 96% rename from client_login_add_modal.php rename to modals/client_login_add_modal.php index 8ce5edd03..1cf2364ca 100644 --- a/client_login_add_modal.php +++ b/modals/client_login_add_modal.php @@ -36,7 +36,7 @@
    - +
    @@ -51,7 +51,7 @@
    - +
    @@ -61,7 +61,7 @@
    - + @@ -71,7 +71,7 @@
    - +
    @@ -87,7 +87,7 @@
    - +
    @@ -100,7 +100,7 @@
    - + @@ -110,7 +110,7 @@
    - + diff --git a/client_login_bulk_assign_tags_modal.php b/modals/client_login_bulk_assign_tags_modal.php similarity index 100% rename from client_login_bulk_assign_tags_modal.php rename to modals/client_login_bulk_assign_tags_modal.php diff --git a/client_login_edit_modal.php b/modals/client_login_edit_modal.php similarity index 96% rename from client_login_edit_modal.php rename to modals/client_login_edit_modal.php index 947bd505b..0c8cbc564 100644 --- a/client_login_edit_modal.php +++ b/modals/client_login_edit_modal.php @@ -37,7 +37,7 @@
    - +
    > @@ -62,7 +62,7 @@
    - +
    @@ -72,7 +72,7 @@
    - +
    @@ -88,7 +88,7 @@
    - +
    @@ -101,7 +101,7 @@
    - +
    @@ -118,7 +118,7 @@
    - +
    diff --git a/client_login_export_modal.php b/modals/client_login_export_modal.php similarity index 100% rename from client_login_export_modal.php rename to modals/client_login_export_modal.php diff --git a/client_login_import_modal.php b/modals/client_login_import_modal.php similarity index 100% rename from client_login_import_modal.php rename to modals/client_login_import_modal.php diff --git a/client_network_add_modal.php b/modals/client_network_add_modal.php similarity index 91% rename from client_network_add_modal.php rename to modals/client_network_add_modal.php index 5f35b82f4..9627c52bd 100644 --- a/client_network_add_modal.php +++ b/modals/client_network_add_modal.php @@ -38,7 +38,7 @@
    - +
    @@ -95,7 +95,7 @@
    - + @@ -105,7 +105,7 @@
    - + @@ -115,7 +115,7 @@
    - + @@ -125,7 +125,7 @@
    - + @@ -138,7 +138,7 @@
    - + @@ -148,7 +148,7 @@
    - + diff --git a/client_network_edit_modal.php b/modals/client_network_edit_modal.php similarity index 95% rename from client_network_edit_modal.php rename to modals/client_network_edit_modal.php index 7a251adce..7d4791ffa 100644 --- a/client_network_edit_modal.php +++ b/modals/client_network_edit_modal.php @@ -39,7 +39,7 @@
    - + @@ -85,7 +85,7 @@
    - + @@ -95,7 +95,7 @@
    - + @@ -105,7 +105,7 @@
    - + @@ -115,7 +115,7 @@
    - + @@ -129,7 +129,7 @@
    - + @@ -139,7 +139,7 @@
    - + diff --git a/client_network_export_modal.php b/modals/client_network_export_modal.php similarity index 100% rename from client_network_export_modal.php rename to modals/client_network_export_modal.php diff --git a/client_payment_export_modal.php b/modals/client_payment_export_modal.php similarity index 100% rename from client_payment_export_modal.php rename to modals/client_payment_export_modal.php diff --git a/client_quote_export_modal.php b/modals/client_quote_export_modal.php similarity index 100% rename from client_quote_export_modal.php rename to modals/client_quote_export_modal.php diff --git a/client_rack_add_modal.php b/modals/client_rack_add_modal.php similarity index 97% rename from client_rack_add_modal.php rename to modals/client_rack_add_modal.php index 8f66ea330..542253727 100644 --- a/client_rack_add_modal.php +++ b/modals/client_rack_add_modal.php @@ -35,7 +35,7 @@
    - + @@ -70,7 +70,7 @@
    - + @@ -80,7 +80,7 @@
    - + @@ -100,7 +100,7 @@
    - + diff --git a/client_rack_edit_modal.php b/modals/client_rack_edit_modal.php similarity index 96% rename from client_rack_edit_modal.php rename to modals/client_rack_edit_modal.php index 3bff86b57..280a87e2d 100644 --- a/client_rack_edit_modal.php +++ b/modals/client_rack_edit_modal.php @@ -36,7 +36,7 @@
    - + @@ -71,7 +71,7 @@
    - + @@ -81,7 +81,7 @@
    - + @@ -101,7 +101,7 @@
    - + diff --git a/client_rack_unit_add_modal.php b/modals/client_rack_unit_add_modal.php similarity index 98% rename from client_rack_unit_add_modal.php rename to modals/client_rack_unit_add_modal.php index c01225ada..acd3fd5bb 100644 --- a/client_rack_unit_add_modal.php +++ b/modals/client_rack_unit_add_modal.php @@ -21,7 +21,7 @@
    - + diff --git a/client_recurring_export_modal.php b/modals/client_recurring_export_modal.php similarity index 100% rename from client_recurring_export_modal.php rename to modals/client_recurring_export_modal.php diff --git a/client_service_add_modal.php b/modals/client_service_add_modal.php similarity index 97% rename from client_service_add_modal.php rename to modals/client_service_add_modal.php index 102c96456..fcc9edf35 100644 --- a/client_service_add_modal.php +++ b/modals/client_service_add_modal.php @@ -39,7 +39,7 @@
    - + @@ -49,7 +49,7 @@
    - + @@ -60,7 +60,7 @@
    - + @@ -84,7 +84,7 @@
    - + diff --git a/client_service_edit_modal.php b/modals/client_service_edit_modal.php similarity index 97% rename from client_service_edit_modal.php rename to modals/client_service_edit_modal.php index c2fa6bd6f..3b0170b2c 100644 --- a/client_service_edit_modal.php +++ b/modals/client_service_edit_modal.php @@ -38,7 +38,7 @@
    - + @@ -48,7 +48,7 @@
    - + @@ -59,7 +59,7 @@
    - + @@ -83,7 +83,7 @@
    - + diff --git a/client_service_view_modal.php b/modals/client_service_view_modal.php similarity index 100% rename from client_service_view_modal.php rename to modals/client_service_view_modal.php diff --git a/client_software_add_from_template_modal.php b/modals/client_software_add_from_template_modal.php similarity index 100% rename from client_software_add_from_template_modal.php rename to modals/client_software_add_from_template_modal.php diff --git a/client_software_add_modal.php b/modals/client_software_add_modal.php similarity index 98% rename from client_software_add_modal.php rename to modals/client_software_add_modal.php index 6a2407157..b8eb8a66c 100644 --- a/client_software_add_modal.php +++ b/modals/client_software_add_modal.php @@ -41,7 +41,7 @@
    - + @@ -51,7 +51,7 @@
    - + @@ -115,7 +115,7 @@
    - + diff --git a/client_software_edit_modal.php b/modals/client_software_edit_modal.php similarity index 97% rename from client_software_edit_modal.php rename to modals/client_software_edit_modal.php index aeae4a392..ba07e3f57 100644 --- a/client_software_edit_modal.php +++ b/modals/client_software_edit_modal.php @@ -42,7 +42,7 @@
    - + @@ -52,7 +52,7 @@
    - + @@ -115,7 +115,7 @@
    - + diff --git a/client_software_export_modal.php b/modals/client_software_export_modal.php similarity index 100% rename from client_software_export_modal.php rename to modals/client_software_export_modal.php diff --git a/client_ticket_export_modal.php b/modals/client_ticket_export_modal.php similarity index 100% rename from client_ticket_export_modal.php rename to modals/client_ticket_export_modal.php diff --git a/client_trip_export_modal.php b/modals/client_trip_export_modal.php similarity index 100% rename from client_trip_export_modal.php rename to modals/client_trip_export_modal.php diff --git a/client_vendor_export_modal.php b/modals/client_vendor_export_modal.php similarity index 100% rename from client_vendor_export_modal.php rename to modals/client_vendor_export_modal.php diff --git a/custom_field_create_modal.php b/modals/custom_field_create_modal.php similarity index 95% rename from custom_field_create_modal.php rename to modals/custom_field_create_modal.php index a2b2ff541..d0b9916e6 100644 --- a/custom_field_create_modal.php +++ b/modals/custom_field_create_modal.php @@ -14,7 +14,7 @@
    - +
    diff --git a/custom_field_edit_modal.php b/modals/custom_field_edit_modal.php similarity index 96% rename from custom_field_edit_modal.php rename to modals/custom_field_edit_modal.php index b86595a68..da5423519 100644 --- a/custom_field_edit_modal.php +++ b/modals/custom_field_edit_modal.php @@ -13,7 +13,7 @@
    - +
    diff --git a/document_edit_visibility_modal.php b/modals/document_edit_visibility_modal.php similarity index 100% rename from document_edit_visibility_modal.php rename to modals/document_edit_visibility_modal.php diff --git a/expense_add_modal.php b/modals/expense_add_modal.php similarity index 99% rename from expense_add_modal.php rename to modals/expense_add_modal.php index 5689f88dd..8b5e3dbe4 100644 --- a/expense_add_modal.php +++ b/modals/expense_add_modal.php @@ -112,7 +112,7 @@
    - +
    diff --git a/expense_bulk_edit_account_modal.php b/modals/expense_bulk_edit_account_modal.php similarity index 100% rename from expense_bulk_edit_account_modal.php rename to modals/expense_bulk_edit_account_modal.php diff --git a/expense_bulk_edit_category_modal.php b/modals/expense_bulk_edit_category_modal.php similarity index 100% rename from expense_bulk_edit_category_modal.php rename to modals/expense_bulk_edit_category_modal.php diff --git a/expense_bulk_edit_client_modal.php b/modals/expense_bulk_edit_client_modal.php similarity index 100% rename from expense_bulk_edit_client_modal.php rename to modals/expense_bulk_edit_client_modal.php diff --git a/expense_copy_modal.php b/modals/expense_copy_modal.php similarity index 99% rename from expense_copy_modal.php rename to modals/expense_copy_modal.php index 64351a677..3415b0844 100644 --- a/expense_copy_modal.php +++ b/modals/expense_copy_modal.php @@ -109,7 +109,7 @@
    - + diff --git a/expense_edit_modal.php b/modals/expense_edit_modal.php similarity index 99% rename from expense_edit_modal.php rename to modals/expense_edit_modal.php index 8b9f553ff..b4bc7424b 100644 --- a/expense_edit_modal.php +++ b/modals/expense_edit_modal.php @@ -120,7 +120,7 @@
    - + diff --git a/expense_export_modal.php b/modals/expense_export_modal.php similarity index 86% rename from expense_export_modal.php rename to modals/expense_export_modal.php index acc4befc5..d24b0212f 100644 --- a/expense_export_modal.php +++ b/modals/expense_export_modal.php @@ -18,7 +18,7 @@ - + - + @@ -66,7 +66,7 @@ + diff --git a/folder_create_modal.php b/modals/folder_create_modal.php similarity index 96% rename from folder_create_modal.php rename to modals/folder_create_modal.php index 6ecf22a4c..11d32792e 100644 --- a/folder_create_modal.php +++ b/modals/folder_create_modal.php @@ -19,7 +19,7 @@
    - + diff --git a/folder_rename_modal.php b/modals/folder_rename_modal.php similarity index 93% rename from folder_rename_modal.php rename to modals/folder_rename_modal.php index 00b524609..9527d7e8e 100644 --- a/folder_rename_modal.php +++ b/modals/folder_rename_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/invoice_add_modal.php b/modals/invoice_add_modal.php similarity index 98% rename from invoice_add_modal.php rename to modals/invoice_add_modal.php index ba8f6dec9..392a8b715 100644 --- a/invoice_add_modal.php +++ b/modals/invoice_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/invoice_add_ticket_modal.php b/modals/invoice_add_ticket_modal.php similarity index 100% rename from invoice_add_ticket_modal.php rename to modals/invoice_add_ticket_modal.php diff --git a/invoice_copy_modal.php b/modals/invoice_copy_modal.php similarity index 100% rename from invoice_copy_modal.php rename to modals/invoice_copy_modal.php diff --git a/invoice_edit_modal.php b/modals/invoice_edit_modal.php similarity index 98% rename from invoice_edit_modal.php rename to modals/invoice_edit_modal.php index 29cb268ca..82dbae9b9 100644 --- a/invoice_edit_modal.php +++ b/modals/invoice_edit_modal.php @@ -77,7 +77,7 @@
    - + diff --git a/invoice_export_modal.php b/modals/invoice_export_modal.php similarity index 100% rename from invoice_export_modal.php rename to modals/invoice_export_modal.php diff --git a/invoice_note_modal.php b/modals/invoice_note_modal.php similarity index 100% rename from invoice_note_modal.php rename to modals/invoice_note_modal.php diff --git a/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php similarity index 99% rename from invoice_payment_add_bulk_modal.php rename to modals/invoice_payment_add_bulk_modal.php index aa0364892..6e4c030c6 100644 --- a/invoice_payment_add_bulk_modal.php +++ b/modals/invoice_payment_add_bulk_modal.php @@ -123,7 +123,7 @@
    - + diff --git a/invoice_payment_add_modal.php b/modals/invoice_payment_add_modal.php similarity index 99% rename from invoice_payment_add_modal.php rename to modals/invoice_payment_add_modal.php index e86ca5b65..9b5d4d986 100644 --- a/invoice_payment_add_modal.php +++ b/modals/invoice_payment_add_modal.php @@ -118,7 +118,7 @@
    - + diff --git a/invoice_recurring_add_modal.php b/modals/invoice_recurring_add_modal.php similarity index 100% rename from invoice_recurring_add_modal.php rename to modals/invoice_recurring_add_modal.php diff --git a/item_edit_modal.php b/modals/item_edit_modal.php similarity index 98% rename from item_edit_modal.php rename to modals/item_edit_modal.php index 136f974f1..41c88a682 100644 --- a/item_edit_modal.php +++ b/modals/item_edit_modal.php @@ -25,7 +25,7 @@
    - + diff --git a/product_add_modal.php b/modals/product_add_modal.php similarity index 98% rename from product_add_modal.php rename to modals/product_add_modal.php index 20901ed11..8df44e19a 100644 --- a/product_add_modal.php +++ b/modals/product_add_modal.php @@ -16,7 +16,7 @@
    - + diff --git a/product_bulk_edit_category_modal.php b/modals/product_bulk_edit_category_modal.php similarity index 100% rename from product_bulk_edit_category_modal.php rename to modals/product_bulk_edit_category_modal.php diff --git a/product_edit_modal.php b/modals/product_edit_modal.php similarity index 98% rename from product_edit_modal.php rename to modals/product_edit_modal.php index 8801e4711..cac8366ab 100644 --- a/product_edit_modal.php +++ b/modals/product_edit_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/product_export_modal.php b/modals/product_export_modal.php similarity index 100% rename from product_export_modal.php rename to modals/product_export_modal.php diff --git a/project_add_modal.php b/modals/project_add_modal.php similarity index 98% rename from project_add_modal.php rename to modals/project_add_modal.php index 8e7fbc493..463c2a7b1 100644 --- a/project_add_modal.php +++ b/modals/project_add_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/project_edit_modal.php b/modals/project_edit_modal.php similarity index 97% rename from project_edit_modal.php rename to modals/project_edit_modal.php index 95293bc68..8c457d4da 100644 --- a/project_edit_modal.php +++ b/modals/project_edit_modal.php @@ -18,7 +18,7 @@
    - +
    diff --git a/project_ticket_add_modal.php b/modals/project_ticket_add_modal.php similarity index 100% rename from project_ticket_add_modal.php rename to modals/project_ticket_add_modal.php diff --git a/quote_add_modal.php b/modals/quote_add_modal.php similarity index 98% rename from quote_add_modal.php rename to modals/quote_add_modal.php index 95b7962e6..cbacc62aa 100644 --- a/quote_add_modal.php +++ b/modals/quote_add_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/quote_copy_modal.php b/modals/quote_copy_modal.php similarity index 100% rename from quote_copy_modal.php rename to modals/quote_copy_modal.php diff --git a/quote_edit_modal.php b/modals/quote_edit_modal.php similarity index 99% rename from quote_edit_modal.php rename to modals/quote_edit_modal.php index 4c718240c..f639f2e90 100644 --- a/quote_edit_modal.php +++ b/modals/quote_edit_modal.php @@ -64,7 +64,7 @@
    - + diff --git a/quote_note_modal.php b/modals/quote_note_modal.php similarity index 100% rename from quote_note_modal.php rename to modals/quote_note_modal.php diff --git a/quote_to_invoice_modal.php b/modals/quote_to_invoice_modal.php similarity index 100% rename from quote_to_invoice_modal.php rename to modals/quote_to_invoice_modal.php diff --git a/recurring_expense_create_modal.php b/modals/recurring_expense_create_modal.php similarity index 99% rename from recurring_expense_create_modal.php rename to modals/recurring_expense_create_modal.php index 04448ee61..a6e277107 100644 --- a/recurring_expense_create_modal.php +++ b/modals/recurring_expense_create_modal.php @@ -154,7 +154,7 @@
    - + diff --git a/recurring_expense_edit_modal.php b/modals/recurring_expense_edit_modal.php similarity index 99% rename from recurring_expense_edit_modal.php rename to modals/recurring_expense_edit_modal.php index 347e0fc12..3e8693b7f 100644 --- a/recurring_expense_edit_modal.php +++ b/modals/recurring_expense_edit_modal.php @@ -159,7 +159,7 @@
    - + diff --git a/recurring_invoice_add_modal.php b/modals/recurring_invoice_add_modal.php similarity index 98% rename from recurring_invoice_add_modal.php rename to modals/recurring_invoice_add_modal.php index 92e9ebdcc..54cad7ff8 100644 --- a/recurring_invoice_add_modal.php +++ b/modals/recurring_invoice_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/recurring_invoice_edit_modal.php b/modals/recurring_invoice_edit_modal.php similarity index 98% rename from recurring_invoice_edit_modal.php rename to modals/recurring_invoice_edit_modal.php index 4d4504f94..8a8bf31c6 100644 --- a/recurring_invoice_edit_modal.php +++ b/modals/recurring_invoice_edit_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/recurring_invoice_note_modal.php b/modals/recurring_invoice_note_modal.php similarity index 100% rename from recurring_invoice_note_modal.php rename to modals/recurring_invoice_note_modal.php diff --git a/recurring_payment_add_modal.php b/modals/recurring_payment_add_modal.php similarity index 100% rename from recurring_payment_add_modal.php rename to modals/recurring_payment_add_modal.php diff --git a/recurring_ticket_add_modal.php b/modals/recurring_ticket_add_modal.php similarity index 99% rename from recurring_ticket_add_modal.php rename to modals/recurring_ticket_add_modal.php index f1eb7a277..e905d559e 100644 --- a/recurring_ticket_add_modal.php +++ b/modals/recurring_ticket_add_modal.php @@ -40,7 +40,7 @@
    - + @@ -130,7 +130,7 @@
    - diff --git a/recurring_ticket_edit_modal.php b/modals/recurring_ticket_edit_modal.php similarity index 97% rename from recurring_ticket_edit_modal.php rename to modals/recurring_ticket_edit_modal.php index f676d1bf2..1b8a80b9a 100644 --- a/recurring_ticket_edit_modal.php +++ b/modals/recurring_ticket_edit_modal.php @@ -38,7 +38,7 @@
    - + @@ -85,12 +85,12 @@
    - +
    -
    diff --git a/revenue_add_modal.php b/modals/revenue_add_modal.php similarity index 99% rename from revenue_add_modal.php rename to modals/revenue_add_modal.php index 477d2f3dc..cef827726 100644 --- a/revenue_add_modal.php +++ b/modals/revenue_add_modal.php @@ -157,7 +157,7 @@
    - +
    diff --git a/revenue_edit_modal.php b/modals/revenue_edit_modal.php similarity index 98% rename from revenue_edit_modal.php rename to modals/revenue_edit_modal.php index 63466a0c5..41f616f4a 100644 --- a/revenue_edit_modal.php +++ b/modals/revenue_edit_modal.php @@ -163,7 +163,7 @@
    - + diff --git a/share_modal.php b/modals/share_modal.php similarity index 99% rename from share_modal.php rename to modals/share_modal.php index d9963ed7a..852fa3420 100644 --- a/share_modal.php +++ b/modals/share_modal.php @@ -68,7 +68,7 @@
    - +
    diff --git a/task_edit_modal.php b/modals/task_edit_modal.php similarity index 96% rename from task_edit_modal.php rename to modals/task_edit_modal.php index ce0982c11..9a7fb22c3 100644 --- a/task_edit_modal.php +++ b/modals/task_edit_modal.php @@ -20,7 +20,7 @@
    - + diff --git a/ticket_add_modal.php b/modals/ticket_add_modal.php similarity index 99% rename from ticket_add_modal.php rename to modals/ticket_add_modal.php index 1bcb80e68..7de8a5293 100644 --- a/ticket_add_modal.php +++ b/modals/ticket_add_modal.php @@ -106,7 +106,7 @@
    - + diff --git a/ticket_add_watcher_modal.php b/modals/ticket_add_watcher_modal.php similarity index 100% rename from ticket_add_watcher_modal.php rename to modals/ticket_add_watcher_modal.php diff --git a/ticket_assign_modal.php b/modals/ticket_assign_modal.php similarity index 100% rename from ticket_assign_modal.php rename to modals/ticket_assign_modal.php diff --git a/ticket_bulk_add_project_modal.php b/modals/ticket_bulk_add_project_modal.php similarity index 100% rename from ticket_bulk_add_project_modal.php rename to modals/ticket_bulk_add_project_modal.php diff --git a/ticket_bulk_assign_modal.php b/modals/ticket_bulk_assign_modal.php similarity index 100% rename from ticket_bulk_assign_modal.php rename to modals/ticket_bulk_assign_modal.php diff --git a/ticket_bulk_edit_priority_modal.php b/modals/ticket_bulk_edit_priority_modal.php similarity index 100% rename from ticket_bulk_edit_priority_modal.php rename to modals/ticket_bulk_edit_priority_modal.php diff --git a/ticket_bulk_merge_modal.php b/modals/ticket_bulk_merge_modal.php similarity index 100% rename from ticket_bulk_merge_modal.php rename to modals/ticket_bulk_merge_modal.php diff --git a/ticket_bulk_reply_modal.php b/modals/ticket_bulk_reply_modal.php similarity index 100% rename from ticket_bulk_reply_modal.php rename to modals/ticket_bulk_reply_modal.php diff --git a/ticket_bulk_resolve_modal.php b/modals/ticket_bulk_resolve_modal.php similarity index 100% rename from ticket_bulk_resolve_modal.php rename to modals/ticket_bulk_resolve_modal.php diff --git a/ticket_change_client_modal.php b/modals/ticket_change_client_modal.php similarity index 100% rename from ticket_change_client_modal.php rename to modals/ticket_change_client_modal.php diff --git a/ticket_edit_asset_modal.php b/modals/ticket_edit_asset_modal.php similarity index 100% rename from ticket_edit_asset_modal.php rename to modals/ticket_edit_asset_modal.php diff --git a/ticket_edit_billable_modal.php b/modals/ticket_edit_billable_modal.php similarity index 100% rename from ticket_edit_billable_modal.php rename to modals/ticket_edit_billable_modal.php diff --git a/ticket_edit_contact_modal.php b/modals/ticket_edit_contact_modal.php similarity index 100% rename from ticket_edit_contact_modal.php rename to modals/ticket_edit_contact_modal.php diff --git a/ticket_edit_modal.php b/modals/ticket_edit_modal.php similarity index 98% rename from ticket_edit_modal.php rename to modals/ticket_edit_modal.php index 096f571c0..23d856391 100644 --- a/ticket_edit_modal.php +++ b/modals/ticket_edit_modal.php @@ -36,7 +36,7 @@
    - + @@ -261,7 +261,7 @@ diff --git a/ticket_edit_priority_modal.php b/modals/ticket_edit_priority_modal.php similarity index 100% rename from ticket_edit_priority_modal.php rename to modals/ticket_edit_priority_modal.php diff --git a/ticket_edit_schedule_modal.php b/modals/ticket_edit_schedule_modal.php similarity index 100% rename from ticket_edit_schedule_modal.php rename to modals/ticket_edit_schedule_modal.php diff --git a/ticket_edit_vendor_modal.php b/modals/ticket_edit_vendor_modal.php similarity index 100% rename from ticket_edit_vendor_modal.php rename to modals/ticket_edit_vendor_modal.php diff --git a/ticket_invoice_add_modal.php b/modals/ticket_invoice_add_modal.php similarity index 100% rename from ticket_invoice_add_modal.php rename to modals/ticket_invoice_add_modal.php diff --git a/ticket_merge_modal.php b/modals/ticket_merge_modal.php similarity index 100% rename from ticket_merge_modal.php rename to modals/ticket_merge_modal.php diff --git a/ticket_reply_edit_modal.php b/modals/ticket_reply_edit_modal.php similarity index 100% rename from ticket_reply_edit_modal.php rename to modals/ticket_reply_edit_modal.php diff --git a/top_nav_tickets_modal.php b/modals/top_nav_tickets_modal.php similarity index 100% rename from top_nav_tickets_modal.php rename to modals/top_nav_tickets_modal.php diff --git a/transfer_add_modal.php b/modals/transfer_add_modal.php similarity index 100% rename from transfer_add_modal.php rename to modals/transfer_add_modal.php diff --git a/transfer_edit_modal.php b/modals/transfer_edit_modal.php similarity index 100% rename from transfer_edit_modal.php rename to modals/transfer_edit_modal.php diff --git a/trip_add_modal.php b/modals/trip_add_modal.php similarity index 98% rename from trip_add_modal.php rename to modals/trip_add_modal.php index f05d3047d..88491f3f2 100644 --- a/trip_add_modal.php +++ b/modals/trip_add_modal.php @@ -44,7 +44,7 @@
    - + @@ -76,7 +76,7 @@
    - +
    diff --git a/trip_copy_modal.php b/modals/trip_copy_modal.php similarity index 97% rename from trip_copy_modal.php rename to modals/trip_copy_modal.php index 624d7cf98..12a46e00e 100644 --- a/trip_copy_modal.php +++ b/modals/trip_copy_modal.php @@ -45,7 +45,7 @@
    - +
    @@ -79,7 +79,7 @@
    - +
    diff --git a/trip_edit_modal.php b/modals/trip_edit_modal.php similarity index 97% rename from trip_edit_modal.php rename to modals/trip_edit_modal.php index a30328a1e..3bd93b588 100644 --- a/trip_edit_modal.php +++ b/modals/trip_edit_modal.php @@ -46,7 +46,7 @@
    - +
    @@ -80,7 +80,7 @@
    - +
    diff --git a/trip_export_modal.php b/modals/trip_export_modal.php similarity index 100% rename from trip_export_modal.php rename to modals/trip_export_modal.php diff --git a/vendor_add_from_template_modal.php b/modals/vendor_add_from_template_modal.php similarity index 100% rename from vendor_add_from_template_modal.php rename to modals/vendor_add_from_template_modal.php diff --git a/vendor_add_modal.php b/modals/vendor_add_modal.php similarity index 90% rename from vendor_add_modal.php rename to modals/vendor_add_modal.php index 806228563..7676c91a2 100644 --- a/vendor_add_modal.php +++ b/modals/vendor_add_modal.php @@ -37,7 +37,7 @@
    - +
    @@ -47,7 +47,7 @@
    - + @@ -57,7 +57,7 @@
    - + @@ -67,7 +67,7 @@
    - + @@ -83,12 +83,12 @@
    - +
    - +
    @@ -98,7 +98,7 @@
    - + @@ -108,7 +108,7 @@
    - + @@ -118,7 +118,7 @@
    - + @@ -128,7 +128,7 @@
    - + @@ -138,7 +138,7 @@
    - + diff --git a/vendor_contact_add_modal.php b/modals/vendor_contact_add_modal.php similarity index 90% rename from vendor_contact_add_modal.php rename to modals/vendor_contact_add_modal.php index ec11e89e6..834a9a29c 100644 --- a/vendor_contact_add_modal.php +++ b/modals/vendor_contact_add_modal.php @@ -17,7 +17,7 @@
    - + @@ -27,7 +27,7 @@
    - + @@ -37,7 +37,7 @@
    - + @@ -49,12 +49,12 @@
    - +
    - +
    @@ -64,7 +64,7 @@
    - + @@ -74,7 +74,7 @@
    - + diff --git a/vendor_contact_edit_modal.php b/modals/vendor_contact_edit_modal.php similarity index 86% rename from vendor_contact_edit_modal.php rename to modals/vendor_contact_edit_modal.php index f1e24cbc6..4ed8b37fe 100644 --- a/vendor_contact_edit_modal.php +++ b/modals/vendor_contact_edit_modal.php @@ -18,7 +18,7 @@
    - + @@ -28,7 +28,7 @@
    - + @@ -38,7 +38,7 @@
    - + @@ -50,12 +50,12 @@
    - +
    - +
    @@ -65,7 +65,7 @@
    - + @@ -75,7 +75,7 @@
    - + diff --git a/vendor_edit_modal.php b/modals/vendor_edit_modal.php similarity index 89% rename from vendor_edit_modal.php rename to modals/vendor_edit_modal.php index 80304f760..d98477b74 100644 --- a/vendor_edit_modal.php +++ b/modals/vendor_edit_modal.php @@ -35,7 +35,7 @@
    - " required> + " required> @@ -45,7 +45,7 @@
    - + @@ -55,7 +55,7 @@
    - + @@ -65,7 +65,7 @@
    - + @@ -102,12 +102,12 @@
    - +
    - +
    @@ -117,7 +117,7 @@
    - + @@ -127,7 +127,7 @@
    - + @@ -137,7 +137,7 @@
    - + @@ -147,7 +147,7 @@
    - + @@ -157,7 +157,7 @@
    - + diff --git a/notifications.php b/notifications.php index ab9806e88..af75852c0 100644 --- a/notifications.php +++ b/notifications.php @@ -1,6 +1,6 @@ - +
    - + - + @@ -183,6 +183,7 @@ Account + @@ -194,6 +195,7 @@ $invoice_number = intval($row['invoice_number']); $invoice_status = nullable_htmlentities($row['invoice_status']); $invoice_date = nullable_htmlentities($row['invoice_date']); + $payment_id = intval($row['payment_id']); $payment_date = nullable_htmlentities($row['payment_date']); $payment_method = nullable_htmlentities($row['payment_method']); $payment_amount = floatval($row['payment_amount']); @@ -225,17 +227,33 @@ + +
    + +
    + + Delete + +
    +
    + - +
    - - diff --git a/dist/css/adminlte.min.css b/plugins/adminlte/css/adminlte.min.css similarity index 100% rename from dist/css/adminlte.min.css rename to plugins/adminlte/css/adminlte.min.css diff --git a/dist/js/.eslintrc.json b/plugins/adminlte/js/.eslintrc.json similarity index 100% rename from dist/js/.eslintrc.json rename to plugins/adminlte/js/.eslintrc.json diff --git a/dist/js/adminlte.min.js b/plugins/adminlte/js/adminlte.min.js similarity index 100% rename from dist/js/adminlte.min.js rename to plugins/adminlte/js/adminlte.min.js diff --git a/post.php b/post.php index f09d2141a..d6aae0ab3 100644 --- a/post.php +++ b/post.php @@ -10,6 +10,9 @@ require_once "check_login.php"; +// Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them) +define('FROM_POST_HANDLER', true); + // Determine which files we should load @@ -28,18 +31,12 @@ // To add a new admin POST request handler, add a file named after the admin page // e.g. changes made on the page http://itflow/admin_ticket_statues.php will load the page post/admin/admin_ticket_statues.php to handle the changes - if ($module !== 'admin_update') { - require_once "post/admin/$module.php"; - } - // IF statement is temporary - - - + include_once "post/admin/$module.php"; } elseif (str_contains($module, 'xcustom')) { // Dynamically load any custom POST logic - require_once "post/xcustom/$module.php"; + include_once "post/xcustom/$module.php"; } else { @@ -58,10 +55,6 @@ // Logout is the same for user and admin require_once "post/logout.php"; -// TODO: Move admin_update into the admin section to be auto-loaded -// We can't do this until everyone has the new database fields added in 1.4.9 on Sept 14th 2024 -require_once "post/admin_update.php"; // Load updater - // TODO: Find a home for these require_once "post/ai.php"; diff --git a/post/admin/admin_api.php b/post/admin/admin_api.php index 8817b62a9..073f2afd6 100644 --- a/post/admin/admin_api.php +++ b/post/admin/admin_api.php @@ -4,6 +4,8 @@ * ITFlow - GET/POST request handler for API settings */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + if (isset($_POST['add_api_key'])) { validateCSRFToken($_POST['csrf_token']); diff --git a/post/admin/admin_backup.php b/post/admin/admin_backup.php index 8649e91d5..dfb0509a1 100644 --- a/post/admin/admin_backup.php +++ b/post/admin/admin_backup.php @@ -4,6 +4,8 @@ * ITFlow - GET/POST request handler for DB / master key backup */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + if (isset($_GET['download_database'])) { validateCSRFToken($_GET['csrf_token']); diff --git a/post/admin/admin_bulk_mail.php b/post/admin/admin_bulk_mail.php index cdbf999f5..841ab0203 100644 --- a/post/admin/admin_bulk_mail.php +++ b/post/admin/admin_bulk_mail.php @@ -4,6 +4,9 @@ * ITFlow - GET/POST request handler for bulk email */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + + if (isset($_POST['send_bulk_mail_now'])) { if (isset($_POST['contact_ids'])) { @@ -37,7 +40,7 @@ 'queued_at' => $queued_at ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Logging logAction("Bulk Mail", "Send", "$session_name sent $count messages via bulk mail"); diff --git a/post/admin/admin_category.php b/post/admin/admin_category.php index c3a97fc2c..b5bd12736 100644 --- a/post/admin/admin_category.php +++ b/post/admin/admin_category.php @@ -4,6 +4,8 @@ * ITFlow - GET/POST request handler for categories ('category') */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + if (isset($_POST['add_category'])) { require_once 'post/admin/admin_category_model.php'; diff --git a/post/admin/admin_category_model.php b/post/admin/admin_category_model.php index 92b0c6baf..81b54a390 100644 --- a/post/admin/admin_category_model.php +++ b/post/admin/admin_category_model.php @@ -1,4 +1,6 @@ $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); if ($mail === true) { $_SESSION['alert_message'] = "Test email queued successfully! Check Admin > Mail queue"; diff --git a/post/admin/admin_settings_module.php b/post/admin/admin_settings_module.php index b8639d293..e98a3ce0a 100644 --- a/post/admin/admin_settings_module.php +++ b/post/admin/admin_settings_module.php @@ -1,5 +1,7 @@ $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); if ($mail !== true) { mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email'"); diff --git a/post/admin/admin_user_model.php b/post/admin/admin_user_model.php index 8b4b9eb2d..4652af8af 100644 --- a/post/admin/admin_user_model.php +++ b/post/admin/admin_user_model.php @@ -1,4 +1,6 @@ 0) { + $sql_link = " + INSERT INTO asset_interface_links SET + interface_a_id = $new_interface_id, + interface_b_id = $connected_to + "; + mysqli_query($mysqli, $sql_link); + } - //Logging - logAction("Asset Interface", "Create", "$session_name created interface $name for asset $asset_name", $client_id, $asset_id); + // 6) Logging + logAction( + "Asset Interface", + "Create", + "$session_name created interface $name for asset $asset_name", + $client_id, + $asset_id + ); + // 7) Alert message + redirect $_SESSION['alert_message'] = "Interface $name created"; - header("Location: " . $_SERVER["HTTP_REFERER"]); - + exit; } if (isset($_POST['edit_asset_interface'])) { enforceUserPermission('module_support', 2); - validateCSRFToken($_POST['csrf_token']); // Interface info $interface_id = intval($_POST['interface_id']); - require_once 'asset_interface_model.php'; - - // Get Asset Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id, asset_id FROM asset_interfaces LEFT JOIN assets ON asset_id = interface_asset_id WHERE interface_id = $interface_id"); - $row = mysqli_fetch_array($sql); - $asset_id = intval($row['asset_id']); - $asset_name = sanitizeInput($row['asset_name']); + require_once 'asset_interface_model.php'; + // sets: $name, $mac, $ip, $ipv6, $port, $notes, $network, $connected_to, etc. + + // 1) Get Asset Name and Client ID for logging and alert message + $sql = mysqli_query($mysqli, " + SELECT asset_name, asset_client_id, asset_id + FROM asset_interfaces + LEFT JOIN assets ON asset_id = interface_asset_id + WHERE interface_id = $interface_id + "); + $row = mysqli_fetch_array($sql); + $asset_id = intval($row['asset_id']); + $asset_name= sanitizeInput($row['asset_name']); $client_id = intval($row['asset_client_id']); - mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_name = '$name', interface_mac = '$mac', interface_ip = '$ip', interface_ipv6 = '$ipv6', interface_port = '$port', interface_notes = '$notes', interface_network_id = $network WHERE interface_id = $interface_id"); + // 2) Update the interface details in asset_interfaces + $sql_update = " + UPDATE asset_interfaces SET + interface_name = '$name', + interface_mac = '$mac', + interface_ip = '$ip', + interface_ipv6 = '$ipv6', + interface_port = '$port', + interface_notes = '$notes', + interface_network_id = $network + WHERE interface_id = $interface_id + "; + mysqli_query($mysqli, $sql_update); + + // 3) Remove any existing link for this interface (one-to-one) + $sql_delete_link = " + DELETE FROM asset_interface_links + WHERE interface_a_id = $interface_id + OR interface_b_id = $interface_id + "; + mysqli_query($mysqli, $sql_delete_link); + + // 4) If user selected a connected interface, create a new link + if (!empty($connected_to) && intval($connected_to) > 0) { + $sql_link = " + INSERT INTO asset_interface_links SET + interface_a_id = $interface_id, + interface_b_id = $connected_to + "; + mysqli_query($mysqli, $sql_link); + } - //Logging - logAction("Asset Interface", "Edit", "$session_name edited interface $name for asset $asset_name", $client_id, $asset_id); + // 5) Logging + logAction( + "Asset Interface", + "Edit", + "$session_name edited interface $name for asset $asset_name", + $client_id, + $asset_id + ); + // 6) Alert and redirect $_SESSION['alert_message'] = "Interface $name edited"; - header("Location: " . $_SERVER["HTTP_REFERER"]); - + exit; } if (isset($_GET['delete_asset_interface'])) { enforceUserPermission('module_support', 2); - validateCSRFToken($_GET['csrf_token']); $interface_id = intval($_GET['delete_asset_interface']); - $sql = mysqli_query($mysqli,"SELECT asset_name, interface_name, asset_client_id, asset_id FROM asset_interfaces LEFT JOIN assets ON asset_id = interface_asset_id WHERE interface_id = $interface_id"); + // 1) Fetch details for logging / alerts + $sql = mysqli_query($mysqli, " + SELECT asset_name, interface_name, asset_client_id, asset_id + FROM asset_interfaces + LEFT JOIN assets ON asset_id = interface_asset_id + WHERE interface_id = $interface_id + "); $row = mysqli_fetch_array($sql); - $asset_id = intval($row['asset_id']); + $asset_id = intval($row['asset_id']); $interface_name = sanitizeInput($row['interface_name']); - $asset_name = sanitizeInput($row['asset_name']); - $client_id = intval($row['asset_client_id']); + $asset_name = sanitizeInput($row['asset_name']); + $client_id = intval($row['asset_client_id']); - mysqli_query($mysqli,"DELETE FROM asset_interfaces WHERE interface_id = $interface_id"); + // 2) Delete the interface this cascadingly delete asset_interface_links + mysqli_query($mysqli, " + DELETE FROM asset_interfaces + WHERE interface_id = $interface_id + "); - //Logging - logAction("Asset Interface", "Delete", "$session_name deleted interface $interface_name from asset $asset_name", $client_id, $asset_id); + // 3) Logging + logAction( + "Asset Interface", + "Delete", + "$session_name deleted interface $interface_name from asset $asset_name", + $client_id, + $asset_id + ); + // 4) Alert and redirect $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Interface $interface_name deleted"; - header("Location: " . $_SERVER["HTTP_REFERER"]); - + header("Location: " . $_SERVER['HTTP_REFERER']); + exit; } diff --git a/post/user/asset_interface_model.php b/post/user/asset_interface_model.php index 5c3656854..140b6dc1a 100644 --- a/post/user/asset_interface_model.php +++ b/post/user/asset_interface_model.php @@ -1,4 +1,6 @@
    $company_name has created a support portal account for you.

    Username: $email
    Password: $password_info

    Login URL: https://$config_base_url/portal/

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "Hello $name,

    $company_name has created a support portal account for you.

    Username: $email
    Password: $password_info

    Login URL: https://$config_base_url/client/

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Queue Mail $data = [ @@ -199,7 +201,7 @@ 'body' => $body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); diff --git a/post/user/contact_model.php b/post/user/contact_model.php index 6e0b2eae2..cfc98732b 100644 --- a/post/user/contact_model.php +++ b/post/user/contact_model.php @@ -1,4 +1,5 @@ (new DateTime())) { $expire = "'" . $expire . "'"; - } - else { + + } else { $expire = getDomainExpirationDate($name); if (strtotime($expire)) { $expire = "'" . $expire . "'"; @@ -95,8 +91,53 @@ $txt = sanitizeInput($records['txt']); $whois = sanitizeInput($records['whois']); + // Current domain info + $original_domain_info = mysqli_fetch_assoc(mysqli_query($mysqli," + SELECT + domains.*, + registrar.vendor_name AS registrar_name, + dnshost.vendor_name AS dnshost_name, + mailhost.vendor_name AS mailhost_name, + webhost.vendor_name AS webhost_name + FROM domains + LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id + LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id + LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id + LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id + WHERE domain_id = $domain_id + ")); + + // Update domain mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_dnshost = $dnshost, domain_mailhost = $mailhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes' WHERE domain_id = $domain_id"); + // Fetch updated info + $new_domain_info = mysqli_fetch_assoc(mysqli_query($mysqli," + SELECT + domains.*, + registrar.vendor_name AS registrar_name, + dnshost.vendor_name AS dnshost_name, + mailhost.vendor_name AS mailhost_name, + webhost.vendor_name AS webhost_name + FROM domains + LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id + LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id + LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id + LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id + WHERE domain_id = $domain_id + ")); + + // Compare/log changes + $ignored_columns = ["domain_updated_at", "domain_accessed_at", "domain_registrar", "domain_webhost", "domain_dnshost", "domain_mailhost"]; + foreach ($original_domain_info as $column => $old_value) { + $new_value = $new_domain_info[$column]; + if ($old_value != $new_value && !in_array($column, $ignored_columns)) { + $column = sanitizeInput($column); + $old_value = sanitizeInput($old_value); + $new_value = sanitizeInput($new_value); + mysqli_query($mysqli,"INSERT INTO domain_history SET domain_history_column = '$column', domain_history_old_value = '$old_value', domain_history_new_value = '$new_value', domain_history_domain_id = $domain_id"); + } + } + // Logging logAction("Domain", "Edit", "$session_name edited domain $name", $client_id, $domain_id); @@ -165,6 +206,8 @@ mysqli_query($mysqli,"DELETE FROM domains WHERE domain_id = $domain_id"); + mysqli_query($mysqli, "DELETE FROM domain_history WHERE domain_history_domain_id = $domain_id");# + // Logging logAction("Domain", "Delete", "$session_name deleted domain $domain_name", $client_id); diff --git a/post/user/domain_model.php b/post/user/domain_model.php index 2048e51e6..13a79c578 100644 --- a/post/user/domain_model.php +++ b/post/user/domain_model.php @@ -1,4 +1,6 @@ $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Logging for email (success/fail) if ($mail === true) { @@ -161,7 +163,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Logging for email (success/fail) if ($mail === true) { logAction("Calendar Event", "Email", "$session_name Emailed modified event $title to $contact_name email $contact_email", $client, $event_id); diff --git a/post/user/event_model.php b/post/user/event_model.php index d3f39b6d6..a27199530 100644 --- a/post/user/event_model.php +++ b/post/user/event_model.php @@ -1,4 +1,6 @@
    We have received your payment in full for the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    We have received your payment in full for the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; // Queue Mail $email = [ @@ -813,14 +815,17 @@ $email_data[] = $email; + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); // Email Logging - - $_SESSION['alert_message'] = "Email queued successfully! Check Admin > Mail queue"; - - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Email Receipt Queued', history_invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); } @@ -831,7 +836,7 @@ if ($email_receipt == 1) { $subject = "Partial Payment Received - Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    We have received partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference
    Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    We have received partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference
    Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; // Queue Mail $email = [ @@ -845,26 +850,22 @@ $email_data[] = $email; + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); // Email Logging - - $_SESSION['alert_message'] = "Test email queued successfully! Check Admin > Mail queue"; - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); - logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); } } - // Add emails to queue - if (!empty($email)) { - addToMailQueue($mysqli, $email_data); - } - //Update Invoice Status mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); @@ -882,6 +883,193 @@ } } +if (isset($_GET['add_payment_stripe'])) { + + enforceUserPermission('module_sales', 2); + validateCSRFToken($_GET['csrf_token']); + + $invoice_id = intval($_GET['invoice_id']); + + // Get invoice details + $sql = mysqli_query($mysqli,"SELECT * FROM invoices + LEFT JOIN clients ON invoice_client_id = client_id + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE invoice_id = $invoice_id" + ); + $row = mysqli_fetch_array($sql); + $invoice_number = intval($row['invoice_number']); + $invoice_status = sanitizeInput($row['invoice_status']); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_url_key = sanitizeInput($row['invoice_url_key']); + $invoice_currency_code = sanitizeInput($row['invoice_currency_code']); + $client_id = intval($row['client_id']); + $client_name = sanitizeInput($row['client_name']); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'])); + $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']); + $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'])); + + // Get ITFlow company details + $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + $company_name = sanitizeInput($row['company_name']); + $company_country = sanitizeInput($row['company_country']); + $company_address = sanitizeInput($row['company_address']); + $company_city = sanitizeInput($row['company_city']); + $company_state = sanitizeInput($row['company_state']); + $company_zip = sanitizeInput($row['company_zip']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + $company_email = sanitizeInput($row['company_email']); + $company_website = sanitizeInput($row['company_website']); + + // Sanitize Config vars from get_settings.php + $config_invoice_from_name = sanitizeInput($config_invoice_from_name); + $config_invoice_from_email = sanitizeInput($config_invoice_from_email); + + // Get Client Stripe details + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); + $stripe_id = sanitizeInput($stripe_client_details['stripe_id']); + $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); + + // Sanity checks + if (!$config_stripe_enable || !$stripe_id || !$stripe_pm) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Stripe not enabled or no client card saved"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } elseif ($invoice_status !== 'Sent' && $invoice_status !== 'Viewed') { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Invalid invoice state (draft/partial/paid/not billable)"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } elseif ($invoice_amount == 0) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Invalid invoice amount"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + + // Initialize Stripe + require_once __DIR__ . '/../../vendor/stripe-php-10.5.0/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + $balance_to_pay = round($invoice_amount, 2); + $pi_description = "ITFlow: $client_name payment of $invoice_currency_code $balance_to_pay for $invoice_prefix$invoice_number"; + + // Create a payment intent + try { + $payment_intent = $stripe->paymentIntents->create([ + 'amount' => intval($balance_to_pay * 100), // Times by 100 as Stripe expects values in cents + 'currency' => $invoice_currency_code, + 'customer' => $stripe_id, + 'payment_method' => $stripe_pm, + 'off_session' => true, + 'confirm' => true, + 'description' => $pi_description, + 'metadata' => [ + 'itflow_client_id' => $client_id, + 'itflow_client_name' => $client_name, + 'itflow_invoice_number' => $invoice_prefix . $invoice_number, + 'itflow_invoice_id' => $invoice_id, + ] + ]); + + // Get details from PI + $pi_id = sanitizeInput($payment_intent->id); + $pi_date = date('Y-m-d', $payment_intent->created); + $pi_amount_paid = floatval(($payment_intent->amount_received / 100)); + $pi_currency = strtoupper(sanitizeInput($payment_intent->currency)); + $pi_livemode = $payment_intent->livemode; + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception during payment intent for invoice ID $invoice_id / $invoice_prefix$invoice_number: $error"); + logApp("Stripe", "error", "Exception during PI for invoice ID $invoice_id: $error"); + } + + if ($payment_intent->status == "succeeded" && intval($balance_to_pay) == intval($pi_amount_paid)) { + + // Update Invoice Status + mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); + + // Add Payment to History + mysqli_query($mysqli, "INSERT INTO payments SET payment_date = '$pi_date', payment_amount = $pi_amount_paid, payment_currency_code = '$pi_currency', payment_account_id = $config_stripe_account, payment_method = 'Stripe', payment_reference = 'Stripe - $pi_id', payment_invoice_id = $invoice_id"); + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Online Payment added (agent)', history_invoice_id = $invoice_id"); + + // Email receipt + if (!empty($config_smtp_host)) { + $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

    We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + // Queue Mail + $data = [ + [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body, + ] + ]; + + // Email the internal notification address too + if (!empty($config_invoice_paid_notification_email)) { + $subject = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; + $body = "Hello,

    This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    Hello $contact_name,

    We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + $data[] = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $config_invoice_paid_notification_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body, + ]; + } + + $mail = addToMailQueue($data); + + // Email Logging + $email_id = mysqli_insert_id($mysqli); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + } + + // Log info + $extended_log_desc = ''; + if (!$pi_livemode) { + $extended_log_desc = '(DEV MODE)'; + } + + // Create Stripe payment gateway fee as an expense (if configured) + if ($config_stripe_expense_vendor > 0 && $config_stripe_expense_category > 0) { + $gateway_fee = round($invoice_amount * $config_stripe_percentage_fee + $config_stripe_flat_fee, 2); + mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$invoice_currency_code', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id $extended_log_desc'"); + } + + // Notify/log + appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id); + logAction("Invoice", "Payment", "$session_name initiated Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id); + customAction('invoice_pay', $invoice_id); + + $_SESSION['alert_message'] .= "Payment amount " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + + } else { + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe pay failed due to payment error', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Failed online payment amount of invoice $invoice_prefix$invoice_number due to Stripe payment error", $client_id, $invoice_id); + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Payment failed"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + +} + if (isset($_POST['add_bulk_payment'])) { $client_id = intval($_POST['client_id']); @@ -958,7 +1146,7 @@ mysqli_query($mysqli, $add_history_query); // Add to Email Body Invoice Portion - $email_body_invoices .= "
    Invoice $invoice_prefix$invoice_number - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code); + $email_body_invoices .= "
    Invoice $invoice_prefix$invoice_number - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code); customAction('invoice_pay', $invoice_id); @@ -1120,10 +1308,10 @@ if ($invoice_status == 'Paid') { $subject = "Invoice $invoice_prefix$invoice_number Receipt"; - $body = "Hello $contact_name,

    Please click on the link below to see your invoice regarding \"$invoice_scope\" marked paid.

    Invoice Link


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    Please click on the link below to see your invoice regarding \"$invoice_scope\" marked paid.

    Invoice Link


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; } else { $subject = "Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    Please view the details of your invoice regarding \"$invoice_scope\" below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
    Balance Due: " . numfmt_format_currency($currency_format, $balance, $invoice_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    Please view the details of your invoice regarding \"$invoice_scope\" below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "
    Balance Due: " . numfmt_format_currency($currency_format, $balance, $invoice_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; } // Queue Mail @@ -1138,7 +1326,7 @@ ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); @@ -1186,7 +1374,7 @@ } - addToMailQueue($mysqli, $data); + addToMailQueue($data); header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -1362,7 +1550,7 @@ // Email to client $subject = "Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: $$invoice_amount
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $company_phone"; + $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: $$invoice_amount
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $company_phone"; $data = [ @@ -1375,7 +1563,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); if ($mail === true) { // Add send history diff --git a/post/user/invoice_model.php b/post/user/invoice_model.php index 716c4894d..81a9c4a11 100644 --- a/post/user/invoice_model.php +++ b/post/user/invoice_model.php @@ -1,4 +1,5 @@ $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } // Photo @@ -136,7 +138,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } $new_password = password_hash($new_password, PASSWORD_DEFAULT); @@ -265,7 +267,7 @@ 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } // Logging diff --git a/post/user/project.php b/post/user/project.php index 96521dc5b..875781b7f 100644 --- a/post/user/project.php +++ b/post/user/project.php @@ -4,6 +4,8 @@ * ITFlow - GET/POST request handler for tasks */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + if (isset($_POST['add_project'])) { enforceUserPermission('module_support', 2); diff --git a/post/user/quote.php b/post/user/quote.php index d6b44c46d..44cda583f 100644 --- a/post/user/quote.php +++ b/post/user/quote.php @@ -4,6 +4,8 @@ * ITFlow - GET/POST request handler for quotes */ +defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); + if (isset($_POST['add_quote'])) { enforceUserPermission('module_sales', 2); @@ -487,7 +489,7 @@ $config_base_url = sanitizeInput($config_base_url); $subject = "Quote [$quote_scope]"; - $body = "Hello $contact_name,

    Thank you for your inquiry, we are pleased to provide you with the following estimate.


    $quote_scope
    Total Cost: " . numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code) . "


    View and accept your estimate online here


    --
    $company_name - Sales
    $config_quote_from_email
    $company_phone"; + $body = "Hello $contact_name,

    Thank you for your inquiry, we are pleased to provide you with the following estimate.


    $quote_scope
    Total Cost: " . numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code) . "


    View and accept your estimate online here


    --
    $company_name - Sales
    $config_quote_from_email
    $company_phone"; // Queue Mail $data = [ @@ -500,7 +502,7 @@ 'body' => $body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Update History mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Quote', history_quote_id = $quote_id"); diff --git a/post/user/quote_model.php b/post/user/quote_model.php index 1243a1557..8d2708097 100644 --- a/post/user/quote_model.php +++ b/post/user/quote_model.php @@ -1,4 +1,6 @@ ##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Verify contact email is valid if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -149,7 +151,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); // END EMAILING @@ -219,7 +221,7 @@ $data = []; // Queue array $subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Only add contact to email queue if email is valid @@ -234,7 +236,7 @@ ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Custom action/notif handler @@ -341,7 +343,7 @@ $data = []; // Queue array $subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; $data[] = [ 'from' => $config_ticket_from_email, @@ -352,7 +354,7 @@ 'body' => $body ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Custom action/notif handler @@ -415,7 +417,7 @@ $data = []; // Queue array $subject = "Ticket Notification - [$ticket_prefix$ticket_number] - $ticket_subject"; - $body = "##- Please type your reply above this line -##

    Hello,

    You have been added as a collaborator on this ticket regarding \"$ticket_subject\".

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Guest link: https://$config_base_url/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello,

    You have been added as a collaborator on this ticket regarding \"$ticket_subject\".

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Guest link: https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Only add watcher to email queue if email is valid if (filter_var($watcher_email, FILTER_VALIDATE_EMAIL)) { @@ -429,7 +431,7 @@ ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Logging @@ -627,7 +629,7 @@ 'body' => $body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } } @@ -770,7 +772,7 @@ 'body' => $body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } } } @@ -959,7 +961,7 @@ // EMAIL $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.

    $details

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$base_url/portal/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.

    $details

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$base_url/client/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Check email valid if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -997,7 +999,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // End Mail IF } // End Loop } // End Array Empty Check @@ -1099,7 +1101,7 @@ if ($private_note == 0 && !empty($config_smtp_host)) { $subject = "Ticket update - [$ticket_prefix$ticket_number] - $ticket_subject"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been updated.

    --------------------------------
    $ticket_reply
    --------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been updated.

    --------------------------------
    $ticket_reply
    --------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $from_email
    $company_phone"; if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -1134,7 +1136,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } //End Mail IF // Notification for assigned ticket user @@ -1411,11 +1413,11 @@ if ($ticket_status == 4) { // Resolved $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

    --------------------------------
    $ticket_reply
    --------------------------------

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

    --------------------------------
    $ticket_reply
    --------------------------------

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; } else { // Anything else $subject = "Ticket update - [$ticket_prefix$ticket_number] - $ticket_subject"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been updated.

    --------------------------------
    $ticket_reply
    --------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been updated.

    --------------------------------
    $ticket_reply
    --------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status_name
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; } if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -1450,7 +1452,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } //End Mail IF @@ -1662,7 +1664,7 @@ // EMAIL $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; - $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Check email valid if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -1698,7 +1700,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } //End Mail IF @@ -1756,7 +1758,7 @@ // EMAIL $subject = "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)"; //$body = "Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been closed.

    We hope the request/issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; - $body = "Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been closed.

    We hope the request/issue was resolved to your satisfaction, please provide your feedback here.
    If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been closed.

    We hope the request/issue was resolved to your satisfaction, please provide your feedback here.
    If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$config_base_url/client/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Check email valid if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { @@ -1792,7 +1794,7 @@ 'body' => $body ]; } - addToMailQueue($mysqli, $data); + addToMailQueue($data); } //End Mail IF @@ -1978,14 +1980,6 @@ $start_date = sanitizeInput($_POST['start_date']); - // If no contact is selected automatically choose the primary contact for the client - if ($client_id > 0 && $contact_id == 0) { - $sql = mysqli_query($mysqli, "SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1"); - $row = mysqli_fetch_array($sql); - $contact_id = intval($row['contact_id']); - } - - // Add recurring (scheduled) ticket mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); $scheduled_ticket_id = mysqli_insert_id($mysqli); @@ -2007,14 +2001,6 @@ $scheduled_ticket_id = intval($_POST['scheduled_ticket_id']); $next_run_date = sanitizeInput($_POST['next_date']); - // If no contact is selected automatically choose the primary contact for the client - if ($client_id > 0 && $contact_id == 0) { - $sql = mysqli_query($mysqli, "SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1"); - $row = mysqli_fetch_array($sql); - $contact_id = intval($row['contact_id']); - } - - // Edit scheduled ticket mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); // Logging @@ -2101,7 +2087,7 @@ if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)"; - $email_body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been automatically created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: https://$config_base_url/portal/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $email_body = "##- Please type your reply above this line -##

    Hello $contact_name,

    A ticket regarding \"$ticket_subject\" has been automatically created for you.

    --------------------------------
    $ticket_details--------------------------------

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: Open
    Portal: https://$config_base_url/client/ticket.php?id=$id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; $email = [ 'from' => $config_ticket_from_email, @@ -2117,7 +2103,7 @@ } // Add to the mail queue - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule) $dt_old_next_scheduled_date = new DateTime($old_next_scheduled_date); @@ -2244,7 +2230,7 @@ $onsite = intval($_POST['onsite']); $schedule = sanitizeInput($_POST['scheduled_date_time']); $ticket_link = "ticket.php?ticket_id=$ticket_id"; - $full_ticket_url = "https://$config_base_url/portal/ticket.php?ticket_id=$ticket_id"; + $full_ticket_url = "https://$config_base_url/client/ticket.php?ticket_id=$ticket_id"; $ticket_link_html = "$ticket_link"; mysqli_query($mysqli,"UPDATE tickets @@ -2323,7 +2309,7 @@ Your ticket regarding $ticket_subject has been scheduled for $email_datetime.

    - Access your ticket here + Access your ticket here

    Please do not reply to this email.

    @@ -2358,13 +2344,13 @@ The ticket regarding $ticket_subject has been scheduled for $email_datetime.

    - $ticket_link + $ticket_link

    Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    - Portal: Access the ticket here + Portal: Access the ticket here

    ~
    @@ -2381,7 +2367,7 @@ } // Send - $response = addToMailQueue($mysqli, $data); + $response = addToMailQueue($data); // Update ticket reply $ticket_reply_note = "Ticket scheduled for $email_datetime " . (boolval($onsite) ? '(onsite).' : '(remote).'); @@ -2476,7 +2462,7 @@
    Scheduled work for your ticket regarding $ticket_subject has been cancelled.

    - Access your ticket here + Access your ticket here

    Please do not reply to this email.

    @@ -2510,13 +2496,13 @@ Scheduled work for the ticket regarding $ticket_subject has been cancelled.

    - $ticket_link + $ticket_link

    Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    - Portal: Access the ticket here + Portal: Access the ticket here

    ~
    @@ -2533,7 +2519,7 @@ } // Send email(s) - addToMailQueue($mysqli, $data); + addToMailQueue($data); // Update ticket reply $ticket_reply_note = "Ticket schedule cancelled."; diff --git a/post/user/ticket_recurring_model.php b/post/user/ticket_recurring_model.php index 26f8fe0f0..038c7fc3b 100644 --- a/post/user/ticket_recurring_model.php +++ b/post/user/ticket_recurring_model.php @@ -1,4 +1,5 @@
    - + - + @@ -123,7 +123,7 @@
    -
    - - - - User avatar" class="img-size-64"> - -

    -
    - -
    - -
    - -
    -
    - +
    +
    + + "> + Remove Avatar +
    + +
    + +
    -
    -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    Avatar is set, click to clear - - - -
    +
    + +
    +
    + +
    + +
    +
    - +
    + +
    +
    + +
    + +
    +
    + + +
    +
    @@ -62,4 +68,4 @@
    -
    +

    Preferences

    @@ -40,7 +40,7 @@ - + @@ -48,4 +48,4 @@
    -
    -

    Your Password

    +
    +

    Your Password

    @@ -28,25 +28,25 @@
    - +
    -
    -

    Mult-Factor Authentication

    +
    +

    Mult-Factor Authentication

    - +

    You have set up 2FA. Your QR code is below.

    - +
    @@ -121,4 +121,4 @@
    -