AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-11 08:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated all Queries related to invoice items to reflect their new tables quote, invoice, recurring invoice items

Browse Source
This commit is contained in:
johnnyq
2026-03-07 19:35:44 -05:00
parent 7f180eb6d9
commit 6122efc870
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent/ajax.php
View File

@@ -647,7 +647,7 @@ if (isset($_POST['update_quote_items_order'])) {
$id = intval($position['id']); $id = intval($position['id']);
$order = intval($position['order']); $order = intval($position['order']);
mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_quote_id = $quote_id AND item_id = $id"); mysqli_query($mysqli, "UPDATE quote_items SET item_order = $order WHERE item_quote_id = $quote_id AND item_id = $id");
} }
// return a response // return a response
@@ -691,7 +691,7 @@ if (isset($_POST['update_recurring_invoice_items_order'])) {
$id = intval($position['id']); $id = intval($position['id']);
$order = intval($position['order']); $order = intval($position['order']);
mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_recurring_invoice_id = $recurring_invoice_id AND item_id = $id"); mysqli_query($mysqli, "UPDATE recurring_invoice_items SET item_order = $order WHERE item_recurring_invoice_id = $recurring_invoice_id AND item_id = $id");
} }
// return a response // return a response

2
agent/modals/quote/quote_item_edit.php
View File

@@ -4,7 +4,7 @@ require_once '../../../includes/modal_header.php';
$item_id = intval($_GET['id']); $item_id = intval($_GET['id']);
$sql = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_id = $item_id LIMIT 1"); $sql = mysqli_query($mysqli, "SELECT * FROM quote_items WHERE item_id = $item_id LIMIT 1");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$item_name = nullable_htmlentities($row['item_name']); $item_name = nullable_htmlentities($row['item_name']);
$item_description = nullable_htmlentities($row['item_description']); $item_description = nullable_htmlentities($row['item_description']);

2
agent/modals/recurring_invoice/recurring_invoice_item_edit.php
View File

@@ -4,7 +4,7 @@ require_once '../../../includes/modal_header.php';
$item_id = intval($_GET['id']); $item_id = intval($_GET['id']);
$sql = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_id = $item_id LIMIT 1"); $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoice_items WHERE item_id = $item_id LIMIT 1");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$item_name = nullable_htmlentities($row['item_name']); $item_name = nullable_htmlentities($row['item_name']);
$item_description = nullable_htmlentities($row['item_description']); $item_description = nullable_htmlentities($row['item_description']);

4
agent/post/client.php
View File

