From cb5f1779c2a5782f9e9fe3a7c7eea6c313a5e826 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 5 Jan 2023 15:41:44 -0500
Subject: [PATCH] More modal UI Updates and Cleanups

---
 account_add_modal.php            |  4 +-
 product_add_modal.php            | 84 ++++++++++++++++++-------------
 product_edit_modal.php           | 85 +++++++++++++++++++-------------
 recurring_invoice_edit_modal.php |  2 +-
 revenue_add_modal.php            |  6 +--
 revenue_edit_modal.php           |  6 +--
 vendor_add_modal.php             |  4 +-
 vendor_edit_modal.php            |  4 +-
 vendors.php                      |  4 +-
 9 files changed, 115 insertions(+), 84 deletions(-)

diff --git a/account_add_modal.php b/account_add_modal.php
index 27fb4b2e..7ea25cf4 100644
--- a/account_add_modal.php
+++ b/account_add_modal.php
@@ -52,8 +52,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_account" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_account" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/product_add_modal.php b/product_add_modal.php
index f8a3fb4e..82d2b144 100644
--- a/product_add_modal.php
+++ b/product_add_modal.php
@@ -9,9 +9,15 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
-            <input type="text" class="form-control" name="name" placeholder="Product name" required autofocus>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" placeholder="Product name" required autofocus>
+            </div>
           </div>
           
           <div class="form-group">
@@ -21,7 +27,7 @@
                 <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
-                <option value="">- Category -</option>
+                <option value="">- Select Category -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id"); 
@@ -40,41 +46,51 @@
               </div>
             </div>
           </div>
