AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-05 13:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Quotes to invoice item ordering

Browse Source 
- Fix item ordering not working for invoices generated from quotes
- Other small quote bugfixes
This commit is contained in:
Marcus Hill
2023-11-29 21:36:03 +00:00
parent 5772146d14
commit a0a4e5524a
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
post/quote.php
View File

@@ -126,9 +126,10 @@ if (isset($_POST['add_quote_to_invoice'])) {
$item_subtotal = floatval($row['item_subtotal']); $item_subtotal = floatval($row['item_subtotal']);
$item_tax = floatval($row['item_tax']); $item_tax = floatval($row['item_tax']);
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
$item_order = intval($row['item_order']);
$tax_id = intval($row['item_tax_id']); $tax_id = intval($row['item_tax_id']);
mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax, item_total = $item_total, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id"); mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax, item_total = $item_total, item_order = $item_order, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id");
} }
mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Invoiced' WHERE quote_id = $quote_id"); mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Invoiced' WHERE quote_id = $quote_id");
@@ -144,9 +145,7 @@ if (isset($_POST['add_quote_to_invoice'])) {
if (isset($_POST['add_quote_item'])) { if (isset($_POST['add_quote_item'])) {
include 'post/quote_model.php';
$quote_id = intval($_POST['quote_id']); $quote_id = intval($_POST['quote_id']);
$name = sanitizeInput($_POST['name']); $name = sanitizeInput($_POST['name']);
$description = sanitizeInput($_POST['description']); $description = sanitizeInput($_POST['description']);
$qty = floatval($_POST['qty']); $qty = floatval($_POST['qty']);
@@ -210,7 +209,6 @@ if (isset($_POST['edit_quote'])) {
require_once 'post/quote_model.php'; require_once 'post/quote_model.php';
$quote_id = intval($_POST['quote_id']); $quote_id = intval($_POST['quote_id']);
//Calculate the new quote amount //Calculate the new quote amount

2
quotes.php
View File

@@ -115,7 +115,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$quote_date = nullable_htmlentities($row['quote_date']); $quote_date = nullable_htmlentities($row['quote_date']);
$quote_expire = nullable_htmlentities($row['quote_expire']); $quote_expire = nullable_htmlentities($row['quote_expire']);
$quote_amount = floatval($row['quote_amount']); $quote_amount = floatval($row['quote_amount']);
$quote_discount = floatval($row['quote_discount']); $quote_discount = floatval($row['quote_discount_amount']);
$quote_currency_code = nullable_htmlentities($row['quote_currency_code']); $quote_currency_code = nullable_htmlentities($row['quote_currency_code']);
$quote_created_at = nullable_htmlentities($row['quote_created_at']); $quote_created_at = nullable_htmlentities($row['quote_created_at']);
$client_id = intval($row['client_id']); $client_id = intval($row['client_id']);