From b76c009d30e31b688c61fad8d04feadb5401f064 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Wed, 20 Jan 2021 12:48:30 -0500
Subject: [PATCH] Moved country to last row of address in add and edit company

---
 add_company_modal.php  | 30 +++++++++++++++---------------
 edit_company_modal.php | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/add_company_modal.php b/add_company_modal.php
index ebfca29d..c851a5d2 100644
--- a/add_company_modal.php
+++ b/add_company_modal.php
@@ -20,21 +20,6 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label>Country</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-              </div>
-              <select class="form-control select2" name="country">
-                <option value="">- Country -</option>
-                <?php foreach($countries_array as $country_name) { ?>
-                <option><?php echo $country_name; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
-
           <div class="form-group">
             <label>Address</label>
             <div class="input-group">
@@ -80,6 +65,21 @@
             </div>
           </div>
 
+          <div class="form-group">
+            <label>Country</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+              </div>
+              <select class="form-control select2" name="country">
+                <option value="">- Country -</option>
+                <?php foreach($countries_array as $country_name) { ?>
+                <option><?php echo $country_name; ?></option>
+                <?php } ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Phone</label>
             <div class="input-group">
diff --git a/edit_company_modal.php b/edit_company_modal.php
index 9805ecb9..6cd35a23 100644
--- a/edit_company_modal.php
+++ b/edit_company_modal.php
@@ -21,21 +21,6 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label>Country</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-              </div>
-              <select class="form-control select2" name="country">
-                <option value="">- Country -</option>
-                <?php foreach($countries_array as $country_name) { ?>
-                <option <?php if($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
-
           <div class="form-group">
             <label>Address</label>
             <div class="input-group">
@@ -81,6 +66,21 @@
             </div>
           </div>
 
+          <div class="form-group">
+            <label>Country</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+              </div>
+              <select class="form-control select2" name="country">
+                <option value="">- Country -</option>
+                <?php foreach($countries_array as $country_name) { ?>
+                <option <?php if($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                <?php } ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Phone</label>
             <div class="input-group">