From c748388b9aa8efaa83a9f17111caebf0d05e5e63 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Tue, 9 Feb 2021 12:56:37 -0500
Subject: [PATCH] Updated Add and Edit Revenue Modal UI

---
 add_revenue_modal.php  | 228 ++++++++++++++++++++++-------------------
 edit_revenue_modal.php | 224 +++++++++++++++++++++-------------------
 2 files changed, 238 insertions(+), 214 deletions(-)

diff --git a/add_revenue_modal.php b/add_revenue_modal.php
index 11875e81..0d7ccad4 100644
--- a/add_revenue_modal.php
+++ b/add_revenue_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="addRevenueModal" tabindex="-1">
-  <div class="modal-dialog">
+  <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>
@@ -10,130 +10,142 @@
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
           
-          <div class="form-group">
-            <label>Date <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-calendar"></i></span>
+          <div class="form-row">
+            
+            <div class="form-group col-md">
+              <label>Date <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-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
+              </div>
+            </div>
+            
+            <div class="form-group col-md">
+              <label>Amount <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" class="form-control" step="0.01" min="0.00" name="amount" required>
               </div>
-              <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
             </div>
-          </div>
           
-          <div class="form-group">
-            <label>Amount <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" class="form-control" step="0.01" min="0.00" name="amount" required>
-            </div>
           </div>
 
-          <div class="form-group">
-            <label>Account <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-piggy-bank"></i></span>
-              </div> 
-              <select class="form-control select2" name="account" required>
-                <option value="">- Account -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
-                  while($row = mysqli_fetch_array($sql)){
-                    $account_id = $row['account_id'];
-                    $account_name = $row['account_name'];
-                    $opening_balance = $row['opening_balance'];
-                    
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_revenues);
-                    $total_revenues = $row['total_revenues'];
+          <div class="form-row">
 
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
-
-                    $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+            <div class="form-group col-md">
+              <label>Account <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-piggy-bank"></i></span>
+                </div> 
+                <select class="form-control select2" name="account" required>
+                  <option value="">- Account -</option>
+                  <?php 
                   
