From 8e17dbf5bae20a6d4ff57c2dc5e7fefbfdc5e512 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 13 Dec 2023 16:09:42 +0000 Subject: [PATCH 01/11] Add side nav button for statements --- client_side_nav.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client_side_nav.php b/client_side_nav.php index 0adf20ba..c548a969 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -288,6 +288,15 @@ +
  • + "> + +

    + Statement +

    +     +
    • +
  • "> From 5be0f9f934dc0515067ed13bcf35ddaa585d5a23 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 13 Dec 2023 16:10:08 +0000 Subject: [PATCH 02/11] add calculate invoice balance function --- client_statement.php | 189 +++++++++++++++++++++++++++++++++++++++++++ debug.php | 5 ++ functions.php | 19 +++++ 3 files changed, 213 insertions(+) create mode 100644 client_statement.php create mode 100644 debug.php diff --git a/client_statement.php b/client_statement.php new file mode 100644 index 00000000..1c2de0cc --- /dev/null +++ b/client_statement.php @@ -0,0 +1,189 @@ + + +
      +
    1. + Clients +
      2. +
    2. + +
      3. +
    + +
    +
    +

    Statement for

    +
    + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Invoice NumberDateDue DateAmountBalance
    + + + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    Payment ReferencePayment DatePayment AmountInvoice Number
    + + + + + + + +
    +
    +
    +
    +
    + + diff --git a/debug.php b/debug.php new file mode 100644 index 00000000..b9b52aaf --- /dev/null +++ b/debug.php @@ -0,0 +1,5 @@ + Date: Wed, 13 Dec 2023 16:12:23 +0000 Subject: [PATCH 03/11] update collections report to include link to statement. --- report_collections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report_collections.php b/report_collections.php index c62ac6f0..5f570f73 100644 --- a/report_collections.php +++ b/report_collections.php @@ -99,7 +99,7 @@ $formatted_behind_amount = numfmt_format_currency($currency_format, $behind_amount, $config_currency_code); echo ""; - echo "$client_name"; + echo "$client_name"; echo "$formatted_balance"; echo "$billing_contact_phone"; echo "$formatted_recurring_monthly_total"; From 1a18022cc6f6686319f72aba1688f8488fe7cf40 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 13 Dec 2023 16:21:40 +0000 Subject: [PATCH 04/11] remove debug --- client_statement.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client_statement.php b/client_statement.php index 1c2de0cc..c51ac7ed 100644 --- a/client_statement.php +++ b/client_statement.php @@ -1,6 +1,5 @@
    -

    Statement for

    +

    Statement for

    From 1f46ea79fce923e8e4773f09aef9ef99a1113b33 Mon Sep 17 00:00:00 2001 From: o-psi Date: Thu, 14 Dec 2023 15:35:03 +0000 Subject: [PATCH 05/11] Escaped Variables --- client_statement.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/client_statement.php b/client_statement.php index c51ac7ed..d1c76e5b 100644 --- a/client_statement.php +++ b/client_statement.php @@ -22,10 +22,10 @@ if (isset($_GET['client_id'])) { $result_client_details = mysqli_query($mysqli, $sql_client_details); $row_client_details = mysqli_fetch_assoc($result_client_details); - $client_name = $row_client_details['client_name']; - $client_type = $row_client_details['client_type']; - $client_website = $row_client_details['client_website']; - $client_net_terms = $row_client_details['client_net_terms']; + $client_name = nullable_html_entities($row_client_details['client_name']); + $client_type = nullable_html_entities($row_client_details['client_type']); + $client_website = nullable_html_entities($row_client_details['client_website']); + $client_net_terms = intval($row_client_details['client_net_terms']); $sql_client_unpaid_invoices = " SELECT @@ -82,16 +82,16 @@ if (isset($_GET['client_id'])) { @@ -151,10 +151,10 @@ if (isset($_GET['client_id'])) { $result_client_payments = mysqli_query($mysqli, $sql_client_payments); while ($row = mysqli_fetch_assoc($result_client_payments)) { - $payment_date = $row['payment_date']; - $payment_amount = $row['payment_amount']; - $payment_reference = $row['payment_reference']; - $invoice_number = $row['invoice_prefix'].$row['invoice_number']; + $payment_date = nullable_html_entities($row['payment_date']); + $payment_amount = floatval($row['payment_amount']); + $payment_reference = nullable_html_entities($row['payment_reference']); + $invoice_number = nullable_html_entities($row['invoice_prefix'].$row['invoice_number']); $payment_amount_formatted = numfmt_format_currency($currency_format, $payment_amount, $currency_code); ?> From 7004d9217dbf4ad89805525d0918b2103d924ac1 Mon Sep 17 00:00:00 2001 From: o-psi Date: Sun, 17 Dec 2023 20:34:39 +0000 Subject: [PATCH 06/11] Convert account_id and invoice_id to integers in calculateAccountBalance and calculateInvoiceBalance functions --- functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index c831a83a..a158ee13 100644 --- a/functions.php +++ b/functions.php @@ -850,7 +850,7 @@ function calculateAccountBalance($mysqli, $account_id) { $sql_account = mysqli_query($mysqli, "SELECT * FROM accounts LEFT JOIN account_types ON accounts.account_type = account_types.account_type_id WHERE account_archived_at IS NULL AND account_id = $account_id ORDER BY account_name ASC; "); $row = mysqli_fetch_array($sql_account); $opening_balance = floatval($row['opening_balance']); - $account_id = $row['account_id']; + $account_id = intval($row['account_id']); $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id"); $row = mysqli_fetch_array($sql_payments); @@ -877,7 +877,7 @@ function calculateInvoiceBalance($mysqli, $invoice_id) { $sql_invoice = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id"); $row = mysqli_fetch_array($sql_invoice); $invoice_amount = floatval($row['invoice_amount']); - $invoice_id = $row['invoice_id']; + $invoice_id = intval($row['invoice_id']); $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_invoice_id = $invoice_id"); $row = mysqli_fetch_array($sql_payments); From 320d534319dcb0f46448949839b777596443af21 Mon Sep 17 00:00:00 2001 From: o-psi Date: Mon, 18 Dec 2023 14:36:50 +0000 Subject: [PATCH 07/11] Fixed invoice_url --- client_statement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_statement.php b/client_statement.php index d1c76e5b..80eec8f6 100644 --- a/client_statement.php +++ b/client_statement.php @@ -88,7 +88,7 @@ if (isset($_GET['client_id'])) { $invoice_date = nullable_html_entities($row['invoice_date']); $invoice_amount = floatval($row['invoice_amount']); $invoice_amount_formatted = numfmt_format_currency($currency_format, $invoice_amount, $currency_code); - $invoice_url = intval("invoice.php?invoice_id=$invoice_id"); + $invoice_url = "invoice.php?invoice_id=$invoice_id"; $invoice_due = nullable_html_entities($row['invoice_due']); $invoice_balance = floatval(calculateInvoiceBalance($mysqli, $invoice_id)); From 29c7f53b8b8e5e22c9d9a39d1f0f90ef67efc1b7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 18 Dec 2023 12:08:33 -0500 Subject: [PATCH 08/11] Fixed incorrect function in statements should be nullable_htmlentities not nullable_html_entities --- client_statement.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client_statement.php b/client_statement.php index 80eec8f6..fa166620 100644 --- a/client_statement.php +++ b/client_statement.php @@ -22,9 +22,9 @@ if (isset($_GET['client_id'])) { $result_client_details = mysqli_query($mysqli, $sql_client_details); $row_client_details = mysqli_fetch_assoc($result_client_details); - $client_name = nullable_html_entities($row_client_details['client_name']); - $client_type = nullable_html_entities($row_client_details['client_type']); - $client_website = nullable_html_entities($row_client_details['client_website']); + $client_name = nullable_htmlentities($row_client_details['client_name']); + $client_type = nullable_htmlentities($row_client_details['client_type']); + $client_website = nullable_htmlentities($row_client_details['client_website']); $client_net_terms = intval($row_client_details['client_net_terms']); $sql_client_unpaid_invoices = " @@ -84,12 +84,12 @@ if (isset($_GET['client_id'])) { while ($row = mysqli_fetch_assoc($result_client_unpaid_invoices)) { $invoice_number = intval($row['invoice_number']); $invoice_id = intval($row['invoice_id']); - $invoice_prefix = nullable_html_entities($row['invoice_prefix']); - $invoice_date = nullable_html_entities($row['invoice_date']); + $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); + $invoice_date = nullable_htmlentities($row['invoice_date']); $invoice_amount = floatval($row['invoice_amount']); $invoice_amount_formatted = numfmt_format_currency($currency_format, $invoice_amount, $currency_code); $invoice_url = "invoice.php?invoice_id=$invoice_id"; - $invoice_due = nullable_html_entities($row['invoice_due']); + $invoice_due = nullable_htmlentities($row['invoice_due']); $invoice_balance = floatval(calculateInvoiceBalance($mysqli, $invoice_id)); $invoice_balance_formatted = numfmt_format_currency($currency_format, $invoice_balance, $currency_code); @@ -151,10 +151,10 @@ if (isset($_GET['client_id'])) { $result_client_payments = mysqli_query($mysqli, $sql_client_payments); while ($row = mysqli_fetch_assoc($result_client_payments)) { - $payment_date = nullable_html_entities($row['payment_date']); + $payment_date = nullable_htmlentities($row['payment_date']); $payment_amount = floatval($row['payment_amount']); - $payment_reference = nullable_html_entities($row['payment_reference']); - $invoice_number = nullable_html_entities($row['invoice_prefix'].$row['invoice_number']); + $payment_reference = nullable_htmlentities($row['payment_reference']); + $invoice_number = nullable_htmlentities($row['invoice_prefix'].$row['invoice_number']); $payment_amount_formatted = numfmt_format_currency($currency_format, $payment_amount, $currency_code); ?> From 2d06f923d4f0bdb5ed7721d77013e7e93e467177 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 18 Dec 2023 14:09:34 -0500 Subject: [PATCH 09/11] Fix Adding NULL logins when editing license --- post/software.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/post/software.php b/post/software.php index 07502704..4d412dd2 100644 --- a/post/software.php +++ b/post/software.php @@ -170,8 +170,6 @@ if (isset($_POST['edit_software'])) { $expire = "'" . $expire . "'"; } $notes = sanitizeInput($_POST['notes']); - $username = trim(mysqli_real_escape_string($mysqli, encryptLoginEntry($_POST['username']))); - $password = trim(mysqli_real_escape_string($mysqli, encryptLoginEntry($_POST['password']))); mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes' WHERE software_id = $software_id"); @@ -196,10 +194,15 @@ if (isset($_POST['edit_software'])) { //If login exists then update the login if ($login_id > 0) { + $username = encryptLoginEntry($_POST['username']); + $password = encryptLoginEntry($_POST['password']); + mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_username = '$username', login_password = '$password' WHERE login_id = $login_id"); }else{ //If Username is filled in then add a login - if (!empty($username)) { + if (!empty($_POST['username'])) { + $username = encryptLoginEntry($_POST['username']); + $password = encryptLoginEntry($_POST['password']); mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = '$password', login_software_id = $software_id, login_client_id = $client_id"); From 7894efedf09b52a5d9ec846b35adb6b0599e1934 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 18 Dec 2023 14:53:06 -0500 Subject: [PATCH 10/11] Related Items under Document Details can be clicked on and opened as a new window link --- client_document_details.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/client_document_details.php b/client_document_details.php index 672b70dd..d6ba5682 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -104,14 +104,15 @@ $document_parent = intval($row['document_parent']); while ($row = mysqli_fetch_array($sql_files)) { $file_id = intval($row['file_id']); + $folder_id = intval($row['folder_id']); $file_name = nullable_htmlentities($row['file_name']); $linked_files[] = $file_id; ?>
  • - - + +
    • @@ -143,8 +144,8 @@ $document_parent = intval($row['document_parent']); ?>
  • - - + +
    • @@ -161,7 +162,7 @@ $document_parent = intval($row['document_parent']);