diff --git a/portal/document.php b/portal/document.php index 5c031538..d007e9de 100644 --- a/portal/document.php +++ b/portal/document.php @@ -8,7 +8,6 @@ header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.g require_once "inc_portal.php"; - if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { header("Location: portal_post.php?logout"); exit(); @@ -21,7 +20,6 @@ $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); - // Check for a document ID if (!isset($_GET['id']) && !intval($_GET['id'])) { header("Location: documents.php"); @@ -39,27 +37,6 @@ $document_content = $purifier->purify($row['document_content']); ?> -
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - -
- -
-

Welcome, !

-
-
- -
- -
-

@@ -72,4 +49,3 @@ $document_content = $purifier->purify($row['document_content']); -
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - -
+
-
-

Welcome, !

-
-
+
-
+ + + + + + + + -
+ + ?> -
- -
NameCreated
- - - + + - - + - - - - - - - - - -
NameCreated + + +
- - -
- -
+ +
+
- -
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - - - -
- -
-

Welcome, !

-
-
-
- -
- New ticket -
- +
+ New ticket
- + diff --git a/portal/invoices.php b/portal/invoices.php index ae319c95..028611d5 100644 --- a/portal/invoices.php +++ b/portal/invoices.php @@ -17,106 +17,85 @@ if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_client_id = $session_client_id AND invoice_status != 'Draft' ORDER BY invoice_date DESC"); ?> -
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - -
+
-
-

Welcome, !

-
-
+
-
+ + + + + + + + + + + + -
+ + if (empty($invoice_scope)) { + $invoice_scope_display = "-"; + } else { + $invoice_scope_display = $invoice_scope; + } -
+ $now = time(); + if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) { + $overdue_color = "text-danger font-weight-bold"; + } else { + $overdue_color = ""; + } + + if ($invoice_status == "Sent") { + $invoice_badge_color = "warning text-white"; + } elseif ($invoice_status == "Viewed") { + $invoice_badge_color = "info"; + } elseif ($invoice_status == "Partial") { + $invoice_badge_color = "primary"; + } elseif ($invoice_status == "Paid") { + $invoice_badge_color = "success"; + } elseif ($invoice_status == "Cancelled") { + $invoice_badge_color = "danger"; + } else{ + $invoice_badge_color = "secondary"; + } + ?> -
#ScopeAmountDateDueStatus
- - - - - - - + + + + + + + - - + - - - - - - - - - - - - - - -
#ScopeAmountDateDueStatus"> + + + +
"> - - - -
- -
+ +
+
+
- @@ -64,12 +64,12 @@ header("X-Frame-Options: DENY"); // Legacy @@ -81,3 +81,23 @@ header("X-Frame-Options: DENY"); // Legacy
+ +
+
+ + " alt="..." height="50" width="50" class="img-circle img-responsive"> + + + + + + + + +
+ +
+

Welcome, !

+
+
+
diff --git a/portal/portal_post.php b/portal/portal_post.php index e7169ed9..67e26e4d 100644 --- a/portal/portal_post.php +++ b/portal/portal_post.php @@ -9,23 +9,18 @@ require_once "inc_portal.php"; if (isset($_POST['add_ticket'])) { - // Get ticket prefix/number - $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_settings); - $config_ticket_prefix = sanitizeInput($row['config_ticket_prefix']); - $config_ticket_next_number = intval($row['config_ticket_next_number']); - - // Get email settings - $config_ticket_from_name = $row['config_ticket_from_name']; - $config_ticket_from_email = $row['config_ticket_from_email']; - $config_ticket_new_ticket_notification_email = filter_var($row['config_ticket_new_ticket_notification_email'], FILTER_VALIDATE_EMAIL); - - $client_id = intval($session_client_id); $contact = intval($session_contact_id); $subject = sanitizeInput($_POST['subject']); $details = mysqli_real_escape_string($mysqli,($_POST['details'])); + // Get settings from get_settings.php + $config_ticket_prefix = sanitizeInput($config_ticket_prefix); + $config_ticket_from_name = sanitizeInput($config_ticket_from_name); + $config_ticket_from_email = sanitizeInput($config_ticket_from_email); + $config_base_url = sanitizeInput($config_base_url); + $config_ticket_new_ticket_notification_email = filter_var($row['config_ticket_new_ticket_notification_email'], FILTER_VALIDATE_EMAIL); + // Ensure priority is low/med/high (as can be user defined) if ($_POST['priority'] !== "Low" && $_POST['priority'] !== "Medium" && $_POST['priority'] !== "High") { $priority = "Low"; diff --git a/portal/profile.php b/portal/profile.php index c3493d1c..e77afeaa 100644 --- a/portal/profile.php +++ b/portal/profile.php @@ -12,7 +12,7 @@ require_once 'inc_portal.php';

Profile

-

Name:

+

Name:

Email:

PIN:

Client:

diff --git a/portal/quotes.php b/portal/quotes.php index 948214df..dfb3ce52 100644 --- a/portal/quotes.php +++ b/portal/quotes.php @@ -8,7 +8,6 @@ header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.g require_once "inc_portal.php"; - if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { header("Location: portal_post.php?logout"); exit(); @@ -17,98 +16,75 @@ if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { $quotes_sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_client_id = $session_client_id AND quote_status != 'Draft' ORDER BY quote_date DESC"); ?> -
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - -
+
-
-

Welcome, !

-
-
+
-
+ + + + + + + + + + + -
+ + if (empty($quote_scope)) { + $quote_scope_display = "-"; + } else { + $quote_scope_display = $quote_scope; + } -
+ if ($quote_status == "Sent") { + $quote_badge_color = "warning text-white"; + } elseif ($quote_status == "Viewed") { + $quote_badge_color = "primary"; + } elseif ($quote_status == "Accepted") { + $quote_badge_color = "success"; + } elseif ($quote_status == "Declined") { + $quote_badge_color = "danger"; + } elseif ($quote_status == "Invoiced") { + $quote_badge_color = "info"; + } else { + $quote_badge_color = "secondary"; + } + + ?> -
#ScopeAmountDateStatus
- - - - - - + + + + + + - - + - - - - - - - - - - - - - -
#ScopeAmountDateStatus"> + + + +
"> - - - -
- -
+ +
+
-
-
- - " alt="..." height="50" width="50" class="img-circle img-responsive"> - - - - - - - - -
- -
-

Welcome, !

-
-
- -
- -
-