+          
+          <div class="form-row">
+            <div class="col">
+              <div class="form-group">
+                <label>Price <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                  </div>
+                  <input type="number" step="0.01" min="0" class="form-control" name="price" placeholder="Price" required>
+                </div>
+              </div>
+            </div>
+            
+            <div class="col">
+              <div class="form-group">
+                <label>Tax</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                  </div>
+                  <select class="form-control select2" name="tax">
+                    <option value="0">None</option>
+                    <?php 
+                    
+                    $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_archived_at IS NULL AND company_id = $session_company_id ORDER BY tax_name ASC"); 
+                    while($row = mysqli_fetch_array($taxes_sql)){
+                      $tax_id = $row['tax_id'];
+                      $tax_name = htmlentities($row['tax_name']);
+                      $tax_percent = htmlentities($row['tax_percent']);
+                    ?>
+                      <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>        
+                </div>
+              </div>
+            </div>
+          </div>
 
           <div class="form-group">
             <label>Description</label>
-            <textarea class="form-control" name="description" placeholder="Product description"></textarea>
-          </div>
-          
-          <div class="form-group">
-            <label>Price <strong class="text-danger">*</strong></label>
-            <input type="number" step="0.01" min="0" class="form-control" name="price" placeholder="Price" required>
-          </div>
-
-          <div class="form-group">
-            <label>Tax</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-              </div>
-              <select class="form-control select2" name="tax">
-                <option value="0">None</option>
-                <?php 
-                
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_archived_at IS NULL AND company_id = $session_company_id ORDER BY tax_name ASC"); 
-                while($row = mysqli_fetch_array($taxes_sql)){
-                  $tax_id = $row['tax_id'];
-                  $tax_name = htmlentities($row['tax_name']);
-                  $tax_percent = htmlentities($row['tax_percent']);
-                ?>
-                  <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              
-            </div>
+            <textarea class="form-control" rows="8" name="description" placeholder="Product description"></textarea>
           </div>
         
         </div>
diff --git a/product_edit_modal.php b/product_edit_modal.php
index efdec2c9..19cbc702 100644
--- a/product_edit_modal.php
+++ b/product_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> <?php echo $product_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-box mr-2"></i><?php echo $product_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -10,9 +10,15 @@
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
         <div class="modal-body bg-white">
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
-            <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
+            </div>
           </div>
           
           <div class="form-group">
@@ -41,47 +47,56 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" name="description"><?php echo $product_description; ?></textarea>
-          </div>
-          
-          <div class="form-group">
-            <label>Price <strong class="text-danger">*</strong></label>
-            <input type="number" step="0.01" min="0" class="form-control" name="price" value="<?php echo $product_price; ?>" required>
+          <div class="form-row">
+            <div class="col">
+              <div class="form-group">
+                <label>Price <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                  </div>
+                  <input type="number" step="0.01" min="0" class="form-control" name="price" value="<?php echo $product_price; ?>" required>
+                </div>
+              </div>
+            </div>
+            <div class="col">
+              <div class="form-group">
+                <label>Tax</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                  </div>
+                  <select class="form-control select2" name="tax">
+                    <option value="0">None</option>
+                    <?php 
+                    
+                    $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$product_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
+                    while($row = mysqli_fetch_array($taxes_sql)){
+                      $tax_id_select = $row['tax_id'];
+                      $tax_name = htmlentities($row['tax_name']);
+                      $tax_percent = htmlentities($row['tax_percent']);
+                    ?>
+                      <option <?php if($tax_id_select == $product_tax_id){ echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+            </div>
           </div>
 
           <div class="form-group">
-            <label>Tax</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-              </div>
-              <select class="form-control select2" name="tax">
-                <option value="0">None</option>
-                <?php 
-                
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$product_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
-                while($row = mysqli_fetch_array($taxes_sql)){
-                  $tax_id_select = $row['tax_id'];
-                  $tax_name = htmlentities($row['tax_name']);
-                  $tax_percent = htmlentities($row['tax_percent']);
-                ?>
-                  <option <?php if($tax_id_select == $product_tax_id){ echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              
-            </div>
+            <label>Description</label>
+            <textarea class="form-control" rows="8" name="description"><?php echo $product_description; ?></textarea>
           </div>
         
         </div>
         
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_product" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_product" class="btn btn-primary"><strong><i class="fa fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php
index 24f65f79..1d033818 100644
--- a/recurring_invoice_edit_modal.php
+++ b/recurring_invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-sync-alt"></i> <?php echo "$recurring_prefix$recurring_number"; ?></h5>
+        <h5 class="modal-title"><i class="fas fa-sync-alt mr-2"></i><?php echo "$recurring_prefix$recurring_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/revenue_add_modal.php b/revenue_add_modal.php
index cdc4778f..6447822a 100644
--- a/revenue_add_modal.php
+++ b/revenue_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt"></i> Add Revenue</h5>
+        <h5 class="modal-title"><i class="fas fa-money-bill-alt mr-2"></i>New Revenue</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -164,8 +164,8 @@
   
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_revenue" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Add Revenue</strong></button>
         </div>
       </form>
     </div>
diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php
index 7ed40d57..5f6e3a5d 100644
--- a/revenue_edit_modal.php
+++ b/revenue_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt"></i> Edit Revenue</h5>
+        <h5 class="modal-title"><i class="fas fa-money-bill-alt mr-2"></i>Edit Revenue</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -165,8 +165,8 @@
   
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_revenue" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/vendor_add_modal.php b/vendor_add_modal.php
index e219bf82..ad75bd4f 100644
--- a/vendor_add_modal.php
+++ b/vendor_add_modal.php
@@ -157,8 +157,8 @@
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_vendor" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_vendor" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create Vendor</button>
         </div>
       </form>
     </div>
diff --git a/vendor_edit_modal.php b/vendor_edit_modal.php
index f12143a4..520ea17a 100644
--- a/vendor_edit_modal.php
+++ b/vendor_edit_modal.php
@@ -155,8 +155,8 @@
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_vendor" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_vendor" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/vendors.php b/vendors.php
index 502320a5..c1af5354 100644
--- a/vendors.php
+++ b/vendors.php
@@ -124,7 +124,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           ?>
 
           <tr>
-            <td>
+            <th>
               <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?><a>
               <?php
               if(!empty($vendor_account_number)){
@@ -135,7 +135,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               }
               ?>
 
-            </td>
+            </th>
             <td><?php echo $vendor_description_display; ?></td>
             <td>
               <?php