From 2b1baa99c0092045ac27ec0418343d665951ed61 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Fri, 22 Jan 2021 13:55:56 -0500 Subject: [PATCH] Added Quote Scope capabilities --- add_quote_modal.php | 11 +++++++++++ client_quotes.php | 5 ++++- edit_quote_modal.php | 11 +++++++++++ post.php | 14 +++++++++----- quote.php | 1 + quotes.php | 3 +++ 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/add_quote_modal.php b/add_quote_modal.php index 33f06187..bddaa83f 100644 --- a/add_quote_modal.php +++ b/add_quote_modal.php @@ -50,6 +50,7 @@ " required> +
@@ -73,6 +74,16 @@
+ +
+ +
+
+ +
+ +
+
diff --git a/client_quotes.php b/client_quotes.php index 0aaecb6c..91dfb0d7 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -43,7 +43,7 @@ if(isset($_GET['o'])){ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, categories WHERE client_id = $client_id AND categories.category_id = quotes.category_id - AND (quote_id LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') + AND (quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -74,6 +74,7 @@ $total_pages = ceil($total_found_rows / 10); "> Number + Scope Amount Date Category @@ -87,6 +88,7 @@ $total_pages = ceil($total_found_rows / 10); while($row = mysqli_fetch_array($sql)){ $quote_id = $row['quote_id']; $quote_number = $row['quote_number']; + $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; $quote_amount = $row['quote_amount']; @@ -109,6 +111,7 @@ $total_pages = ceil($total_found_rows / 10); + $ diff --git a/edit_quote_modal.php b/edit_quote_modal.php index b9c3ad17..ded76c12 100644 --- a/edit_quote_modal.php +++ b/edit_quote_modal.php @@ -45,6 +45,17 @@
+ +
+ +
+
+ +
+ +
+
+
diff --git a/post.php b/post.php index 29e1a888..ce681023 100644 --- a/post.php +++ b/post.php @@ -1500,6 +1500,7 @@ if(isset($_POST['add_quote'])){ $client = intval($_POST['client']); $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $category = intval($_POST['category']); + $scope = strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])); //Get the last Invoice Number and add 1 for the new invoice number $quote_number = "$config_quote_prefix$config_quote_next_number"; @@ -1509,8 +1510,7 @@ if(isset($_POST['add_quote'])){ //Generate a unique URL key for clients to access $quote_url_key = keygen(); - - mysqli_query($mysqli,"INSERT INTO quotes SET quote_number = '$quote_number', quote_date = '$date', category_id = $category, quote_status = 'Draft', quote_url_key = '$quote_url_key', quote_created_at = NOW(), client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO quotes SET quote_number = '$quote_number', quote_scope = '$scope', quote_date = '$date', category_id = $category, quote_status = 'Draft', quote_url_key = '$quote_url_key', quote_created_at = NOW(), client_id = $client, company_id = $session_company_id"); $quote_id = mysqli_insert_id($mysqli); @@ -1538,11 +1538,12 @@ if(isset($_POST['add_quote_copy'])){ $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql); $quote_amount = $row['quote_amount']; + $quote_scope = mysqli_real_escape_string($mysqli,$row['quote_scope']); $quote_note = mysqli_real_escape_string($mysqli,$row['quote_note']); $client_id = $row['client_id']; $category_id = $row['category_id']; - mysqli_query($mysqli,"INSERT INTO quotes SET quote_number = '$quote_number', quote_date = '$date', category_id = $category_id, quote_status = 'Draft', quote_amount = '$quote_amount', quote_note = '$quote_note', quote_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO quotes SET quote_number = '$quote_number', quote_scope = '$quote_scope', quote_date = '$date', category_id = $category_id, quote_status = 'Draft', quote_amount = '$quote_amount', quote_note = '$quote_note', quote_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); $new_quote_id = mysqli_insert_id($mysqli); @@ -1584,14 +1585,16 @@ if(isset($_POST['add_quote_to_invoice'])){ $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql); $quote_amount = $row['quote_amount']; + $quote_scope = mysqli_real_escape_string($mysqli,$row['quote_scope']); $quote_note = mysqli_real_escape_string($mysqli,$row['quote_note']); + $client_id = $row['client_id']; $category_id = $row['category_id']; //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$quote_amount', invoice_note = '$quote_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_scope = '$quote_scope', invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$quote_amount', invoice_note = '$quote_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); $new_invoice_id = mysqli_insert_id($mysqli); @@ -1699,8 +1702,9 @@ if(isset($_POST['edit_quote'])){ $quote_id = intval($_POST['quote_id']); $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $category = intval($_POST['category']); + $scope = strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])); - mysqli_query($mysqli,"UPDATE quotes SET quote_date = '$date', category_id = $category, quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_scope = '$scope', quote_date = '$date', category_id = $category, quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = '$quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); diff --git a/quote.php b/quote.php index 209b2a5e..cbbe6534 100644 --- a/quote.php +++ b/quote.php @@ -14,6 +14,7 @@ if(isset($_GET['quote_id'])){ $row = mysqli_fetch_array($sql); $quote_id = $row['quote_id']; $quote_number = $row['quote_number']; + $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; $quote_amount = $row['quote_amount']; diff --git a/quotes.php b/quotes.php index f186e693..00bee432 100644 --- a/quotes.php +++ b/quotes.php @@ -73,6 +73,7 @@ "> Number + Scope Client Amount Date @@ -87,6 +88,7 @@ while($row = mysqli_fetch_array($sql)){ $quote_id = $row['quote_id']; $quote_number = $row['quote_number']; + $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; $quote_amount = $row['quote_amount']; @@ -115,6 +117,7 @@ + $