From 13c330d3b113ab57de22cba0724ece0885a2a7f9 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 May 2019 02:06:58 -0400 Subject: [PATCH] Added cancelled status to invoice, invoice copy now works, minor ui cleanups, added tickets to client page --- add_client_asset_modal.php | 2 +- add_invoice_copy_modal.php | 41 +++++++++++++++++ add_ticket_modal.php | 2 +- client.php | 16 ++++--- client_assets.php | 2 +- client_domains.php | 10 ++++- client_invoices.php | 13 +++--- client_print.php | 14 +++--- client_routes.php | 3 ++ client_side_nav.php | 17 ++++++- client_tickets.php | 81 ++++++++++++++++++++++++++++++++++ edit_client_location_modal.php | 2 +- edit_invoice_modal.php | 2 +- edit_ticket_modal.php | 47 ++++++++++++++++++++ invoice.php | 21 +++++---- invoices.php | 25 +++++++---- post.php | 78 +++++++++++++++++++++++++++++--- tickets.php | 2 +- vendors.php | 6 --- 19 files changed, 325 insertions(+), 59 deletions(-) create mode 100644 add_invoice_copy_modal.php create mode 100644 client_tickets.php create mode 100644 edit_ticket_modal.php diff --git a/add_client_asset_modal.php b/add_client_asset_modal.php index 74930f65..fb018c11 100644 --- a/add_client_asset_modal.php +++ b/add_client_asset_modal.php @@ -2,7 +2,7 @@
-
New Asset
+
New Asset
diff --git a/add_invoice_copy_modal.php b/add_invoice_copy_modal.php new file mode 100644 index 00000000..bea1b155 --- /dev/null +++ b/add_invoice_copy_modal.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/add_ticket_modal.php b/add_ticket_modal.php index 11dbc741..afb05222 100644 --- a/add_ticket_modal.php +++ b/add_ticket_modal.php @@ -9,7 +9,7 @@
- +
diff --git a/client.php b/client.php index 3d56bf2b..7e212238 100644 --- a/client.php +++ b/client.php @@ -22,7 +22,7 @@ if(isset($_GET['client_id'])){ $client_net_terms = $row['client_net_terms']; //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE client_id = $client_id AND invoice_status NOT LIKE 'Draft'"); + $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'"); $row = mysqli_fetch_array($sql_invoice_amounts); $invoice_amounts = $row['invoice_amounts']; @@ -44,6 +44,9 @@ if(isset($_GET['client_id'])){ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_asset_id') AS num FROM client_assets WHERE client_id = $client_id")); $num_assets = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE client_id = $client_id")); + $num_tickets = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_vendor_id') AS num FROM client_vendors WHERE client_id = $client_id")); $num_vendors = $row['num']; @@ -88,9 +91,8 @@ if(isset($_GET['client_id'])){

Address

" target="_blank"> - -
- +
+
@@ -116,10 +118,10 @@ if(isset($_GET['client_id'])){

Standings

-
Paid to Date $ -
Balance $ +
Paid
$
+
Balance
$
-
+
diff --git a/client_domains.php b/client_domains.php index ee1bcf18..0f662b30 100644 --- a/client_domains.php +++ b/client_domains.php @@ -27,7 +27,15 @@ $client_domain_registrar = $row['client_domain_registrar']; $client_domain_webhost = $row['client_domain_webhost']; $client_domain_expire = $row['client_domain_expire']; - + + $sql_client_domain_registrar = mysqli_query($mysqli,"SELECT client_vendor_name FROM client_vendors WHERE client_vendor_id = $client_domain_registrar"); + $row = mysqli_fetch_array($sql_client_domain_registrar); + $client_domain_registrar = $row['client_vendor_name']; + + $sql_client_domain_webhost = mysqli_query($mysqli,"SELECT client_vendor_name FROM client_vendors WHERE client_vendor_id = $client_domain_webhost"); + $row = mysqli_fetch_array($sql_client_domain_webhost); + $client_domain_webhost = $row['client_vendor_name']; + ?> diff --git a/client_invoices.php b/client_invoices.php index de5105da..b04a0f4d 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -33,16 +33,13 @@ $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; $invoice_amount = $row['invoice_amount']; - $category_id = $row['category_id']; + $invoice_category_id = $row['category_id']; $now = time(); if(($invoice_status == "Sent" or $invoice_status == "Partial") and strtotime($invoice_due) < $now ){ $overdue_color = "text-danger font-weight-bold"; - $overdue_badge = "badge-danger"; - $invoice_status = "Overdue"; }else{ $overdue_color = ""; - $overdue_badge = ""; } //Set Badge color based off of invoice status @@ -52,7 +49,7 @@ $invoice_badge_color = "primary"; }elseif($invoice_status == "Paid"){ $invoice_badge_color = "success"; - }elseif($invoice_status == "Overdue"){ + }elseif($invoice_status == "Cancelled"){ $invoice_badge_color = "danger"; }else{ $invoice_badge_color = "secondary"; @@ -66,7 +63,7 @@
- + @@ -77,7 +74,7 @@
Edit - Copy + Copy Send PDF Delete @@ -89,7 +86,7 @@ diff --git a/client_print.php b/client_print.php index a1fe17ef..32b87c6e 100644 --- a/client_print.php +++ b/client_print.php @@ -35,7 +35,7 @@ if(isset($_GET['client_id'])){ WHERE invoices.client_id = $client_id AND payments.invoice_id = invoices.invoice_id AND payments.account_id = accounts.account_id - ORDER BY payments.payment_id DESC"); + ORDER BY invoices.invoice_number DESC"); $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_number DESC"); @@ -474,16 +474,16 @@ if(isset($_GET['client_id'])){ $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; - $invoice_balance = $row['invoice_balance']; + $invoice_amount = $row['invoice_amount']; ?> - INV- - $ - - - + INV- + $ + + + "> - + Assets 0){ ?> @@ -68,6 +68,21 @@ + +
  • "> + + + Tickets + 0){ ?> + + + + +
  • "> + +
    +
    +
    Tickets
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    NumberSubjectDate OpenedStatusActions
    + + + + +
    + +
    + Details + Edit + Delete +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/edit_client_location_modal.php b/edit_client_location_modal.php index cf8f8283..7d2214a2 100644 --- a/edit_client_location_modal.php +++ b/edit_client_location_modal.php @@ -61,7 +61,7 @@
    - +
    • diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php index b1443f4c..73fdd4b1 100644 --- a/edit_invoice_modal.php +++ b/edit_invoice_modal.php @@ -43,7 +43,7 @@ diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php new file mode 100644 index 00000000..57d4f864 --- /dev/null +++ b/edit_ticket_modal.php @@ -0,0 +1,47 @@ + \ No newline at end of file diff --git a/invoice.php b/invoice.php index f301cf36..7b5fdcff 100644 --- a/invoice.php +++ b/invoice.php @@ -59,7 +59,7 @@ if(isset($_GET['invoice_id'])){ $invoice_badge_color = "primary"; }elseif($invoice_status == "Paid"){ $invoice_badge_color = "success"; - }elseif($invoice_status == "Overdue"){ + }elseif($invoice_status == "Cancelled"){ $invoice_badge_color = "danger"; }else{ $invoice_badge_color = "secondary"; @@ -86,18 +86,20 @@ if(isset($_GET['invoice_id'])){
    - Edit - Copy - Recurring + Edit + Copy + Recurring Send - Mark Sent - Add Payment + Mark Sent + Add Payment Print PDF - Delete + + Cancel +
    @@ -191,7 +193,7 @@ if(isset($_GET['invoice_id'])){ ?> - + $ @@ -361,6 +363,7 @@ if(isset($_GET['invoice_id'])){ + diff --git a/invoices.php b/invoices.php index 5f753a5c..986e7e81 100644 --- a/invoices.php +++ b/invoices.php @@ -11,12 +11,23 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft'")); $draft_count = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled'")); + $cancelled_count = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_due > CURDATE()")); $overdue_count = $row['num']; + $sql_total_draft = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft'"); + $row = mysqli_fetch_array($sql_total_draft); + $total_draft = $row['total_draft']; + $sql_total_sent = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent'"); $row = mysqli_fetch_array($sql_total_sent); $total_sent = $row['total_sent']; + + $sql_total_cancelled = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled'"); + $row = mysqli_fetch_array($sql_total_cancelled); + $total_cancelled = $row['total_cancelled']; $sql_total_partial = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_partial FROM payments, invoices WHERE payments.invoice_id = invoices.invoice_id AND invoices.invoice_status = 'Partial'"); $row = mysqli_fetch_array($sql_total_partial); @@ -66,7 +77,7 @@
    -
    Draft

    $

    +
    Draft

    $

    @@ -76,7 +87,7 @@
    -
    Overdue

    $

    +
    Cancelled

    $

    @@ -113,16 +124,14 @@ $invoice_amount = $row['invoice_amount']; $client_id = $row['client_id']; $client_name = $row['client_name']; + $category_id = $row['category_id']; $now = time(); if(($invoice_status == "Sent" or $invoice_status == "Partial") and strtotime($invoice_due) < $now ){ $overdue_color = "text-danger font-weight-bold"; - $overdue_badge = "badge-danger"; - $invoice_status = "Overdue"; }else{ $overdue_color = ""; - $overdue_badge = ""; } //$unixtime_invoice_due = strtotime($invoice_due); @@ -138,7 +147,7 @@ $invoice_badge_color = "primary"; }elseif($invoice_status == "Paid"){ $invoice_badge_color = "success"; - }elseif($invoice_status == "Overdue"){ + }elseif($invoice_status == "Cancelled"){ $invoice_badge_color = "danger"; }else{ $invoice_badge_color = "secondary"; @@ -153,7 +162,7 @@ - + @@ -163,7 +172,7 @@
    - Copy + Copy Send PDF Delete diff --git a/post.php b/post.php index 70a0b3d1..88a88b0b 100644 --- a/post.php +++ b/post.php @@ -324,6 +324,20 @@ if(isset($_POST['add_ticket'])){ } +if(isset($_POST['edit_ticket'])){ + + $ticket_id = intval($_POST['ticket_id']); + $subject = strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])); + $details = strip_tags(mysqli_real_escape_string($mysqli,$_POST['details'])); + + mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_details = '$details' WHERE ticket_id = $ticket_id"); + + $_SESSION['alert_message'] = "Ticket updated"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['add_vendor'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); @@ -706,7 +720,6 @@ if(isset($_GET['delete_transfer'])){ } if(isset($_POST['add_invoice'])){ - $client = intval($_POST['client']); $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); $due = strip_tags(mysqli_real_escape_string($mysqli,$_POST['due'])); @@ -716,17 +729,12 @@ if(isset($_POST['add_invoice'])){ $sql = mysqli_query($mysqli,"SELECT invoice_number FROM invoices ORDER BY invoice_number DESC LIMIT 1"); $row = mysqli_fetch_array($sql); $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"); - $_SESSION['alert_message'] = "Invoice added"; header("Location: invoice.php?invoice_id=$invoice_id"); - } if(isset($_POST['edit_invoice'])){ @@ -744,6 +752,50 @@ if(isset($_POST['edit_invoice'])){ } +if(isset($_POST['add_invoice_copy'])){ + + $invoice_id = intval($_POST['invoice_id']); + $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); + $due = strip_tags(mysqli_real_escape_string($mysqli,$_POST['due'])); + + //Get the last Invoice Number and add 1 for the new invoice number + $sql = mysqli_query($mysqli,"SELECT invoice_number FROM invoices ORDER BY invoice_number DESC LIMIT 1"); + $row = mysqli_fetch_array($sql); + $invoice_number = $row['invoice_number'] + 1; + + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $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 invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = '$due', category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', client_id = $client_id"); + + $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"); + + $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id"); + while($row = mysqli_fetch_array($sql_invoice_items)){ + $invoice_item_id = $row['invoice_item_id']; + $invoice_item_name = $row['invoice_item_name']; + $invoice_item_description = $row['invoice_item_description']; + $invoice_item_quantity = $row['invoice_item_quantity']; + $invoice_item_price = $row['invoice_item_price']; + $invoice_item_subtotal = $row['invoice_item_subtotal']; + $invoice_item_tax = $row['invoice_item_tax']; + $invoice_item_total = $row['invoice_item_total']; + + mysqli_query($mysqli,"INSERT INTO invoice_items SET invoice_item_name = '$invoice_item_name', invoice_item_description = '$invoice_item_description', invoice_item_quantity = $invoice_item_quantity, invoice_item_price = '$invoice_item_price', invoice_item_subtotal = '$invoice_item_subtotal', invoice_item_tax = '$invoice_item_tax', invoice_item_total = '$invoice_item_total', invoice_id = $new_invoice_id"); + } + + $_SESSION['alert_message'] = "Invoice copied"; + + header("Location: invoice.php?invoice_id=$new_invoice_id"); + +} + if(isset($_POST['add_quote'])){ $client = intval($_POST['client']); @@ -881,6 +933,20 @@ if(isset($_GET['mark_invoice_sent'])){ } +if(isset($_GET['cancel_invoice'])){ + + $invoice_id = intval($_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"); + + $_SESSION['alert_message'] = "Invoice cancelled"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_GET['delete_invoice'])){ $invoice_id = intval($_GET['delete_invoice']); diff --git a/tickets.php b/tickets.php index b03441f5..2ea47135 100644 --- a/tickets.php +++ b/tickets.php @@ -52,7 +52,7 @@ ?> - + diff --git a/vendors.php b/vendors.php index b4cbe2ae..c51a2bee 100644 --- a/vendors.php +++ b/vendors.php @@ -15,9 +15,6 @@ Vendor Description - Phone - Email - Website Account Number Actions @@ -46,9 +43,6 @@ - - -