From ba863cc86f24d1204fa0a7c831ab3d811ee2631e Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Sat, 4 Apr 2020 22:57:37 -0400
Subject: [PATCH] Sort dropdowns in add/edit/copy expenses alphabetically

---
 add_expense_copy_modal.php | 6 +++---
 add_expense_modal.php      | 4 ++--
 edit_expense_modal.php     | 4 ++--
 invoices.php               | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/add_expense_copy_modal.php b/add_expense_copy_modal.php
index f8dbcb1a..214cd90c 100644
--- a/add_expense_copy_modal.php
+++ b/add_expense_copy_modal.php
@@ -44,7 +44,7 @@
                 <select class="form-control select2" name="account" required>
                   <?php 
                   
-                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
+                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE 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'];
@@ -82,7 +82,7 @@
                 <select class="form-control select2" name="vendor" required>
                   <?php 
                   
-                  $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id"); 
+                  $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id ORDER BY vendor_name ASC"); 
                   while($row = mysqli_fetch_array($sql_vendors)){
                     $vendor_id_select = $row['vendor_id'];
                     $vendor_name_select = $row['vendor_name'];
@@ -114,7 +114,7 @@
                 <select class="form-control select2" name="category" required>
                   <?php 
                   
-                  $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id"); 
+                  $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC"); 
                   while($row = mysqli_fetch_array($sql_categories)){
                     $category_id_select = $row['category_id'];
                     $category_name_select = $row['category_name'];
diff --git a/add_expense_modal.php b/add_expense_modal.php
index 4c03e55d..d1dab453 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -43,7 +43,7 @@
                   <option value="">- Account -</option>
                   <?php 
                   
-                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
+                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE 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'];
@@ -115,7 +115,7 @@
                   <option value="">- Category -</option>
                   <?php 
                   
-                  $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id"); 
+                  $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' 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'];
diff --git a/edit_expense_modal.php b/edit_expense_modal.php
index b2c9dc7e..21de6538 100644
--- a/edit_expense_modal.php
+++ b/edit_expense_modal.php
@@ -46,7 +46,7 @@
                 <select class="form-control select2" name="account" required>
                   <?php 
                   
-                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
+                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE 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'];
@@ -117,7 +117,7 @@
                 <select class="form-control select2" name="category" required>
                   <?php 
                   
-                  $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id"); 
+                  $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC"); 
                   while($row = mysqli_fetch_array($sql_select)){
                     $category_id_select = $row['category_id'];
                     $category_name_select = $row['category_name'];
diff --git a/invoices.php b/invoices.php
index 15d15284..f833b4d2 100644
--- a/invoices.php
+++ b/invoices.php
@@ -114,7 +114,7 @@
 ?>
 
 <div class="row">
-  <div class="col-lg-3 col-6">
+  <div class="col-lg-3">
     <!-- small box -->
     <a href="?q=Draft" class="small-box bg-secondary">
       <div class="inner">
@@ -128,7 +128,7 @@
   </div>
   <!-- ./col -->
 
-  <div class="col-lg-3 col-6">
+  <div class="col-lg-3">
     <!-- small box -->
     <a href="?q=Sent" class="small-box bg-warning">
       <div class="inner text-white">
@@ -142,7 +142,7 @@
   </div>
   <!-- ./col -->
 
-  <div class="col-lg-3 col-6">
+  <div class="col-lg-3">
     <!-- small box -->
     <a href="?q=Viewed" class="small-box bg-info">
       <div class="inner">
@@ -156,7 +156,7 @@
   </div>
   <!-- ./col -->
 
-  <div class="col-lg-3 col-6">
+  <div class="col-lg-3">
     <!-- small box -->
     <a href="?q=Partial" class="small-box bg-primary">
       <div class="inner">