diff --git a/add_invoice_payment_modal.php b/add_invoice_payment_modal.php new file mode 100644 index 00000000..3bd57086 --- /dev/null +++ b/add_invoice_payment_modal.php @@ -0,0 +1,88 @@ + \ No newline at end of file diff --git a/add_invoice_payment_model.php b/add_invoice_payment_model.php new file mode 100644 index 00000000..f3152361 --- /dev/null +++ b/add_invoice_payment_model.php @@ -0,0 +1,89 @@ + \ No newline at end of file diff --git a/categories.php b/categories.php index 7b5aa80a..c9c10d91 100644 --- a/categories.php +++ b/categories.php @@ -35,7 +35,7 @@
- Edit + Edit Delete
diff --git a/config.php b/config.php index 8b3831a8..a75bf694 100644 --- a/config.php +++ b/config.php @@ -82,7 +82,8 @@ $category_types_array = array( 'Expense', - 'Income' + 'Income', + 'Payment Method' ); ?> diff --git a/edit_category.php b/edit_category.php new file mode 100644 index 00000000..1b4f52bb --- /dev/null +++ b/edit_category.php @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/edit_category_modal.php b/edit_category_modal.php new file mode 100644 index 00000000..29477ae2 --- /dev/null +++ b/edit_category_modal.php @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/invoice.php b/invoice.php index cd90d7d2..ab29f554 100644 --- a/invoice.php +++ b/invoice.php @@ -20,7 +20,12 @@ if(isset($_GET['invoice_id'])){ $invoice_status = $row['invoice_status']; $invoice_date = $row['invoice_date']; $invoice_due = $row['invoice_due']; - $invoice_amount = $row['invoice_amount']; + $invoice_subtotal = $row['invoice_subtotal']; + $invoice_discount = $row['invoice_discount']; + $invoice_tax = $row['invoice_tax']; + $invoice_total = $row['invoice_total']; + $invoice_paid = $row['invoice_paid']; + $invoice_balance = $row['invoice_balance']; $client_id = $row['client_id']; $client_name = $row['client_name']; $client_address = $row['client_address']; @@ -34,6 +39,9 @@ if(isset($_GET['invoice_id'])){ } $client_website = $row['client_website']; + $sql2 = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id DESC"); + $sql3 = mysqli_query($mysqli,"SELECT * FROM invoice_payments, accounts WHERE invoice_payments.account_id = accounts.account_id AND invoice_payments.invoice_id = $invoice_id ORDER BY invoice_payments.invoice_payment_id DESC"); + ?>
@@ -51,7 +59,7 @@ if(isset($_GET['invoice_id'])){ Edit Copy Send Email - Add Payment + Add Payment Print Delete
@@ -101,7 +109,7 @@ if(isset($_GET['invoice_id'])){
- +
@@ -113,41 +121,38 @@ if(isset($_GET['invoice_id'])){ + - + - - + + @@ -169,27 +175,28 @@ if(isset($_GET['invoice_id'])){ - - + - + - - + + + + + + - - + - + -
Product Description Qty Price Tax Total
$ 0.00$ 0.00
SubTotal $
Discount$
Tax$$
Total $
@@ -246,6 +253,23 @@ if(isset($_GET['invoice_id'])){ + + + + + + + +
@@ -267,6 +291,25 @@ if(isset($_GET['invoice_id'])){ + + + + + + + +
@@ -274,6 +317,8 @@ if(isset($_GET['invoice_id'])){ + + INV- - $ + $ diff --git a/post.php b/post.php index 697fcdee..f0a92dca 100644 --- a/post.php +++ b/post.php @@ -268,13 +268,25 @@ if(isset($_POST['add_invoice_item'])){ $price = $_POST['price']; $tax = $_POST['tax']; - $sub_total = $price * $qty; - $tax = $sub_total * $tax; - $total = $sub_total + $tax; + $subtotal = $price * $qty; + $tax = $subtotal * $tax; + $total = $subtotal + $tax; - mysqli_query($mysqli,"INSERT INTO invoice_items SET invoice_item_name = '$name', invoice_item_description = '$description', invoice_item_quantity = $qty, invoice_item_price = '$price', invoice_item_tax = '$tax', invoice_item_total = '$total', invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO invoice_items SET invoice_item_name = '$name', invoice_item_description = '$description', invoice_item_quantity = $qty, invoice_item_price = '$price', invoice_item_subtotal = '$subtotal', invoice_item_tax = '$tax', invoice_item_total = '$total', invoice_id = $invoice_id"); - $_SESSION['alert_message'] = "Invoice added"; + //Update Invoice Balances + + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + + $invoice_subtotal = $row['invoice_subtotal'] + $subtotal; + $invoice_tax = $row['invoice_tax'] + $tax; + $invoice_total = $row['invoice_total'] + $total; + $invoice_balance = $row['invoice_balance'] + $total; + + mysqli_query($mysqli,"UPDATE invoices SET invoice_subtotal = '$invoice_subtotal', invoice_tax = '$invoice_tax', invoice_total = '$invoice_total', invoice_balance = '$invoice_balance' WHERE invoice_id = $invoice_id"); + + $_SESSION['alert_message'] = "Item added"; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -283,6 +295,22 @@ if(isset($_POST['add_invoice_item'])){ if(isset($_GET['delete_invoice_item'])){ $invoice_item_id = intval($_GET['delete_invoice_item']); + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_item_id = $invoice_item_id"); + $row = mysqli_fetch_array($sql); + $invoice_id = $row['invoice_id']; + $invoice_item_subtotal = $row['invoice_item_subtotal']; + $invoice_item_tax = $row['invoice_item_tax']; + $invoice_item_total = $row['invoice_item_total']; + + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $invoice_balance = $row['invoice_balance'] - $invoice_item_total; + $invoice_subtotal = $row['invoice_subtotal'] - $invoice_item_subtotal; + $invoice_tax = $row['invoice_tax'] - $invoice_item_tax; + $invoice_total = $row['invoice_total'] - $invoice_item_total; + + mysqli_query($mysqli,"UPDATE invoices SET invoice_subtotal = '$invoice_subtotal', invoice_tax = '$invoice_tax', invoice_total = '$invoice_total', invoice_balance = '$invoice_balance' WHERE invoice_id = $invoice_id"); + mysqli_query($mysqli,"DELETE FROM invoice_items WHERE invoice_item_id = $invoice_item_id"); $_SESSION['alert_message'] = "Item deleted"; @@ -291,6 +319,49 @@ if(isset($_GET['delete_invoice_item'])){ } +if(isset($_POST['add_invoice_payment'])){ + + $invoice_id = intval($_POST['invoice_id']); + $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date'])); + $amount = $_POST['amount']; + $account = intval($_POST['account']); + $payment_method = strip_tags(mysqli_real_escape_string($mysqli,$_POST['payment_method'])); + + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $invoice_balance = $row['invoice_balance'] - $amount; + $invoice_paid = $row['invoice_paid'] + $paid; + + mysqli_query($mysqli,"UPDATE invoices SET invoice_balance = '$invoice_balance', invoice_paid = '$invoice_paid' WHERE invoice_id = $invoice_id"); + + mysqli_query($mysqli,"INSERT INTO invoice_payments SET invoice_payment_date = '$date', invoice_payment_amount = '$amount', account_id = $account, invoice_payment_method = '$payment_method', invoice_id = $invoice_id"); + + $_SESSION['alert_message'] = "Payment added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_GET['delete_invoice_payment'])){ + $invoice_payment_id = intval($_GET['delete_invoice_payment']); + + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_payments WHERE invoice_payment_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $invoice_id = $row['invoice_id']; + $invoice_payment_amount = $row['invoice_payment_amount']; + + $invoice_balance = $row['invoice_balance'] - $invoice_payment_amount; + + mysqli_query($mysqli,"UPDATE invoices SET invoice_balance = '$invoice_balance' WHERE invoice_id = $invoice_id"); + + mysqli_query($mysqli,"DELETE FROM invoice_payments WHERE invoice_payment_id = $invoice_payment_id"); + + $_SESSION['alert_message'] = "Payment deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['add_user'])){ $email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])); $password = mysqli_real_escape_string($mysqli,$_POST['password']);