-                ?>
-                  <option <?php if($config_default_payment_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-        
-          <div class="form-group">
-            <label>Category <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-money-check-alt"></i></span>
-              </div> 
-              <select class="form-control select2" name="category" required>
-                <option value="">- 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 ORDER BY category_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $category_id = $row['category_id'];
-                  $category_name = $row['category_name'];
-                ?>
-                  <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $account_id = $row['account_id'];
+                      $account_name = $row['account_name'];
+                      $opening_balance = $row['opening_balance'];
+                      
+                      $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
+                      $row = mysqli_fetch_array($sql_payments);
+                      $total_payments = $row['total_payments'];
+                      
+                      $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE account_id = $account_id");
+                      $row = mysqli_fetch_array($sql_revenues);
+                      $total_revenues = $row['total_revenues'];
+
+                      $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
+                      $row = mysqli_fetch_array($sql_expenses);
+                      $total_expenses = $row['total_expenses'];
+
+                      $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+                    
+                  ?>
+                    <option <?php if($config_default_payment_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                  
+                  <?php
+                  }
+                  ?>
+                </select>
               </div>
             </div>
-          </div>
-
-          <div class="form-group">
-            <label>Payment Method <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-money-check-alt"></i></span>
-              </div> 
-              <select class="form-control select2" name="payment_method" required>
-                <option value="">- Method of Payment -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $category_name = $row['category_name'];
-                ?>
-                  <option><?php echo "$category_name"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Reference</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+          
+            <div class="form-group col-md">
+              <label>Category <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-money-check-alt"></i></span>
+                </div> 
+                <select class="form-control select2" name="category" required>
+                  <option value="">- 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 ORDER BY category_name ASC"); 
+                  while($row = mysqli_fetch_array($sql)){
+                    $category_id = $row['category_id'];
+                    $category_name = $row['category_name'];
+                  ?>
+                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                  
+                  <?php
+                  }
+                  ?>
+                </select>
+                <div class="input-group-append">
+                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                </div>
               </div>
-              <input type="text" class="form-control" name="reference" placeholder="Enter a reference">
             </div>
+
           </div>
 
           <div class="form-group">
             <label>Description</label>
             <textarea class="form-control" rows="4" name="description"></textarea>
           </div>
+
+          <div class="form-row">
+
+            <div class="form-group col-md">
+              <label>Payment Method <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-money-check-alt"></i></span>
+                </div> 
+                <select class="form-control select2" name="payment_method" required>
+                  <option value="">- Method of Payment -</option>
+                  <?php 
+                  
+                  $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                  while($row = mysqli_fetch_array($sql)){
+                    $category_name = $row['category_name'];
+                  ?>
+                    <option><?php echo "$category_name"; ?></option>
+                  
+                  <?php
+                  }
+                  ?>
+                </select>
+              </div>
+            </div>
+
+            <div class="form-group col-md">
+              <label>Reference</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="reference" placeholder="Enter a reference">
+              </div>
+            </div>
+
+          </div>
   
         </div>
         <div class="modal-footer bg-white">
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index b97e06b7..b669a757 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="editRevenueModal<?php echo $revenue_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
+  <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>
@@ -11,130 +11,142 @@
         <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
         <div class="modal-body bg-white">
           
-          <div class="form-group">
-            <label>Date <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-calendar"></i></span>
+          <div class="form-row">
+
+            <div class="form-group col-md">
+              <label>Date <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-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" value="<?php echo $revenue_date; ?>" required>
               </div>
-              <input type="date" class="form-control" name="date" value="<?php echo $revenue_date; ?>" required>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Amount <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 class="form-group col-md">
+              <label>Amount <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" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $revenue_amount; ?>" required>
               </div>
-              <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $revenue_amount; ?>" required>
             </div>
+
           </div>
 
-          <div class="form-group">
-            <label>Account <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-piggy-bank"></i></span>
-              </div> 
-              <select class="form-control select2" name="account" required>
-                <option value="">- Account -</option>
-                <?php 
-                
-                $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id  ORDER BY account_name ASC");
-                while($row = mysqli_fetch_array($sql_accounts)){
-                  $account_id_select = $row['account_id'];
-                  $account_name_select = $row['account_name'];
-                  $opening_balance = $row['opening_balance'];
+          <div class="form-row">
+
+            <div class="form-group col-md">
+              <label>Account <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-piggy-bank"></i></span>
+                </div> 
+                <select class="form-control select2" name="account" required>
+                  <option value="">- Account -</option>
+                  <?php 
                   
-                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id_select");
-                  $row = mysqli_fetch_array($sql_payments);
-                  $total_payments = $row['total_payments'];
+                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id  ORDER BY account_name ASC");
+                  while($row = mysqli_fetch_array($sql_accounts)){
+                    $account_id_select = $row['account_id'];
+                    $account_name_select = $row['account_name'];
+                    $opening_balance = $row['opening_balance'];
+                    
+                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id_select");
+                    $row = mysqli_fetch_array($sql_payments);
+                    $total_payments = $row['total_payments'];
+                    
+                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE account_id = $account_id_select");
+                    $row = mysqli_fetch_array($sql_revenues);
+                    $total_revenues = $row['total_revenues'];
+
+                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id_select");
+                    $row = mysqli_fetch_array($sql_expenses);
+                    $total_expenses = $row['total_expenses'];
+
+                    $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+                    
+                  ?>
+                    <option <?php if($account_id == $account_id_select){ echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
                   
-                  $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE account_id = $account_id_select");
-                  $row = mysqli_fetch_array($sql_revenues);
-                  $total_revenues = $row['total_revenues'];
-
-                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id_select");
-                  $row = mysqli_fetch_array($sql_expenses);
-                  $total_expenses = $row['total_expenses'];
-
-                  $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-                  
-                ?>
-                  <option <?php if($account_id == $account_id_select){ echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Category <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-money-check-alt"></i></span>
-              </div> 
-              <select class="form-control select2" name="category" required>
-                <option value="">- Category -</option>
-                <?php 
-                
-                $sql_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                while($row = mysqli_fetch_array($sql_category)){
-                  $category_id_select = $row['category_id'];
-                  $category_name = $row['category_name'];
-                ?>
-                  <option <?php if($category_id_select == $category_id){ echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                  <?php
+                  }
+                  ?>
+                </select>
               </div>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Payment Method <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-money-check-alt"></i></span>
-              </div> 
-              <select class="form-control select2" name="payment_method" required>
-                <option value="">- Method of Payment -</option>
-                <?php 
-                
-                $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                while($row = mysqli_fetch_array($sql_categories)){
-                  $category_name_select = $row['category_name'];
-                ?>
-                  <option <?php if($revenue_payment_method == $category_name_select){ echo "selected"; } ?>><?php echo "$category_name_select"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Reference</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+            <div class="form-group col-md">
+              <label>Category <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-money-check-alt"></i></span>
+                </div> 
+                <select class="form-control select2" name="category" required>
+                  <option value="">- Category -</option>
+                  <?php 
+                  
+                  $sql_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                  while($row = mysqli_fetch_array($sql_category)){
+                    $category_id_select = $row['category_id'];
+                    $category_name = $row['category_name'];
+                  ?>
+                    <option <?php if($category_id_select == $category_id){ echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
+                  
+                  <?php
+                  }
+                  ?>
+                </select>
+                <div class="input-group-append">
+                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                </div>
               </div>
-              <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $revenue_reference; ?>">
             </div>
+
           </div>
 
           <div class="form-group">
             <label>Description</label>
             <textarea class="form-control" rows="4" name="description"><?php echo $revenue_description; ?></textarea>
           </div>
+
+          <div class="form-row">
+          
+            <div class="form-group col-md">
+              <label>Payment Method <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-money-check-alt"></i></span>
+                </div> 
+                <select class="form-control select2" name="payment_method" required>
+                  <option value="">- Method of Payment -</option>
+                  <?php 
+                  
+                  $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                  while($row = mysqli_fetch_array($sql_categories)){
+                    $category_name_select = $row['category_name'];
+                  ?>
+                    <option <?php if($revenue_payment_method == $category_name_select){ echo "selected"; } ?>><?php echo "$category_name_select"; ?></option>
+                  
+                  <?php
+                  }
+                  ?>
+                </select>
+              </div>
+            </div>
+
+            <div class="form-group col-md">
+              <label>Reference</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $revenue_reference; ?>">
+              </div>
+            </div>
+
+          </div>
   
         </div>
         <div class="modal-footer bg-white">