@@ -394,7 +394,7 @@ if (isset($_GET['delete_client'])) {
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$quote_id = $row['quote_id']; $quote_id = $row['quote_id'];
mysqli_query($mysqli, "DELETE FROM invoice_items WHERE item_quote_id = $quote_id"); mysqli_query($mysqli, "DELETE FROM quote_items WHERE item_quote_id = $quote_id");
} }
mysqli_query($mysqli, "DELETE FROM quotes WHERE quote_client_id = $client_id"); mysqli_query($mysqli, "DELETE FROM quotes WHERE quote_client_id = $client_id");
@@ -402,7 +402,7 @@ if (isset($_GET['delete_client'])) {
$sql = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); $sql = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id");
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$recurring_invoice_id = $row['recurring_invoice_id']; $recurring_invoice_id = $row['recurring_invoice_id'];
mysqli_query($mysqli, "DELETE FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli, "DELETE FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
} }
mysqli_query($mysqli, "DELETE FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); mysqli_query($mysqli, "DELETE FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id");

28
agent/post/quote.php
View File

@@ -94,7 +94,7 @@ if (isset($_POST['add_quote_copy'])) {
mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Quote copied!', history_quote_id = $new_quote_id"); mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Quote copied!', history_quote_id = $new_quote_id");
$sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_quote_id = $quote_id");
while($row = mysqli_fetch_assoc($sql_items)) { while($row = mysqli_fetch_assoc($sql_items)) {
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);
$item_name = sanitizeInput($row['item_name']); $item_name = sanitizeInput($row['item_name']);
@@ -107,7 +107,7 @@ if (isset($_POST['add_quote_copy'])) {
$item_order = intval($row['item_order']); $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_order = $item_order, item_tax_id = $tax_id, item_quote_id = $new_quote_id"); mysqli_query($mysqli,"INSERT INTO quote_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_quote_id = $new_quote_id");
} }
logAction("Quote", "Create", "$session_name created quote $config_quote_prefix$quote_number from quote $original_quote_prefix$original_quote_number", $client_id, $new_quote_id); logAction("Quote", "Create", "$session_name created quote $config_quote_prefix$quote_number from quote $original_quote_prefix$original_quote_number", $client_id, $new_quote_id);
@@ -167,7 +167,7 @@ if (isset($_POST['add_quote_to_invoice'])) {
mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Invoice created from quote $quote_prefix$quote_number', history_invoice_id = $new_invoice_id"); mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Invoice created from quote $quote_prefix$quote_number', history_invoice_id = $new_invoice_id");
$sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_quote_id = $quote_id");
while($row = mysqli_fetch_assoc($sql_items)) { while($row = mysqli_fetch_assoc($sql_items)) {
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);
$item_name = sanitizeInput($row['item_name']); $item_name = sanitizeInput($row['item_name']);
@@ -244,7 +244,7 @@ if (isset($_POST['add_quote_item'])) {
$total = $subtotal + $tax_amount; $total = $subtotal + $tax_amount;
mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_quote_id = $quote_id"); mysqli_query($mysqli,"INSERT INTO quote_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_quote_id = $quote_id");
// Get Quote Details // Get Quote Details
$sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id");
@@ -255,7 +255,7 @@ if (isset($_POST['add_quote_item'])) {
$client_id = intval($row['quote_client_id']); $client_id = intval($row['quote_client_id']);
//add up the total of all items //add up the total of all items
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $sql = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_quote_id = $quote_id");
$quote_amount = 0; $quote_amount = 0;
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
@@ -301,7 +301,7 @@ if (isset($_POST['edit_quote_item'])) {
$total = $subtotal + $tax_amount; $total = $subtotal + $tax_amount;
// Get Quote ID from Item ID // Get Quote ID from Item ID
$sql = mysqli_query($mysqli,"SELECT item_quote_id FROM invoice_items WHERE item_id = $item_id"); $sql = mysqli_query($mysqli,"SELECT item_quote_id FROM quote_items WHERE item_id = $item_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$quote_id = intval($row['item_quote_id']); $quote_id = intval($row['item_quote_id']);
@@ -315,10 +315,10 @@ if (isset($_POST['edit_quote_item'])) {
enforceClientAccess(); enforceClientAccess();
mysqli_query($mysqli,"UPDATE invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id WHERE item_id = $item_id"); mysqli_query($mysqli,"UPDATE quote_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id WHERE item_id = $item_id");
//Update Quote Balances by tallying up items //Update Quote Balances by tallying up items
$sql_quote_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS quote_total FROM invoice_items WHERE item_quote_id = $quote_id"); $sql_quote_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS quote_total FROM quote_items WHERE item_quote_id = $quote_id");
$row = mysqli_fetch_assoc($sql_quote_total); $row = mysqli_fetch_assoc($sql_quote_total);
$new_quote_amount = floatval($row['quote_total']) - $quote_discount; $new_quote_amount = floatval($row['quote_total']) - $quote_discount;
@@ -380,7 +380,7 @@ if (isset($_POST['edit_quote'])) {
enforceClientAccess(); enforceClientAccess();
//Calculate the new quote amount //Calculate the new quote amount
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $sql = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_quote_id = $quote_id");
$quote_amount = 0; $quote_amount = 0;
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
@@ -418,10 +418,10 @@ if (isset($_GET['delete_quote'])) {
mysqli_query($mysqli,"DELETE FROM quotes WHERE quote_id = $quote_id"); mysqli_query($mysqli,"DELETE FROM quotes WHERE quote_id = $quote_id");
//Delete Items Associated with the Quote //Delete Items Associated with the Quote
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $sql = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_quote_id = $quote_id");
while($row = mysqli_fetch_assoc($sql)) {; while($row = mysqli_fetch_assoc($sql)) {;
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);
mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); mysqli_query($mysqli,"DELETE FROM quote_items WHERE item_id = $item_id");
} }
//Delete History Associated with the Quote //Delete History Associated with the Quote
@@ -452,7 +452,7 @@ if (isset($_GET['delete_quote_item'])) {
$item_id = intval($_GET['delete_quote_item']); $item_id = intval($_GET['delete_quote_item']);
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); $sql = mysqli_query($mysqli,"SELECT * FROM quote_items WHERE item_id = $item_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$item_name = sanitizeInput($row['item_name']); $item_name = sanitizeInput($row['item_name']);
$quote_id = intval($row['item_quote_id']); $quote_id = intval($row['item_quote_id']);
@@ -472,7 +472,7 @@ if (isset($_GET['delete_quote_item'])) {
mysqli_query($mysqli,"UPDATE quotes SET quote_amount = $new_quote_amount WHERE quote_id = $quote_id"); mysqli_query($mysqli,"UPDATE quotes SET quote_amount = $new_quote_amount WHERE quote_id = $quote_id");
mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); mysqli_query($mysqli,"DELETE FROM quote_items WHERE item_id = $item_id");
logAction("Quote", "Edit", "$session_name removed item $item_name from $quote_prefix$quote_number", $client_id, $quote_id); logAction("Quote", "Edit", "$session_name removed item $item_name from $quote_prefix$quote_number", $client_id, $quote_id);
@@ -900,7 +900,7 @@ if (isset($_GET['export_quote_pdf'])) {
$sub_total = 0; $sub_total = 0;
$total_tax = 0; $total_tax = 0;
$sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); $sql_items = mysqli_query($mysqli, "SELECT * FROM quote_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC");
while ($item = mysqli_fetch_assoc($sql_items)) { while ($item = mysqli_fetch_assoc($sql_items)) {
$name = $item['item_name']; $name = $item['item_name'];
$desc = $item['item_description']; $desc = $item['item_description'];

28
agent/post/recurring_invoice.php
View File

@@ -59,7 +59,7 @@ if (isset($_POST['add_invoice_recurring'])) {
$item_order = intval($row['item_order']); $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_order = $item_order, item_tax_id = $tax_id, item_recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli,"INSERT INTO recurring_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_recurring_invoice_id = $recurring_invoice_id");
} }
logAction("Recurring Invoice", "Create", "$session_name created recurring Invoice from Invoice $invoice_prefix$invoice_number", $client_id, $recurring_invoice_id); logAction("Recurring Invoice", "Create", "$session_name created recurring Invoice from Invoice $invoice_prefix$invoice_number", $client_id, $recurring_invoice_id);
@@ -133,7 +133,7 @@ if (isset($_POST['edit_recurring_invoice'])) {
enforceClientAccess(); enforceClientAccess();
//Calculate new total //Calculate new total
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
$recurring_invoice_amount = 0; $recurring_invoice_amount = 0;
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
@@ -174,10 +174,10 @@ if (isset($_GET['delete_recurring_invoice'])) {
mysqli_query($mysqli,"DELETE FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli,"DELETE FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
//Delete Items Associated with the Recurring //Delete Items Associated with the Recurring
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);
mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); mysqli_query($mysqli,"DELETE FROM recurring_invoice_items WHERE item_id = $item_id");
} }
//Delete History Associated with the Invoice //Delete History Associated with the Invoice
@@ -226,7 +226,7 @@ if (isset($_POST['add_recurring_invoice_item'])) {
$total = $subtotal + $tax_amount; $total = $subtotal + $tax_amount;
mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli,"INSERT INTO recurring_invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_recurring_invoice_id = $recurring_invoice_id");
$sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
@@ -237,7 +237,7 @@ if (isset($_POST['add_recurring_invoice_item'])) {
$client_id = intval($row['recurring_invoice_client_id']); $client_id = intval($row['recurring_invoice_client_id']);
//add up all the items //add up all the items
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
$recurring_invoice_amount = 0; $recurring_invoice_amount = 0;
while($row = mysqli_fetch_assoc($sql)) { while($row = mysqli_fetch_assoc($sql)) {
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
@@ -283,7 +283,7 @@ if (isset($_POST['edit_recurring_invoice_item'])) {
$total = $subtotal + $tax_amount; $total = $subtotal + $tax_amount;
// Get Recurring_invoice_id from item_id // Get Recurring_invoice_id from item_id
$sql = mysqli_query($mysqli,"SELECT item_recurring_invoice_id FROM invoice_items WHERE item_id = $item_id"); $sql = mysqli_query($mysqli,"SELECT item_recurring_invoice_id FROM recurring_invoice_items WHERE item_id = $item_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$recurring_invoice_id = intval($row['item_recurring_invoice_id']); $recurring_invoice_id = intval($row['item_recurring_invoice_id']);
@@ -297,10 +297,10 @@ if (isset($_POST['edit_recurring_invoice_item'])) {
enforceClientAccess(); enforceClientAccess();
mysqli_query($mysqli,"UPDATE invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id WHERE item_id = $item_id"); mysqli_query($mysqli,"UPDATE recurring_invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id WHERE item_id = $item_id");
//Update Invoice Balances by tallying up invoice items //Update Invoice Balances by tallying up invoice items
$sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
$row = mysqli_fetch_assoc($sql_recurring_invoice_total); $row = mysqli_fetch_assoc($sql_recurring_invoice_total);
$new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount; $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount;
@@ -351,7 +351,7 @@ if (isset($_GET['delete_recurring_invoice_item'])) {
$item_id = intval($_GET['delete_recurring_invoice_item']); $item_id = intval($_GET['delete_recurring_invoice_item']);
$sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoice_items WHERE item_id = $item_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$recurring_invoice_id = intval($row['item_recurring_invoice_id']); $recurring_invoice_id = intval($row['item_recurring_invoice_id']);
$item_name = sanitizeInput($row['item_name']); $item_name = sanitizeInput($row['item_name']);
@@ -371,7 +371,7 @@ if (isset($_GET['delete_recurring_invoice_item'])) {
mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id");
mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); mysqli_query($mysqli,"DELETE FROM recurring_invoice_items WHERE item_id = $item_id");
logAction("Recurring Invoice", "Edit", "$session_name removed item $item_name from recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id); logAction("Recurring Invoice", "Edit", "$session_name removed item $item_name from recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id);
@@ -427,7 +427,7 @@ if (isset($_GET['force_recurring'])) {
$new_invoice_id = mysqli_insert_id($mysqli); $new_invoice_id = mysqli_insert_id($mysqli);
//Copy Items from original invoice to new invoice //Copy Items from original invoice to new invoice
$sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC"); $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC");
while($row = mysqli_fetch_assoc($sql_invoice_items)) { while($row = mysqli_fetch_assoc($sql_invoice_items)) {
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);
@@ -452,7 +452,7 @@ if (isset($_GET['force_recurring'])) {
$item_total = $item_subtotal + $item_tax_amount; $item_total = $item_subtotal + $item_tax_amount;
//Update Recurring Items with new tax //Update Recurring Items with new tax
mysqli_query($mysqli,"UPDATE invoice_items SET item_tax = $item_tax_amount, item_total = $item_total, item_tax_id = $tax_id, item_order = $item_order WHERE item_id = $item_id"); mysqli_query($mysqli,"UPDATE recurring_invoice_items SET item_tax = $item_tax_amount, item_total = $item_total, item_tax_id = $tax_id, item_order = $item_order WHERE item_id = $item_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_amount, 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_amount, item_total = $item_total, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id");
} }
@@ -460,7 +460,7 @@ if (isset($_GET['force_recurring'])) {
mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id"); mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id");
//Update Recurring Balances by tallying up recurring items also update recurring dates //Update Recurring Balances by tallying up recurring items also update recurring dates
$sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
$row = mysqli_fetch_assoc($sql_recurring_invoice_total); $row = mysqli_fetch_assoc($sql_recurring_invoice_total);
$new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount_amount; $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount_amount;

2
agent/post/ticket.php
View File

@@ -2515,7 +2515,7 @@ if (isset($_POST['add_quote_from_ticket'])) {
$quote_id = mysqli_insert_id($mysqli); $quote_id = mysqli_insert_id($mysqli);
// Add line item // Add line item
mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order = 1, item_tax_id = $tax_id, item_quote_id = $quote_id"); mysqli_query($mysqli, "INSERT INTO quote_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order = 1, item_tax_id = $tax_id, item_quote_id = $quote_id");
// Add internal note to ticket, and link to invoice in database // Add internal note to ticket, and link to invoice in database
mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = 'Created quote <a href=\"quote.php?quote_id=$quote_id\">$config_quote_prefix$quote_number</a> for this ticket.', ticket_reply_type = 'Internal', ticket_reply_time_worked = '00:01:00', ticket_reply_by = $session_user_id, ticket_reply_ticket_id = $ticket_id"); mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = 'Created quote <a href=\"quote.php?quote_id=$quote_id\">$config_quote_prefix$quote_number</a> for this ticket.', ticket_reply_type = 'Internal', ticket_reply_time_worked = '00:01:00', ticket_reply_by = $session_user_id, ticket_reply_ticket_id = $ticket_id");

4
agent/quote.php
View File

@@ -285,7 +285,7 @@ if (isset($_GET['quote_id'])) {
</div> </div>
</div> </div>
<?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?> <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM quote_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-md-12"> <div class="col-md-12">
@@ -371,7 +371,7 @@ if (isset($_GET['quote_id'])) {
<input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>"> <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
<input type="hidden" name="item_order" value="<?php <input type="hidden" name="item_order" value="<?php
//find largest order number and add 1 //find largest order number and add 1
$sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM invoice_items WHERE item_quote_id = $quote_id"); $sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM quote_items WHERE item_quote_id = $quote_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$item_order = intval($row['item_order']) + 1; $item_order = intval($row['item_order']) + 1;
echo $item_order; echo $item_order;

4
agent/recurring_invoice.php
View File

@@ -250,7 +250,7 @@ if (isset($_GET['recurring_invoice_id'])) {
</div> </div>
</div> </div>
<?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_order ASC"); ?> <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_order ASC"); ?>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-md-12"> <div class="col-md-12">
@@ -329,7 +329,7 @@ if (isset($_GET['recurring_invoice_id'])) {
<input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>"> <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
<input type="hidden" name="item_order" value="<?php <input type="hidden" name="item_order" value="<?php
//find largest order number and add 1 //find largest order number and add 1
$sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
$item_order = intval($row['item_order']) + 1; $item_order = intval($row['item_order']) + 1;
echo $item_order; echo $item_order;

2
cron/cron.php
View File

@@ -628,7 +628,7 @@ while ($row = mysqli_fetch_assoc($sql_recurring_invoices)) {
$new_invoice_id = mysqli_insert_id($mysqli); $new_invoice_id = mysqli_insert_id($mysqli);
//Copy Items from original recurring invoice to new invoice //Copy Items from original recurring invoice to new invoice
$sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC"); $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM recurring_invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC");
while ($row = mysqli_fetch_assoc($sql_invoice_items)) { while ($row = mysqli_fetch_assoc($sql_invoice_items)) {
$item_id = intval($row['item_id']); $item_id = intval($row['item_id']);

2
guest/guest_post.php
View File

@@ -401,7 +401,7 @@ if (isset($_GET['export_quote_pdf'])) {
$sub_total = 0; $sub_total = 0;
$total_tax = 0; $total_tax = 0;
$sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); $sql_items = mysqli_query($mysqli, "SELECT * FROM quote_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC");
while ($item = mysqli_fetch_assoc($sql_items)) { while ($item = mysqli_fetch_assoc($sql_items)) {
$name = $item['item_name']; $name = $item['item_name'];
$desc = $item['item_description']; $desc = $item['item_description'];

2
guest/guest_view_quote.php
View File

@@ -176,7 +176,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
</div> </div>
</div> </div>
<?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?> <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM quote_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-md-12"> <div class="col-md-12">