From 7d9352c63dc453a88deafc2df109702758f266fa Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Mon, 8 Feb 2021 16:57:29 -0500 Subject: [PATCH] Added Invoice and Quote Prefix field to fix sorting issues --- add_invoice_copy_modal.php | 2 +- add_payment_modal.php | 2 +- add_quote_copy_modal.php | 2 +- client_invoices.php | 3 ++- client_quotes.php | 3 ++- cron.php | 18 +++++++------- dashboard.php | 5 ++-- db.sql | 8 ++++--- edit_invoice_modal.php | 2 +- edit_quote_modal.php | 2 +- guest_post.php | 6 +++-- guest_view_invoice.php | 24 +++++++++++-------- guest_view_quote.php | 3 ++- invoice.php | 5 ++-- invoices.php | 5 ++-- post.php | 48 +++++++++++++++++++++----------------- quote.php | 5 ++-- quotes.php | 3 ++- 18 files changed, 84 insertions(+), 62 deletions(-) diff --git a/add_invoice_copy_modal.php b/add_invoice_copy_modal.php index f9687ecc..76c2be78 100644 --- a/add_invoice_copy_modal.php +++ b/add_invoice_copy_modal.php @@ -2,7 +2,7 @@
-
Copying
+
Copying
diff --git a/add_payment_modal.php b/add_payment_modal.php index 8ff8178e..caa2776d 100644 --- a/add_payment_modal.php +++ b/add_payment_modal.php @@ -2,7 +2,7 @@
-
: Add Payment
+
: Add Payment
diff --git a/add_quote_copy_modal.php b/add_quote_copy_modal.php index eb8e678b..af70014c 100644 --- a/add_quote_copy_modal.php +++ b/add_quote_copy_modal.php @@ -2,7 +2,7 @@
-
Copying
+
Copying
diff --git a/client_invoices.php b/client_invoices.php index 567125c0..70a8cf09 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -87,6 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; @@ -122,7 +123,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ?> - + $ diff --git a/client_quotes.php b/client_quotes.php index e7a4a883..cb540a35 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -86,6 +86,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); while($row = mysqli_fetch_array($sql)){ $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; @@ -113,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ?> - + $ diff --git a/cron.php b/cron.php index 0bbc1b43..7089ffc2 100644 --- a/cron.php +++ b/cron.php @@ -84,6 +84,7 @@ while($row = mysqli_fetch_array($sql_companies)){ while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; @@ -95,7 +96,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $client_email = $row['client_email']; - mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Invoice', alert_message = 'Invoice $invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', alert_date = NOW(), company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Invoice', alert_message = 'Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', alert_date = NOW(), company_id = $company_id"); $mail = new PHPMailer(true); @@ -119,10 +120,10 @@ while($row = mysqli_fetch_array($sql_companies)){ // Content $mail->isHTML(true); // Set email format to HTML - $mail->Subject = "Overdue Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

According to our records, we have not received payment for invoice $invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone. + $mail->Subject = "Overdue Invoice $invoice_prefix$invoice_number"; + $mail->Body = "Hello $client_name,

According to our records, we have not received payment for invoice $invoice_prefix$invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone.

- Please view the details of the invoice below.

Invoice: $invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due


To view your invoice online click here


~
$company_name
$company_phone"; + Please view the details of the invoice below.

Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due


To view your invoice online click here


~
$company_name
$company_phone"; $mail->send(); @@ -189,14 +190,14 @@ while($row = mysqli_fetch_array($sql_companies)){ $row = mysqli_fetch_array($sql_invoice_number); $config_invoice_next_number = $row['config_invoice_next_number']; - $new_invoice_number = "$config_invoice_prefix$config_invoice_next_number"; + $new_invoice_number = $config_invoice_next_number; $new_config_invoice_next_number = $config_invoice_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $company_id"); //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $company_id"); $new_invoice_id = mysqli_insert_id($mysqli); @@ -252,6 +253,7 @@ while($row = mysqli_fetch_array($sql_companies)){ ); $row = mysqli_fetch_array($sql); + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; @@ -291,8 +293,8 @@ while($row = mysqli_fetch_array($sql_companies)){ // Content $mail->isHTML(true); // Set email format to HTML - $mail->Subject = "Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

Please view the details of the invoice below.

Invoice: $invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due


To view your invoice online click here


~
$company_name
$company_phone"; + $mail->Subject = "Invoice $invoice_prefix$invoice_number"; + $mail->Body = "Hello $client_name,

Please view the details of the invoice below.

Invoice: $invoice_prefix$invoice_number
Issue Date: $invoice_date
Total: $$invoice_amount
Due Date: $invoice_due


To view your invoice online click here


~
$company_name
$company_phone"; $mail->send(); diff --git a/dashboard.php b/dashboard.php index 2520b6ef..d992969c 100644 --- a/dashboard.php +++ b/dashboard.php @@ -362,13 +362,14 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount']; while($row = mysqli_fetch_array($sql_latest_invoice_payments)){ $payment_date = $row['payment_date']; $payment_amount = $row['payment_amount']; - $invoice_number = $row['invoice_number']; + $invoice_prefix = $row['invoice_prefix']; + $invoice_number = $row['invoice_number']; $client_name = $row['client_name']; ?> - + $
-
+
diff --git a/edit_quote_modal.php b/edit_quote_modal.php index 182fdffc..a26cc9dc 100644 --- a/edit_quote_modal.php +++ b/edit_quote_modal.php @@ -2,7 +2,7 @@
-
+
diff --git a/guest_post.php b/guest_post.php index 6f39a4c5..209dab29 100644 --- a/guest_post.php +++ b/guest_post.php @@ -24,6 +24,7 @@ if(isset($_GET['pdf_invoice'], $_GET['url_key'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; @@ -140,7 +141,7 @@ if(isset($_GET['pdf_invoice'], $_GET['url_key'])){ - +
'.$company_name.'
' .$company_address.'
'.$company_city.' '.$company_state.' '.$company_zip.'
'.$company_phone.' 		Invoice No.
'.$invoice_number.' 		Invoice No.
'."$invoice_prefix$invoice_number".'
@@ -244,6 +245,7 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){ $row = mysqli_fetch_array($sql); $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; @@ -348,7 +350,7 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){ - +
'.$company_name.'
' .$company_address.'
'.$company_city.' '.$company_state.' '.$company_zip.'
'.$company_phone.' 		Quote No.
'.$quote_number.' 		Quote No.
'."$quote_prefix$quote_number".'
diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 899144d2..6be5364f 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -19,6 +19,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; @@ -139,7 +140,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
-

Invoice

+

Invoice

@@ -252,23 +253,23 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ Subtotal - $ + $ 0){ ?> Tax - $ + $ 0){ ?>
Paid to Date
- $ + $ Balance Due - $ + $ @@ -309,6 +310,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; @@ -321,10 +323,10 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ ?> - + ( Days Late) - $ + $ - + (Due in Days) $ @@ -426,6 +429,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; @@ -436,10 +440,10 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ ?> - + - $ + $ diff --git a/guest_view_quote.php b/guest_view_quote.php index b197f756..7cf5c376 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -20,6 +20,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $row = mysqli_fetch_array($sql); $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; @@ -102,7 +103,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
-

Quote

+

Quote

diff --git a/invoice.php b/invoice.php index 277afac3..d9291c83 100644 --- a/invoice.php +++ b/invoice.php @@ -18,6 +18,7 @@ if(isset($_GET['invoice_id'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; @@ -106,7 +107,7 @@ if(isset($_GET['invoice_id'])){
    • -
    • +
    • @@ -175,7 +176,7 @@ if(isset($_GET['invoice_id'])){
    -

    Invoice

    +

    Invoice

    diff --git a/invoices.php b/invoices.php index bdf55f58..f95fd2a7 100644 --- a/invoices.php +++ b/invoices.php @@ -69,7 +69,7 @@ } if(!empty($_GET['sb'])){ - $sb = mysqli_real_escape_string($mysqli,$_GET['sb']); + $sb = $_GET['sb']; }else{ $sb = "invoice_number"; } @@ -229,6 +229,7 @@ while($row = mysqli_fetch_array($sql)){ $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_scope = $row['invoice_scope']; $invoice_status = $row['invoice_status']; @@ -270,7 +271,7 @@ ?> - + $ diff --git a/post.php b/post.php index aa3d3be5..4abf8fa0 100644 --- a/post.php +++ b/post.php @@ -1530,20 +1530,20 @@ if(isset($_POST['add_invoice'])){ $client_net_terms = $row['client_net_terms']; //Get the last Invoice Number and add 1 for the new invoice number - $invoice_number = "$config_invoice_prefix$config_invoice_next_number"; + $invoice_number = $config_invoice_next_number; $new_config_invoice_next_number = $config_invoice_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $session_company_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_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $invoice_number, invoice_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client, company_id = $session_company_id"); $invoice_id = mysqli_insert_id($mysqli); mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'INVOICE added!', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id"); //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Created', log_description = '$invoice_number', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Created', log_description = '$config_invoice_prefix$invoice_number', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); $_SESSION['alert_message'] = "Invoice added"; @@ -1579,7 +1579,7 @@ if(isset($_POST['add_invoice_copy'])){ $row = mysqli_fetch_array($sql); $client_net_terms = $row['client_net_terms']; - $invoice_number = "$config_invoice_prefix$config_invoice_next_number"; + $invoice_number = $config_invoice_next_number; $new_config_invoice_next_number = $config_invoice_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $session_company_id"); @@ -1594,7 +1594,7 @@ if(isset($_POST['add_invoice_copy'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_scope = '$invoice_scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id") or die(mysql_error()); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $invoice_number, invoice_scope = '$invoice_scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id") or die(mysql_error()); $new_invoice_id = mysqli_insert_id($mysqli); @@ -1675,22 +1675,22 @@ if(isset($_POST['add_quote'])){ $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"; + //Get the last Quote Number and add 1 for the new Quote number + $quote_number = $config_quote_next_number; $new_config_quote_next_number = $config_quote_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_quote_next_number = $new_config_quote_next_number WHERE company_id = $session_company_id"); //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_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"); + mysqli_query($mysqli,"INSERT INTO quotes SET quote_prefix = '$config_quote_prefix', 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); mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'Quote created!', 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 = 'Created', log_description = '$quote_number', 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 = 'Created', log_description = '$quote_prefix$quote_number', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); $_SESSION['alert_message'] = "Quote added"; @@ -1704,7 +1704,7 @@ if(isset($_POST['add_quote_copy'])){ $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); //Get the last Invoice Number and add 1 for the new invoice number - $quote_number = "$config_quote_prefix$config_quote_next_number"; + $quote_number = $config_quote_next_number; $new_config_quote_next_number = $config_quote_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_quote_next_number = $new_config_quote_next_number WHERE company_id = $session_company_id"); @@ -1716,7 +1716,7 @@ if(isset($_POST['add_quote_copy'])){ $client_id = $row['client_id']; $category_id = $row['category_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"); + mysqli_query($mysqli,"INSERT INTO quotes SET quote_prefix = '$config_quote_prefix', 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); @@ -1752,7 +1752,7 @@ if(isset($_POST['add_quote_to_invoice'])){ $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $client_net_terms = intval($_POST['client_net_terms']); - $invoice_number = "$config_invoice_prefix$config_invoice_next_number"; + $invoice_number = $config_invoice_next_number; $new_config_invoice_next_number = $config_invoice_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $session_company_id"); @@ -1768,7 +1768,7 @@ if(isset($_POST['add_quote_to_invoice'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - 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"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', 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); @@ -1991,6 +1991,7 @@ if(isset($_GET['pdf_quote'])){ $row = mysqli_fetch_array($sql); $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; @@ -2100,7 +2101,7 @@ if(isset($_GET['pdf_quote'])){ - +
    '.$company_name.'
    ' .$company_address.'
    '.$company_city.' '.$company_state.' '.$company_zip.'
    '.$company_phone.'     		Quote No.
    '.$quote_number.'     		Quote No.
    '."quote_prefix$quote_number".'
    @@ -2187,6 +2188,7 @@ if(isset($_GET['email_quote'])){ $row = mysqli_fetch_array($sql); $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_status = $row['quote_status']; $quote_date = $row['quote_date']; @@ -2873,6 +2875,7 @@ if(isset($_GET['email_invoice'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; @@ -2939,20 +2942,20 @@ if(isset($_GET['email_invoice'])){ if($invoice_status == 'Paid'){ - $mail->Subject = "Invoice $invoice_number Copy"; + $mail->Subject = "Invoice $invoice_prefix$invoice_number Copy"; $mail->Body = "Hello $client_name,

    Please click on the link below to see your invoice marked paid.

    Invoice Link


    ~
    $company_name
    Automated Billing Department
    $company_phone"; }else{ - $mail->Subject = "Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

    Please view the details of the invoice below.

    Invoice: $invoice_number
    Issue Date: $invoice_date
    Total: $$invoice_amount
    Balance Due: $$balance
    Due Date: $invoice_due


    To view your invoice online click here


    ~
    $company_name
    $company_phone"; + $mail->Subject = "Invoice $invoice_prefix$invoice_number"; + $mail->Body = "Hello $client_name,

    Please view the details of the invoice below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: $$invoice_amount
    Balance Due: $$balance
    Due Date: $invoice_due


    To view your invoice online click here


    ~
    $company_name
    $company_phone"; //$mail->AltBody = 'This is the body in plain text for non-HTML mail clients'; } $mail->send(); echo 'Message has been sent'; - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed Invoice!', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed invoice', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id"); //Don't chnage the status to sent if the status is anything but draf if($invoice_status == 'Draft'){ @@ -2962,7 +2965,7 @@ if(isset($_GET['email_invoice'])){ } //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Emailed', log_description = 'Invoice $invoice_number emailed to $client_email', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Emailed', log_description = 'Invoice $invoice_prefix$invoice_number emailed to $client_email', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); $_SESSION['alert_message'] = "Invoice has been sent"; @@ -3044,6 +3047,7 @@ if(isset($_GET['pdf_invoice'])){ $row = mysqli_fetch_array($sql); $invoice_id = $row['invoice_id']; + $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; @@ -3157,7 +3161,7 @@ if(isset($_GET['pdf_invoice'])){ - +
    '.$company_name.'
    ' .$company_address.'
    '.$company_city.' '.$company_state.' '.$company_zip.'
    '.$company_phone.'     		Invoice No.
    '.$invoice_number.'     		Invoice No.
    '."$invoice_prefix$invoice_number".'
    @@ -3964,14 +3968,14 @@ if(isset($_GET['force_recurring'])){ $client_net_terms = $row['client_net_terms']; //Get the last Invoice Number and add 1 for the new invoice number - $new_invoice_number = "$config_invoice_prefix$config_invoice_next_number"; + $new_invoice_number = $config_invoice_next_number; $new_config_invoice_next_number = $config_invoice_next_number + 1; mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $session_company_id"); //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', 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_prefix = '$config_invoice_prefix', invoice_number = '$new_invoice_number', invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_note = '$recurring_note', category_id = $category_id, invoice_status = 'Sent', 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); diff --git a/quote.php b/quote.php index 030014d2..aadb8bca 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_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; @@ -84,7 +85,7 @@ if(isset($_GET['quote_id'])){
    • -
    • +
    • @@ -145,7 +146,7 @@ if(isset($_GET['quote_id'])){
    -

    Quote

    +

    Quote

    diff --git a/quotes.php b/quotes.php index 0b5bad01..60ae73b1 100644 --- a/quotes.php +++ b/quotes.php @@ -120,6 +120,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); while($row = mysqli_fetch_array($sql)){ $quote_id = $row['quote_id']; + $quote_prefix = $row['quote_prefix']; $quote_number = $row['quote_number']; $quote_scope = $row['quote_scope']; $quote_status = $row['quote_status']; @@ -152,7 +153,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ?> - + $