diff --git a/add_invoice_recurring_modal.php b/add_invoice_recurring_modal.php new file mode 100644 index 00000000..91e7f6b1 --- /dev/null +++ b/add_invoice_recurring_modal.php @@ -0,0 +1,37 @@ + \ No newline at end of file diff --git a/add_trip_modal.php b/add_trip_modal.php index cfa9a37a..04008adf 100644 --- a/add_trip_modal.php +++ b/add_trip_modal.php @@ -162,7 +162,7 @@ @@ -19,7 +18,6 @@ Frequency - Start Date Last Sent Next Date Status @@ -33,7 +31,6 @@ $recurring_id = $row['recurring_id']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; - $recurring_start_date = $row['recurring_start_date']; $recurring_last_sent = $row['recurring_last_sent']; if($recurring_last_sent == 0){ $recurring_last_sent = "-"; @@ -41,7 +38,6 @@ $recurring_next_date = $row['recurring_next_date']; $category_id = $row['category_id']; $category_name = $row['category_name']; - $invoice_id = $row['invoice_id']; if($recurring_status == 1){ $status = "Active"; $status_badge_color = "success"; @@ -54,7 +50,6 @@ ly - @@ -75,7 +70,7 @@ Activate - Delete + Delete diff --git a/cron.php b/cron.php index 4af9d843..0146a147 100644 --- a/cron.php +++ b/cron.php @@ -88,7 +88,7 @@ while($row = mysqli_fetch_array($sql)){ //Send Recurring Invoices that match todays date and are active -$sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring, clients, invoices WHERE clients.client_id = invoices.client_id AND invoices.invoice_id = recurring.invoice_id AND recurring.recurring_next_date = CURDATE() AND recurring.recurring_status = 1"); +$sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring, clients WHERE clients.client_id = recurring.client_id AND recurring.recurring_next_date = CURDATE() AND recurring.recurring_status = 1"); while($row = mysqli_fetch_array($sql_recurring)){ $recurring_id = $row['recurring_id']; @@ -97,11 +97,9 @@ while($row = mysqli_fetch_array($sql_recurring)){ $recurring_start_date = $row['recurring_start_date']; $recurring_last_sent = $row['recurring_last_sent']; $recurring_next_date = $row['recurring_next_date']; - $invoice_id = $row['invoice_id']; - $invoice_status = $row['invoice_status']; - $invoice_amount = $row['invoice_amount']; - $invoice_note = $row['invoice_note']; - $invoice_category_id = $row['category_id']; + $recurring_amount = $row['recurring_amount']; + $recurring_note = $row['recurring_note']; + $category_id = $row['category_id']; $client_id = $row['client_id']; $client_name = $row['client_name']; $client_net_terms = $row['client_net_terms']; @@ -111,13 +109,12 @@ while($row = mysqli_fetch_array($sql_recurring)){ $row = mysqli_fetch_array($sql_invoice_number); $new_invoice_number = $row['invoice_number'] + 1; - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $new_invoice_number, invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day) , invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', category_id = $invoice_category_id, invoice_status = 'Sent', client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $new_invoice_number, 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', client_id = $client_id"); $new_invoice_id = mysqli_insert_id($mysqli); - //Copy Items from original invoice to new invoice - $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE recurring = $recurring_id ORDER BY item_id ASC"); while($row = mysqli_fetch_array($sql_invoice_items)){ $item_id = $row['item_id']; @@ -132,7 +129,7 @@ while($row = mysqli_fetch_array($sql_recurring)){ 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', invoice_id = $new_invoice_id"); } - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $new_invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'INVOICE Generated from Recurring!', invoice_id = $new_invoice_id"); //update the recurring invoice with the new dates mysqli_query($mysqli,"UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency) , invoice_id = $new_invoice_id WHERE recurring_id = $recurring_id"); diff --git a/dashboard.php b/dashboard.php index 4a862b08..48cb836a 100644 --- a/dashboard.php +++ b/dashboard.php @@ -346,7 +346,7 @@ var myPieChart = new Chart(ctx, { data: { labels: [ +
+
+
Clients
+
+
+ +
+
-
-
-
- + + +
+
- +
- +
-
+ +
- +
- +
-
-
- +
+ +
-
+ +
-
+
@@ -140,7 +150,7 @@ if(isset($_GET['search'])){ - + diff --git a/invoice.php b/invoice.php index 7cc8aeca..28af5eb3 100644 --- a/invoice.php +++ b/invoice.php @@ -33,7 +33,7 @@ if(isset($_GET['invoice_id'])){ } $client_website = $row['client_website']; - $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id DESC"); + $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE invoice_id = $invoice_id ORDER BY history_id DESC"); $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); @@ -91,7 +91,7 @@ if(isset($_GET['invoice_id'])){
Edit Copy - Recurring + Recurring Send Mark Sent Add Payment @@ -299,16 +299,16 @@ if(isset($_GET['invoice_id'])){
- - - + + + + diff --git a/invoices.php b/invoices.php index fe757055..96c8d520 100644 --- a/invoices.php +++ b/invoices.php @@ -52,6 +52,17 @@ ?>
+
+
+
+
+ +
+
Draft

$

+
+
+
+
@@ -62,6 +73,7 @@
+
@@ -72,21 +84,12 @@
-
-
-
-
- -
-
Draft

$

-
-
-
+
- +
Cancelled

$

diff --git a/post.php b/post.php index 7f6f0c87..40f9fc1e 100644 --- a/post.php +++ b/post.php @@ -755,7 +755,7 @@ if(isset($_POST['add_invoice'])){ $invoice_number = $row['invoice_number'] + 1; mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = '$due', category_id = $category, invoice_status = 'Draft', client_id = $client"); $invoice_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'INVOICE added!', invoice_id = $invoice_id"); $_SESSION['alert_message'] = "Invoice added"; header("Location: invoice.php?invoice_id=$invoice_id"); @@ -798,7 +798,7 @@ if(isset($_POST['add_invoice_copy'])){ $new_invoice_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $new_invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'INVOICE added!', invoice_id = $new_invoice_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id"); while($row = mysqli_fetch_array($sql_items)){ @@ -820,6 +820,43 @@ if(isset($_POST['add_invoice_copy'])){ } +if(isset($_POST['add_invoice_recurring'])){ + + $invoice_id = intval($_POST['invoice_id']); + $recurring_frequency = strip_tags(mysqli_real_escape_string($mysqli,$_POST['frequency'])); + + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $invoice_date = $row['invoice_date']; + $invoice_amount = $row['invoice_amount']; + $invoice_note = $row['invoice_note']; + $client_id = $row['client_id']; + $category_id = $row['category_id']; + + mysqli_query($mysqli,"INSERT INTO recurring SET recurring_frequency = '$recurring_frequency', recurring_start_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_status = 1, recurring_amount = '$invoice_amount', recurring_note = '$invoice_note', recurring_created_at = NOW(), category_id = $category_id, client_id = $client_id"); + + $recurring_id = mysqli_insert_id($mysqli); + + $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id"); + while($row = mysqli_fetch_array($sql_items)){ + $item_id = $row['item_id']; + $item_name = $row['item_name']; + $item_description = $row['item_description']; + $item_quantity = $row['item_quantity']; + $item_price = $row['item_price']; + $item_subtotal = $row['item_subtotal']; + $item_tax = $row['item_tax']; + $item_total = $row['item_total']; + + 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', recurring_id = $recurring_id"); + } + + $_SESSION['alert_message'] = "Created recurring Invoice from this Invoice"; + + header("Location: recurring.php?recurring_id=$recurring_id"); + +} + if(isset($_POST['add_quote'])){ $client = intval($_POST['client']); @@ -839,7 +876,7 @@ if(isset($_POST['add_quote'])){ $quote_id = mysqli_insert_id($mysqli); - //mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'Quote created!', quote_id = $quote_id"); $_SESSION['alert_message'] = "Quote added"; @@ -874,10 +911,10 @@ if(isset($_GET['delete_quote'])){ } //Delete History Associated with the Quote - $sql = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE quote_id = $quote_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE quote_id = $quote_id"); while($row = mysqli_fetch_array($sql)){; - $invoice_history_id = $row['invoice_history_id']; - mysqli_query($mysqli,"DELETE FROM invoice_history WHERE invoice_history_id = $invoice_history_id"); + $history_id = $row['history_id']; + mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); } $_SESSION['alert_message'] = "Quotes deleted"; @@ -907,7 +944,7 @@ if(isset($_POST['add_quote_copy'])){ $new_quote_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'Quote copied!', quote_id = $new_quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'Quote copied!', quote_id = $new_quote_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE quote_id = $quote_id"); while($row = mysqli_fetch_array($sql_items)){ @@ -951,7 +988,7 @@ if(isset($_POST['add_quote_to_invoice'])){ $new_invoice_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'Quote copied to Invoice!', invoice_id = $new_invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'Quote copied to Invoice!', invoice_id = $new_invoice_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE quote_id = $quote_id"); while($row = mysqli_fetch_array($sql_items)){ @@ -1047,7 +1084,7 @@ if(isset($_GET['approve_quote'])){ mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Approved' WHERE quote_id = $quote_id"); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Approved', invoice_history_description = 'Quote approved!', quote_id = $quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Approved', history_description = 'Quote approved!', quote_id = $quote_id"); $_SESSION['alert_message'] = "Quote approved"; @@ -1061,7 +1098,7 @@ if(isset($_GET['cancel_quote'])){ mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Cancelled' WHERE quote_id = $quote_id"); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Cancelled', invoice_history_description = 'Quote cancelled!', quote_id = $quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'Quote cancelled!', quote_id = $quote_id"); $_SESSION['alert_message'] = "Quote cancelled"; @@ -1447,7 +1484,7 @@ if(isset($_GET['email_quote'])){ $mail->send(); echo 'Message has been sent'; - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'Emailed Quote!', quote_id = $quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed Quote!', quote_id = $quote_id"); //Don't change the status to sent if the status is anything but draft if($quote_status == 'Draft'){ @@ -1474,13 +1511,11 @@ if(isset($_POST['add_recurring'])){ $start_date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['start_date'])); $category = intval($_POST['category']); - mysqli_query($mysqli,"INSERT INTO invoices SET category_id = $category, invoice_status = 'Draft', client_id = $client"); + mysqli_query($mysqli,"INSERT INTO recurring SET recurring_frequency = '$frequency', recurring_next_date = '$start_date', category_id = $category, recurring_status = 1, client_id = $client"); - $invoice_id = mysqli_insert_id($mysqli); + $recurring_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO recurring SET recurring_frequency = '$frequency', recurring_start_date = '$start_date', recurring_next_date = '$start_date', recurring_status = 1, invoice_id = $invoice_id"); - - $recurring_invoice_id = mysqli_insert_id($mysqli); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Reccuring Invoice created!', recurring_id = $recurring_id"); $_SESSION['alert_message'] = "Recurring Invoice added"; @@ -1488,6 +1523,44 @@ if(isset($_POST['add_recurring'])){ } +if(isset($_GET['delete_recurring'])){ + $recurring_id = intval($_GET['delete_recurring']); + + mysqli_query($mysqli,"DELETE FROM recurring WHERE recurring_id = $recurring_id"); + + //Delete Items Associated with the Recurring + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE recurring_id = $recurring_id"); + while($row = mysqli_fetch_array($sql)){; + $item_id = $row['item_id']; + mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); + } + + //Delete History Associated with the Invoice + $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE recurring_id = $recurring_id"); + while($row = mysqli_fetch_array($sql)){; + $history_id = $row['history_id']; + mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); + } + + $_SESSION['alert_message'] = "Recurring Invoice deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_POST['edit_recurring_note'])){ + + $recurring_id = intval($_POST['recurring_id']); + $recurring_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['recurring_note'])); + + mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$recurring_note' WHERE recurring_id = $recurring_id"); + + $_SESSION['alert_message'] = "Notes added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_GET['recurring_activate'])){ $recurring_id = intval($_GET['recurring_activate']); @@ -1512,13 +1585,69 @@ if(isset($_GET['recurring_deactivate'])){ } +if(isset($_POST['add_recurring_item'])){ + + $recurring_id = intval($_POST['recurring_id']); + $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); + $qty = $_POST['qty']; + $price = $_POST['price']; + $tax = $_POST['tax']; + + $subtotal = $price * $qty; + $tax = $subtotal * $tax; + $total = $subtotal + $tax; + + 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', item_total = '$total', recurring_id = $recurring_id"); + + //Update Invoice Balances + + $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $row = mysqli_fetch_array($sql); + + $new_recurring_amount = $row['recurring_amount'] + $total; + + mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount' WHERE recurring_id = $recurring_id"); + + $_SESSION['alert_message'] = "Item added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_GET['delete_recurring_item'])){ + $item_id = intval($_GET['delete_recurring_item']); + + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); + $row = mysqli_fetch_array($sql); + $recurring_id = $row['recurring_id']; + $item_subtotal = $row['item_subtotal']; + $item_tax = $row['item_tax']; + $item_total = $row['item_total']; + + $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $row = mysqli_fetch_array($sql); + + $new_recurring_amount = $row['recurring_amount'] - $item_total; + + mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount' WHERE recurring_id = $recurring_id"); + + mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); + + $_SESSION['alert_message'] = "Item deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + + if(isset($_GET['mark_invoice_sent'])){ $invoice_id = intval($_GET['mark_invoice_sent']); mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent' WHERE invoice_id = $invoice_id"); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'INVOICE marked sent', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'INVOICE marked sent', invoice_id = $invoice_id"); $_SESSION['alert_message'] = "Invoice marked sent"; @@ -1532,7 +1661,7 @@ if(isset($_GET['cancel_invoice'])){ mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Cancelled' WHERE invoice_id = $invoice_id"); - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Cancelled', invoice_history_description = 'INVOICE cancelled!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Cancelled', history_description = 'INVOICE cancelled!', invoice_id = $invoice_id"); $_SESSION['alert_message'] = "Invoice cancelled"; @@ -1553,10 +1682,10 @@ if(isset($_GET['delete_invoice'])){ } //Delete History Associated with the Invoice - $sql = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE invoice_id = $invoice_id"); while($row = mysqli_fetch_array($sql)){; - $invoice_history_id = $row['invoice_history_id']; - mysqli_query($mysqli,"DELETE FROM invoice_history WHERE invoice_history_id = $invoice_history_id"); + $history_id = $row['history_id']; + mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); } //Delete Payments Associated with the Invoice @@ -1697,7 +1826,7 @@ if(isset($_POST['add_payment'])){ $mail->send(); echo 'Message has been sent'; - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'Emailed Receipt!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed Receipt!', invoice_id = $invoice_id"); } catch (Exception $e) { echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; @@ -1737,7 +1866,7 @@ if(isset($_POST['add_payment'])){ $mail->send(); echo 'Message has been sent'; - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'Emailed Receipt!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed Receipt!', invoice_id = $invoice_id"); } catch (Exception $e) { echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; @@ -1750,7 +1879,7 @@ if(isset($_POST['add_payment'])){ mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); //Add Payment to History - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = '$invoice_status', invoice_history_description = 'INVOICE payment added', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$invoice_status', history_description = 'INVOICE payment added', invoice_id = $invoice_id"); $_SESSION['alert_message'] = "Payment added"; @@ -1790,7 +1919,7 @@ if(isset($_GET['delete_payment'])){ mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); //Add Payment to History - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = '$invoice_status', invoice_history_description = 'INVOICE payment deleted', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$invoice_status', history_description = 'INVOICE payment deleted', invoice_id = $invoice_id"); mysqli_query($mysqli,"DELETE FROM payments WHERE payment_id = $payment_id"); @@ -2032,7 +2161,7 @@ if(isset($_GET['email_invoice'])){ $mail->send(); echo 'Message has been sent'; - mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'Emailed Invoice!', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Emailed Invoice!', invoice_id = $invoice_id"); //Don't chnage the status to sent if the status is anything but draf if($invoice_status == 'Draft'){ diff --git a/quote.php b/quote.php index 604d34d6..daf2197d 100644 --- a/quote.php +++ b/quote.php @@ -32,7 +32,7 @@ if(isset($_GET['quote_id'])){ } $client_website = $row['client_website']; - $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE quote_id = $quote_id ORDER BY invoice_history_id DESC"); + $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE quote_id = $quote_id ORDER BY history_id DESC"); //Set Badge color based off of quote status if($quote_status == "Sent"){ @@ -267,16 +267,16 @@ if(isset($_GET['quote_id'])){
- - - + + + @@ -21,7 +20,6 @@ - @@ -36,7 +34,6 @@ $recurring_id = $row['recurring_id']; $recurring_frequency = $row['recurring_frequency']; $recurring_status = $row['recurring_status']; - $recurring_start_date = $row['recurring_start_date']; $recurring_last_sent = $row['recurring_last_sent']; if($recurring_last_sent == 0){ $recurring_last_sent = "-"; @@ -44,7 +41,6 @@ $recurring_next_date = $row['recurring_next_date']; $client_id = $row['client_id']; $client_name = $row['client_name']; - $invoice_id = $row['invoice_id']; $category_id = $row['category_id']; $category_name = $row['category_name']; if($recurring_status == 1){ @@ -55,13 +51,11 @@ $status_badge_color = "secondary"; } - ?> - @@ -83,7 +77,7 @@ Activate - Delete + Delete diff --git a/recurring_invoice.php b/recurring_invoice.php index 8fc2e659..9f861068 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -6,9 +6,8 @@ if(isset($_GET['recurring_id'])){ $recurring_id = intval($_GET['recurring_id']); - $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, recurring - WHERE invoices.client_id = clients.client_id - AND invoices.invoice_id = recurring.invoice_id + $sql = mysqli_query($mysqli,"SELECT * FROM clients, recurring + WHERE recurring.client_id = clients.client_id AND recurring.recurring_id = $recurring_id" ); @@ -22,11 +21,9 @@ if(isset($_GET['recurring_id'])){ $recurring_last_sent = '-'; } $recurring_next_date = $row['recurring_next_date']; - $invoice_id = $row['invoice_id']; - $invoice_status = $row['invoice_status']; - $invoice_amount = $row['invoice_amount']; - $invoice_note = $row['invoice_note']; - $invoice_category_id = $row['category_id']; + $recurring_amount = $row['recurring_amount']; + $recurring_note = $row['recurring_note']; + $category_id = $row['category_id']; $client_id = $row['client_id']; $client_name = $row['client_name']; $client_address = $row['client_address']; @@ -49,16 +46,7 @@ if(isset($_GET['recurring_id'])){ $status_badge_color = "secondary"; } - $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id ASC"); - - $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); - - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); - $amount_paid = $row['amount_paid']; - - $balance = $invoice_amount - $amount_paid; + $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE recurring_id = $recurring_id ORDER BY history_id DESC"); ?> @@ -83,7 +71,7 @@ if(isset($_GET['recurring_id'])){ Activate - Delete + Delete @@ -140,7 +128,7 @@ if(isset($_GET['recurring_id'])){ - +
@@ -179,7 +167,7 @@ if(isset($_GET['recurring_id'])){ ?>
- + @@ -196,8 +184,8 @@ if(isset($_GET['recurring_id'])){ - - + + @@ -224,11 +212,11 @@ if(isset($_GET['recurring_id'])){ Notes
-
+
- - - + + +
@@ -252,15 +240,9 @@ if(isset($_GET['recurring_id'])){ - 0){ ?> - - - - - - - + +
Frequency ClientStart Date Last Sent Next Date Category
ly
$
$
Paid to Date
$
Balance Due$Amount$
@@ -277,22 +259,22 @@ if(isset($_GET['recurring_id'])){ - - + + - - + + - +
Date SentInvoice NumberDateEvent