From 377bf5521074907c0c9483e77ef81b03816eb088 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Thu, 6 Feb 2020 23:08:41 -0500 Subject: [PATCH] Invoice Overhaul, added edit item, reorganized drop down menus etc --- add_payment_modal.php | 53 +++-- edit_invoice_item_modal.php | 84 ++++++++ edit_item_modal.php | 71 ------- guest_view_invoice.php | 2 +- invoice.php | 408 ++++++++++++++++++++---------------- invoice_note_modal.php | 24 +++ post.php | 48 ++--- quote.php | 2 +- 8 files changed, 396 insertions(+), 296 deletions(-) create mode 100644 edit_invoice_item_modal.php delete mode 100644 edit_item_modal.php create mode 100644 invoice_note_modal.php diff --git a/add_payment_modal.php b/add_payment_modal.php index 6141fbb8..f1ce6988 100644 --- a/add_payment_modal.php +++ b/add_payment_modal.php @@ -2,7 +2,7 @@
-
Add Payment
+
: Add Payment
@@ -12,24 +12,35 @@
-
- -
-
- +
+
+ +
+ +
+
+ +
+ " required> +
- " required> +
-
- -
- -
-
- + +
+ +
+ +
+
+ +
+ +
- +
+
@@ -104,11 +115,17 @@
-
- - + +
+ +
+ + +
+
+
diff --git a/edit_invoice_item_modal.php b/edit_invoice_item_modal.php new file mode 100644 index 00000000..ecfdead9 --- /dev/null +++ b/edit_invoice_item_modal.php @@ -0,0 +1,84 @@ + \ No newline at end of file diff --git a/edit_item_modal.php b/edit_item_modal.php deleted file mode 100644 index addb8f08..00000000 --- a/edit_item_modal.php +++ /dev/null @@ -1,71 +0,0 @@ - \ No newline at end of file diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 31b23f79..08ed169c 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -184,7 +184,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
- +
diff --git a/invoice.php b/invoice.php index 49ef9bec..0015b76f 100644 --- a/invoice.php +++ b/invoice.php @@ -91,213 +91,242 @@ if(isset($_GET['invoice_id'])){ - - - -
-
-
-
- +
+ +
+ +
+ +
+ + +
+ Send Email +
+ Mark Sent
-
-
- -
- Edit - Copy - Create Recurring - Send - Mark Sent - Add Payment - Print - ">Guest URL - PDF - - Cancel - -
+ + + + Pay + +
+ +
+ +
+ +
+ Edit + Copy + Recurring +
+ Print + PDF + + ">Guest URL +
+ Cancel +
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+
+
+ +
+
+

Invoice

+
+ + +
+
+
+
    +

    • +
    • +
    • +
  • P:
    • +
    • +
+
+
+
    +

    • +
    • +
    • +
  • P:
    • +
  • E:
    • +
-
- -
-
- -
-
-
-
- -
-
-

Invoice

-
- - +
+
-
-
-
    -

    • -
    • -
    • -
  • P:
    • -
    • -
-
-
-
    -

    • -
    • -
    • -
  • P:
    • -
  • E:
    • -
-
+
+
Product
+ + + + + + + + +
Invoice Date
Due Date
-
-
-
-
+
+ + + +
+
+
- - - - - - - - -
Invoice Date
Due Date
-
-
+ + + + Item + Description + QTY + Price + Tax + Total + + + + + ?> -
-
-
- - - - - - - - - - - - - - + + + + + + + + - ?> + - - - - - - - - + include("edit_item_modal.php"); - - } - - ?> - - - + + + - - - + + + - - - -
ProductDescriptionQtyPriceTaxTotal
+ + + $$$
- - - $$$
-
-
-
-
- -
-
-
-
-
-
-
- -
-
- - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - 0){ ?> - - - - - - - - + +
Subtotal$
Discount$
Tax$
Paid to Date
$
Balance Due$ + +
+
- +
+
+
+
+ Notes +
+ + + +
+
+
+
+
+
+
+
+ + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + + + + + +
Subtotal$
Discount$
Tax$
Paid to Date
$
Balance Due$
+
+
@@ -309,7 +338,15 @@ if(isset($_GET['invoice_id'])){
- History + History +
+ + +
@@ -346,7 +383,15 @@ if(isset($_GET['invoice_id'])){
- Payments + Payments +
+ + +
@@ -388,9 +433,10 @@ if(isset($_GET['invoice_id'])){ - + + +
+
+
+
Invoice Notes
+ +
+
+ +
+
+ +
+
+
+ + +
+ +
+
+ \ No newline at end of file diff --git a/post.php b/post.php index 1e973442..da4b5e67 100644 --- a/post.php +++ b/post.php @@ -2184,45 +2184,45 @@ if(isset($_GET['delete_invoice'])){ } -if(isset($_POST['save_invoice'])){ +if(isset($_POST['add_invoice_line_item'])){ $invoice_id = intval($_POST['invoice_id']); + $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); + $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); + $qty = floatval($_POST['qty']); + $price = floatval($_POST['price']); + $tax = floatval($_POST['tax']); - if(!empty($_POST['name'])){ - $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); - $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); - $qty = floatval($_POST['qty']); - $price = floatval($_POST['price']); - $tax = floatval($_POST['tax']); - - $subtotal = $price * $qty; - $tax = $subtotal * $tax; - $total = $subtotal + $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', item_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id"); + 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', item_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id"); - //Update Invoice Balances + //Update Invoice Balances - $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); - $row = mysqli_fetch_array($sql); + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql); - $new_invoice_amount = $row['invoice_amount'] + $total; + $new_invoice_amount = $row['invoice_amount'] + $total; - mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); - $_SESSION['alert_message'] = "Item added"; + $_SESSION['alert_message'] = "Item added"; - } - if(isset($_POST['invoice_note'])){ + header("Location: " . $_SERVER["HTTP_REFERER"]); - $invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note'])); +} - mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$invoice_note', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); +if(isset($_POST['invoice_note'])){ - $_SESSION['alert_message'] = "Notes added"; + $invoice_id = intval($_POST['invoice_id']); + $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note'])); - } + mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$note', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id"); + + $_SESSION['alert_message'] = "Notes added"; header("Location: " . $_SERVER["HTTP_REFERER"]); diff --git a/quote.php b/quote.php index 2dd5b650..6735c4dd 100644 --- a/quote.php +++ b/quote.php @@ -72,7 +72,7 @@ if(isset($_GET['quote_id'])){
- + Approve