From f3c1df3e17f7b244cce9c98a8ec843e5aa2226fc Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Mon, 30 Sep 2019 09:48:35 -0400 Subject: [PATCH] Added Created By toticket details --- README.md | 22 ++++++++++------- report_income_summary.php | 10 ++++---- report_profit_loss.php | 50 +++++++++++++++++++-------------------- ticket.php | 5 ++-- 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index c539e8ab..c9189390 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,16 @@ * Locations * Vendors * Assets - * Licenses - * Logins + * Application Licenses + * Logins Password Manager * Domains * Apps * Networks * Files * Documentation * Invoicing - * Email Past Due Reminders - * Auto Email Receipts upon payments + * Automatically Emails Past Due Invoices to clients + * Auto Email Receipts upon receiving payments * Recurring Invoices * Quotes / Estimates * Automated customer approval @@ -38,15 +38,21 @@ * Schedule Jobs * Overview of Invoices Domains * Schedule Events + * Automatic Email Reminders of upcomming calendar events to customers * Dashboard - * Gives a clear overview of your business + * Gives a clear overview of your business financials using graphs and such * API * XML Phonebook download for VOIP Phones - * FreePBX Integrated called ID (When call comes in it queries the Database and displays the company name on your caller ID) + * FreePBX Integrated called ID (When call comes in it queries the Database and displays the company name on your caller ID as well as alerts you in the CRM) * Pull Email Lists * Check account Balances using FreePBX IVR +* Multi-Tenant - One Instance Multiple Companies and Users +* Audit Logging - Logs actions of users on the system + + + ### Installation Instructions * Clone this repo @@ -82,10 +88,10 @@ * XML Phonebook Download - /api.php?api_key=[API_KEY]&phonebook * Client Email (Returns Client Name - Email Address) - /api.php?api_key=[API_KEY]&client_emails * Account Balance for Client (Returns Account Balance) - /api.php?api_key=[API_KEY]&client_id=[CLIENT_ID] -NOTE: [API_KEY] - is auto generated when a company is created and shows up in General Settings. +NOTE: [API_KEY] - is auto generated when a company is created and shows up in General Settings, this can also be changed manually. ### Future Todo -* MeshCentral Integation to assign devices and easily access remote desktop within the app +* MeshCentral Integation to assign devices to assets and easily access remote desktop within the app, as well as pull vital information such as Operating System, * HestiaCP Integration for intergrating domains and webclients * CalDAV to integrate with 3rd party calendars * CardDAV to integrate with 3rd party Address books diff --git a/report_income_summary.php b/report_income_summary.php index d3b700ba..ef2bc475 100644 --- a/report_income_summary.php +++ b/report_income_summary.php @@ -35,7 +35,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
- +
@@ -83,7 +83,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_ ?> - + - + - + - +
Category$$ $$
$$ $$
diff --git a/report_profit_loss.php b/report_profit_loss.php index 51661ee8..056f1f67 100644 --- a/report_profit_loss.php +++ b/report_profit_loss.php @@ -83,7 +83,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c ?> - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ @@ -270,7 +270,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c ?> - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ - $ + $ Net Profit - $ - $ - $ - $ - $ + $ + $ + $ + $ + $ diff --git a/ticket.php b/ticket.php index 1d70bfbe..c31ee036 100644 --- a/ticket.php +++ b/ticket.php @@ -6,7 +6,7 @@ if(isset($_GET['ticket_id'])){ $ticket_id = intval($_GET['ticket_id']); - $sql = mysqli_query($mysqli,"SELECT * FROM tickets, clients WHERE tickets.client_id = clients.client_id AND ticket_id = $ticket_id AND tickets.company_id = $session_company_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM tickets, clients, users WHERE tickets.client_id = clients.client_id AND tickets.ticket_created_by = users.user_id AND ticket_id = $ticket_id AND tickets.company_id = $session_company_id"); if(mysqli_num_rows($sql) == 0){ echo "

Nothing to see here

Go Back
"; @@ -42,6 +42,7 @@ if(isset($_GET['ticket_id'])){ $ticket_updated_at = $row['ticket_updated_at']; $ticket_closed_at = $row['ticket_closed_at']; $ticket_created_by = $row['ticket_created_by']; + $name = $row['name']; if($ticket_status == "Open"){ $ticket_badge_color = "primary"; @@ -102,7 +103,7 @@ if(isset($_GET['ticket_id'])){

Details

-
+