From 76709bdadaa6c5337ebbc408dd6eb9692be03d82 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Sat, 4 Apr 2020 23:16:11 -0400
Subject: [PATCH] sorted more dropdowns alphabetically and fixed issue in edit
 trip where it would list all clients from all companies

---
 add_invoice_modal.php   | 4 ++--
 add_recurring_modal.php | 4 ++--
 add_revenue_modal.php   | 6 +++---
 add_trip_copy_modal.php | 2 +-
 add_trip_modal.php      | 2 +-
 edit_invoice_modal.php  | 2 +-
 edit_revenue_modal.php  | 4 ++--
 edit_trip_modal.php     | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index d79cef4d..a48e9c89 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -24,7 +24,7 @@
                 <option value="">- Client -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
@@ -70,7 +70,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' 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/add_recurring_modal.php b/add_recurring_modal.php
index a67c4b0b..15f3505c 100644
--- a/add_recurring_modal.php
+++ b/add_recurring_modal.php
@@ -24,7 +24,7 @@
                 <option value="">- Client -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
@@ -76,7 +76,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' 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/add_revenue_modal.php b/add_revenue_modal.php
index 5186f96d..a2b405f3 100644
--- a/add_revenue_modal.php
+++ b/add_revenue_modal.php
@@ -40,7 +40,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'];
@@ -80,7 +80,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' 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'];
@@ -104,7 +104,7 @@
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $category_name = $row['category_name'];
                 ?>
diff --git a/add_trip_copy_modal.php b/add_trip_copy_modal.php
index ee471693..0f4637ba 100644
--- a/add_trip_copy_modal.php
+++ b/add_trip_copy_modal.php
@@ -92,7 +92,7 @@
                     <option value="">- Client -</option>
                     <?php 
                     
-                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); 
+                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
                     while($row = mysqli_fetch_array($sql_clients)){
                       $client_id_select = $row['client_id'];
                       $client_name_select = $row['client_name'];
diff --git a/add_trip_modal.php b/add_trip_modal.php
index ef77053b..ec4634e4 100644
--- a/add_trip_modal.php
+++ b/add_trip_modal.php
@@ -85,7 +85,7 @@
                     <option value="">- Client -</option>
                     <?php 
                     
-                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); 
+                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
                     while($row = mysqli_fetch_array($sql)){
                       $client_id = $row['client_id'];
                       $client_name = $row['client_name'];
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php
index b3e9002d..7bd6d83e 100644
--- a/edit_invoice_modal.php
+++ b/edit_invoice_modal.php
@@ -42,7 +42,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while($row = mysqli_fetch_array($sql_income_category)){
                   $category_id_select= $row['category_id'];
                   $category_name_select = $row['category_name'];
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index 7d6fe2b4..27b5eab6 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -41,7 +41,7 @@
                 <option value="">- Account -</option>
                 <?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'];
@@ -81,7 +81,7 @@
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
-                $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id"); 
+                $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while($row = mysqli_fetch_array($sql_categories)){
                   $category_name_select = $row['category_name'];
                 ?>
diff --git a/edit_trip_modal.php b/edit_trip_modal.php
index f9e8e5da..cb632f63 100644
--- a/edit_trip_modal.php
+++ b/edit_trip_modal.php
@@ -93,7 +93,7 @@
                     <option value="">- Client -</option>
                     <?php 
                     
-                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients"); 
+                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                     while($row = mysqli_fetch_array($sql_clients)){
                       $client_id_select = $row['client_id'];
                       $client_name_select = $row['client_name'];