From 17489e60c88d1371bb58388bb6ffa410808a013e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 18 Feb 2025 21:45:12 -0500 Subject: [PATCH] Merged Client Payments and Payments into one file using logic at the header to seperate between client and global section --- client_payments.php | 168 ------------------ includes/client_side_nav.php | 2 +- ...ort_modal.php => payment_export_modal.php} | 4 +- payments.php | 48 +++-- post/user/invoice.php | 19 +- 5 files changed, 51 insertions(+), 190 deletions(-) delete mode 100644 client_payments.php rename modals/{client_payment_export_modal.php => payment_export_modal.php} (79%) diff --git a/client_payments.php b/client_payments.php deleted file mode 100644 index 870a9a9e..00000000 --- a/client_payments.php +++ /dev/null @@ -1,168 +0,0 @@ - - -
-
-

Payments

- 0) { ?> -
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
-
-
-
- -
-
-
-
- - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Payment Date - - - - Invoice Date - - - - Invoice - - - - Invoice Amount - - - - Payment Amount - - - - Method - - - - Reference - - - - Account - -
-
- -
- - Delete - -
-
-
-
- -
-
- -= 1) { ?>
  • - "> + ">

    Payments diff --git a/modals/client_payment_export_modal.php b/modals/payment_export_modal.php similarity index 79% rename from modals/client_payment_export_modal.php rename to modals/payment_export_modal.php index a76f2c93..bd618abd 100644 --- a/modals/client_payment_export_modal.php +++ b/modals/payment_export_modal.php @@ -8,12 +8,14 @@

    + +
    - +
    diff --git a/payments.php b/payments.php index 240bbccb..913b6511 100644 --- a/payments.php +++ b/payments.php @@ -4,7 +4,14 @@ $sort = "payment_date"; $order = "DESC"; -require_once "includes/inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND invoice_client_id = $client_id"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; +} // Perms enforceUserPermission('module_financial'); @@ -42,6 +49,7 @@ $sql = mysqli_query( AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%') $account_query $payment_method_query + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -50,12 +58,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
    -
    -

    Payments

    +
    +

    Payments

    + 0) { ?> +
    + +
    +
    + + +
    @@ -158,14 +174,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Invoice + Client + + + + Invoice Amount + + - Amount + Payment Amount @@ -194,6 +217,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $invoice_status = nullable_htmlentities($row['invoice_status']); + $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']); @@ -221,8 +246,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - + "> + + + + @@ -250,10 +278,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - + 0) { $delimiter = ","; - $filename = $client_name . "-Payments-" . date('Y-m-d') . ".csv"; + $filename = "Payments-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w');