From abd5396ae090212c51b99cf8ca7d2c2b9cd0a400 Mon Sep 17 00:00:00 2001
From: root <root@pittpc-crm.localDomain>
Date: Mon, 18 Mar 2019 20:13:24 -0400
Subject: [PATCH] tidying up

---
 README.md                    | 24 ++++++++++++++++++++----
 add_account_modal.php        | 30 ++++++++++++++----------------
 add_client_contact_modal.php | 35 ++++++++++++++++++-----------------
 client.php                   | 17 +++++++++++++++++
 client_nav.php               |  5 ++++-
 side_nav.php                 | 16 +++++-----------
 6 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index d5f1ee8b..0be6d3c7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,22 @@
+## CRM
+### Features
+* Manage Clients
+  * Contacts
+  * Locations
+  * Assets
+  * Licenses
+  * Logins
+  * Files
+  * Technical Notes
+* Invoicing
+* Quotes / Estimates
+* Accounting
+  * P&L Reports
+  * Income Expense Summary
+  * Mileage Tracking
 
-## PittPC
-Manage Clients, Invoices and Accounting for a small IT Company
 
-## Technologies Used
-PHP/MySQL, Bootstrap (SBAdmin), Datatables, Jquery
\ No newline at end of file
+### Technologies Used
+* PHP/MySQL
+* SB Admin Bootstrap CSS Framework
+* Jquery
diff --git a/add_account_modal.php b/add_account_modal.php
index 3e3c6c48..e9c1f4d0 100644
--- a/add_account_modal.php
+++ b/add_account_modal.php
@@ -1,5 +1,5 @@
 <div class="modal fade" id="addAccountModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
+  <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title"><i class="fa fa-piggy-bank"></i> New Account</h5>
@@ -9,24 +9,22 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body">
-          <div class="form-row">
-            <div class="form-group col-sm-8">
-              <label>Account Name</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
-                </div>
-                <input type="text" class="form-control" name="name" placeholder="Account name" required>
+          <div class="form-group">
+            <label>Account Name</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-university"></i></span>
               </div>
+              <input type="text" class="form-control" name="name" placeholder="Account name" required>
             </div>
-            <div class="form-group col-sm-4">
-              <label>Opening Balance</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-hand-holding-usd"></i></span>
-                </div>
-                <input type="number" class="form-control" step="0.01" min="0" name="opening_balance" placeholder="Opening Balance" required>
+          </div>
+          <div class="form-group">
+            <label>Opening Balance</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
               </div>
+              <input type="number" class="form-control" step="0.01" min="0" name="opening_balance" placeholder="Opening Balance" required>
             </div>
           </div>
         </div>
diff --git a/add_client_contact_modal.php b/add_client_contact_modal.php
index 1065a239..c116d7b3 100644
--- a/add_client_contact_modal.php
+++ b/add_client_contact_modal.php
@@ -1,5 +1,5 @@
 <div class="modal fade" id="addClientContactModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
+  <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title"><i class="fa fa-user-plus"></i> New Contact</h5>
@@ -9,7 +9,7 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body">    
           <div class="form-group">
             <label>Name</label>
             <div class="input-group">
@@ -19,6 +19,7 @@
               <input type="text" class="form-control" name="name" placeholder="Full Name" required>
             </div>
           </div>
+          
           <div class="form-group">
             <label>Title</label>
             <div class="input-group">
@@ -28,24 +29,24 @@
               <input type="text" class="form-control" name="title" placeholder="Title" required>
             </div>
           </div>
-          <div class="form-row">
-            <div class="form-group col-sm">
-              <label>Phone</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-phone"></i></span>
-                </div>
-                <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" required> 
+        
+          <div class="form-group">
+            <label>Phone</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-phone"></i></span>
               </div>
+              <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" required> 
             </div>
-            <div class="form-group col-sm">
-              <label>Email</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-envelope"></i></span>
-                </div>
-                <input type="email" class="form-control" name="email" placeholder="Email Address" required>
+          </div>
+
+          <div class="form-group">
+            <label>Email</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-envelope"></i></span>
               </div>
+              <input type="email" class="form-control" name="email" placeholder="Email Address" required>
             </div>
           </div>
         </div>
diff --git a/client.php b/client.php
index 44ca6bb6..4ff4b931 100644
--- a/client.php
+++ b/client.php
@@ -20,6 +20,23 @@ if(isset($_GET['client_id'])){
   }
   $client_website = $row['client_website'];
 
+  //Badge Counts
+
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_contact_id') AS num FROM client_contacts WHERE client_id = $client_id"));
+  $num_contacts = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_location_id') AS num FROM client_locations WHERE client_id = $client_id"));
+  $num_locations = $row['num'];
+  $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('client_vendor_id') AS num FROM client_vendors WHERE client_id = $client_id"));
+  $num_vendors = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_login_id') AS num FROM client_logins WHERE client_id = $client_id"));
+  $num_logins = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE client_id = $client_id"));
+  $num_invoices = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_note_id') AS num FROM client_notes WHERE client_id = $client_id"));
+  $num_notes = $row['num'];
+
 ?>
 <div class="row">
   <div class="col-8">
diff --git a/client_nav.php b/client_nav.php
index 71c723d4..79a4eb50 100644
--- a/client_nav.php
+++ b/client_nav.php
@@ -3,7 +3,10 @@
     <a class="nav-link active" href="?client_id=<?php echo $client_id; ?>&tab=details">Details</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=contacts">Contacts</a>
+    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=contacts">
+      Contacts
+      <span class="badge badge-pill badge-dark"><?php echo $num_contacts; ?></span>
+    </a> 
   </li>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=locations">Locations</a>
diff --git a/side_nav.php b/side_nav.php
index 92cdea47..347812bb 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -11,12 +11,6 @@
       <i class="fas fa-fw fa-users"></i>
       <span>Clients</span></a>
   </li>
-  <li class="nav-item">
-    <a class="nav-link" href="assets.php">
-      <i class="fas fa-fw fa-laptop"></i>
-      <span>Assets</span>
-    </a>
-  </li>
   <li class="nav-item">
     <a class="nav-link" href="vendors.php">
       <i class="fas fa-fw fa-briefcase"></i>
@@ -65,10 +59,10 @@
       <span>Reports</span>
     </a>
     <div class="dropdown-menu" aria-labelledby="pagesDropdown">
-      <a class="dropdown-item" href="register.html">Income Summary</a>
-      <a class="dropdown-item" href="forgot-password.html">Expense Summary</a>
-      <a class="dropdown-item" href="forgot-password.html">Income vs Expense</a>
-      <a class="dropdown-item" href="login.html">Profit & Loss</a>
+      <a class="dropdown-item" href="report_expense_income_summary.php">Income Summary</a>
+      <a class="dropdown-item" href="report_expense_summary.php">Expense Summary</a>
+      <a class="dropdown-item" href="report_income_vs_expense.php">Income vs Expense</a>
+      <a class="dropdown-item" href="report_profit_loss.php">Profit & Loss</a>
     </div>
   </li>
 
@@ -80,7 +74,7 @@
     <div class="dropdown-menu" aria-labelledby="pagesDropdown">
       <a class="dropdown-item" href="settings-general.php">General</a>
       <a class="dropdown-item" href="categories.php">Categories</a>
-      <a class="dropdown-item" href="forgot-password.html">Users</a>
+      <a class="dropdown-item" href="users.php">Users</a>
     </div>
   </li>
 </ul>
\ No newline at end of file