From 0fc29c0271191c04027876ba7adc24a3530ee7cb Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Apr 2019 17:45:52 -0400 Subject: [PATCH] Cleaned up UI a bit invoice, side_menu, client, started working on bank transfers --- add_client_modal.php | 2 +- add_expense_copy_modal.php | 2 +- add_expense_refund_modal.php | 2 +- add_invoice_payment_modal.php | 2 +- client.php | 88 +++++++++----- client_contacts.php | 5 +- client_details.php | 23 ---- client_nav.php | 38 +++--- client_routes.php | 7 +- clients.php | 16 +-- edit_invoice.php | 66 ----------- invoice.php | 217 +++++++++++++++++----------------- invoices.php | 5 +- post.php | 40 +++++-- side_nav.php | 24 ++-- top_nav.php | 6 +- 16 files changed, 245 insertions(+), 298 deletions(-) delete mode 100644 client_details.php delete mode 100644 edit_invoice.php diff --git a/add_client_modal.php b/add_client_modal.php index a5621593..1f4ede4f 100644 --- a/add_client_modal.php +++ b/add_client_modal.php @@ -1,4 +1,4 @@ - diff --git a/client.php b/client.php index b4b0a3ef..c2c306f3 100644 --- a/client.php +++ b/client.php @@ -44,36 +44,70 @@ if(isset($_GET['client_id'])){ $num_notes = $row['num']; ?> -
-
-

-
-
-
- -
- New Contact - New Location - New Asset - New Vendor - New Login - New Network - New Domain - New Application - New Invoice - New Quote - New Attachment - New Note -
- Print - Edit - Delete + +
    +
  1. + Clients +
    2. +
    3. +
+ +
+
+
+
+

+
+
+

Address

+ " target="_blank"> + +
+ + +
+
+

Contact

+ +
+ +
+ +
+
+

Standings

+
Paid to Date $0.00 +
Balance $0.00 +
+
+
+ +
+ New Contact + New Location + New Asset + New Vendor + New Login + New Network + New Domain + New Application + New Invoice + New Quote + New Attachment + New Note +
+ Print + Edit + Delete +
+
-
+
+
diff --git a/client_contacts.php b/client_contacts.php index 64af87dc..dfef7b21 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -6,8 +6,8 @@ Name Title - Phone Email + Phone Actions @@ -28,8 +28,9 @@ - + +
-
-
+ +
+
Notes
-
+

+
+ + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + + + + + +
Subtotal$
Discount$
Tax$
Paid to Date
$
Balance Due$
+
+
+ +
diff --git a/invoices.php b/invoices.php index a6746abb..760a3e17 100644 --- a/invoices.php +++ b/invoices.php @@ -42,9 +42,6 @@ $unixtime_invoice_due = strtotime($invoice_due); if($unixtime_invoice_due < time()){ $overdue_color = "text-danger"; - $invoice_status = "Overdue"; - }else{ - $overdue_color = "text-success"; } if($invoice_status == "Sent"){ @@ -89,7 +86,7 @@ $invoice_balance){ + $_SESSION['alert_message'] = "Payment is more than the balance"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + }else{ - $invoice_status = "Partial"; - } + + //Determine if invoice has been paid then set the status accordingly + if($invoice_balance == 0){ + $invoice_status = "Paid"; + }else{ + $invoice_status = "Partial"; + } - //Update Invoice Status - mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); + //Update Invoice Status + 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"); - - $_SESSION['alert_message'] = "Payment added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); + //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"); + $_SESSION['alert_message'] = "Payment added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + } } if(isset($_POST['edit_invoice_note'])){ diff --git a/side_nav.php b/side_nav.php index 17776311..104ddb51 100644 --- a/side_nav.php +++ b/side_nav.php @@ -1,61 +1,61 @@