From 638d59e1c1ced0aa3ae4b513653397fa98c928f2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 31 Oct 2023 14:57:45 -0400 Subject: [PATCH] Sort items by item order when exporting invoices or quotes to PDF in app view and guest view --- guest_view_invoice.php | 2 +- guest_view_quote.php | 2 +- invoice.php | 2 +- quote.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 060ab769..0e1d19ae 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -447,7 +447,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it $total_tax = 0; $sub_total = 0; - $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC"); while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name']; diff --git a/guest_view_quote.php b/guest_view_quote.php index c0049c56..c8df34da 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -428,7 +428,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie $total_tax = 0; $sub_total = 0; - $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name']; diff --git a/invoice.php b/invoice.php index 392fa482..b5983fb6 100644 --- a/invoice.php +++ b/invoice.php @@ -730,7 +730,7 @@ require_once "footer.php"; $total_tax = 0.00; $sub_total = 0.00; - $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC"); while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name']; diff --git a/quote.php b/quote.php index 12a98332..650a9034 100644 --- a/quote.php +++ b/quote.php @@ -692,7 +692,7 @@ require_once "footer.php"; $total_tax = 0.00; $sub_total = 0.00; - $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name'];