diff --git a/client_quotes.php b/client_quotes.php index 019d40fe..8678993d 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -94,14 +94,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $category_id = $row['category_id']; $category_name = $row['category_name']; + //Set Badge color based off of quote status if($quote_status == "Sent"){ - $quote_badge_color = "warning"; + $quote_badge_color = "warning text-white"; }elseif($quote_status == "Viewed"){ $quote_badge_color = "primary"; - }elseif($quote_status == "Approved"){ + }elseif($quote_status == "Accepted"){ $quote_badge_color = "success"; - }elseif($quote_status == "Rejected"){ + }elseif($quote_status == "Declined"){ $quote_badge_color = "danger"; + }elseif($quote_status == "Invoiced"){ + $quote_badge_color = "info"; }else{ $quote_badge_color = "secondary"; } @@ -125,13 +128,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- Send - Approve - PDF -
Edit Copy -
+
+ Send + PDF +
Delete
diff --git a/guest_post.php b/guest_post.php index 15457bdf..6f39a4c5 100644 --- a/guest_post.php +++ b/guest_post.php @@ -423,9 +423,9 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){ } } -if(isset($_GET['approve_quote'], $_GET['url_key'])){ +if(isset($_GET['accept_quote'], $_GET['url_key'])){ - $quote_id = intval($_GET['approve_quote']); + $quote_id = intval($_GET['accept_quote']); $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes @@ -435,11 +435,11 @@ if(isset($_GET['approve_quote'], $_GET['url_key'])){ if(mysqli_num_rows($sql) == 1){ - mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Approved' WHERE quote_id = $quote_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Accepted' WHERE quote_id = $quote_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Approved', history_description = 'Client approved Quote!', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Accepted', history_description = 'Client accepted Quote!', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); - $_SESSION['alert_message'] = "Quote approved"; + $_SESSION['alert_message'] = "Quote Accepted"; header("Location: " . $_SERVER["HTTP_REFERER"]); }else{ @@ -448,9 +448,9 @@ if(isset($_GET['approve_quote'], $_GET['url_key'])){ } -if(isset($_GET['reject_quote'], $_GET['url_key'])){ +if(isset($_GET['decline_quote'], $_GET['url_key'])){ - $quote_id = intval($_GET['reject_quote']); + $quote_id = intval($_GET['decline_quote']); $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes @@ -460,11 +460,11 @@ if(isset($_GET['reject_quote'], $_GET['url_key'])){ if(mysqli_num_rows($sql) == 1){ - mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Rejected' WHERE quote_id = $quote_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Declined' WHERE quote_id = $quote_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Rejected', history_description = 'Client rejected Quote!', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Declined', history_description = 'Client declined Quote!', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); - $_SESSION['alert_message'] = "Quote rejected"; + $_SESSION['alert_message'] = "Quote Declined"; header("Location: " . $_SERVER["HTTP_REFERER"]); }else{ diff --git a/guest_view_quote.php b/guest_view_quote.php index 51fbae9c..cffbfd49 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -76,33 +76,23 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Quote Viewed', alert_message = 'Quote $quote_number has been viewed by $client_name - $ip - $os - $browser - $device', alert_date = NOW(), company_id = $company_id"); - //Set Badge color based off of quote status - if($quote_status == "Sent"){ - $quote_badge_color = "warning text-white"; - }elseif($quote_status == "Viewed"){ - $quote_badge_color = "info"; - }elseif($quote_status == "Approved"){ - $quote_badge_color = "success"; - }elseif($quote_status == "Cancelled"){ - $quote_badge_color = "danger"; - }else{ - $quote_badge_color = "secondary"; - } - ?>
+
+ + Accept + Decline + +
+
Print Download - - Approve - Reject -
diff --git a/post.php b/post.php index acf430aa..96753485 100644 --- a/post.php +++ b/post.php @@ -1668,10 +1668,12 @@ if(isset($_POST['add_quote_to_invoice'])){ 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_created_at = NOW(), tax_id = $tax_id, invoice_id = $new_invoice_id, company_id = $session_company_id"); } + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Invoiced' WHERE quote_id = $quote_id AND company_id = $session_company_id"); + //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Created', log_description = 'Quote copied to Invoice', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); - $_SESSION['alert_message'] = "Quoted copied to Invoice"; + $_SESSION['alert_message'] = "Quote copied to Invoice"; header("Location: invoice.php?invoice_id=$new_invoice_id"); @@ -1860,35 +1862,35 @@ if(isset($_GET['mark_quote_sent'])){ } -if(isset($_GET['approve_quote'])){ +if(isset($_GET['accept_quote'])){ - $quote_id = intval($_GET['approve_quote']); + $quote_id = intval($_GET['accept_quote']); - mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Approved', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Accepted', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Approved', history_description = 'Quote approved!', history_created_at = NOW(), quote_id = $quote_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Accepted', history_description = 'Quote accepted!', history_created_at = NOW(), quote_id = $quote_id, company_id = $session_company_id"); //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = 'Approved Quote $quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = 'Accepted Quote $quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); - $_SESSION['alert_message'] = " Quote approved"; + $_SESSION['alert_message'] = " Quote accepted"; header("Location: " . $_SERVER["HTTP_REFERER"]); } -if(isset($_GET['reject_quote'])){ +if(isset($_GET['decline_quote'])){ - $quote_id = intval($_GET['reject_quote']); + $quote_id = intval($_GET['decline_quote']); - mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Rejected', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Declined', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'Quote rejected!', history_created_at = NOW(), quote_id = $quote_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'Quote declined!', history_created_at = NOW(), quote_id = $quote_id, company_id = $session_company_id"); //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = 'Rejected Quote $quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = 'Declined Quote $quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); - $_SESSION['alert_message'] = "Quote rejected"; + $_SESSION['alert_message'] = "Quote declined"; header("Location: " . $_SERVER["HTTP_REFERER"]); diff --git a/quote.php b/quote.php index 7f353106..629240fd 100644 --- a/quote.php +++ b/quote.php @@ -64,10 +64,12 @@ if(isset($_GET['quote_id'])){ $quote_badge_color = "warning text-white"; }elseif($quote_status == "Viewed"){ $quote_badge_color = "primary"; - }elseif($quote_status == "Approved"){ + }elseif($quote_status == "Accepted"){ $quote_badge_color = "success"; - }elseif($quote_status == "Cancelled"){ + }elseif($quote_status == "Declined"){ $quote_badge_color = "danger"; + }elseif($quote_status == "Invoiced"){ + $quote_badge_color = "info"; }else{ $quote_badge_color = "secondary"; } @@ -103,17 +105,12 @@ if(isset($_GET['quote_id'])){
- - -
- Approve - Reject -
+ + Accept + Decline - + Invoice @@ -121,15 +118,16 @@ if(isset($_GET['quote_id'])){
- -
+
Edit Copy
Print PDF + Send Email ">Guest URL
Delete diff --git a/quotes.php b/quotes.php index d29a3a50..7bd929df 100644 --- a/quotes.php +++ b/quotes.php @@ -142,6 +142,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $quote_badge_color = "success"; }elseif($quote_status == "Rejected"){ $quote_badge_color = "danger"; + }elseif($quote_status == "Invoiced"){ + $quote_badge_color = "info"; }else{ $quote_badge_color = "secondary"; } @@ -170,7 +172,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); Copy
Send - Approve PDF
Delete