From 9c92974edb9c41d3bd97cc39c2ebf729c5d6a78b Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Wed, 20 Jan 2021 12:40:02 -0500
Subject: [PATCH] Moved Country in Settings to bottom and add
 config_company_country var to get_settings.php

---
 get_settings.php     |  1 +
 settings-company.php | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/get_settings.php b/get_settings.php
index 53d4ce90..45a32cd7 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -15,6 +15,7 @@ $config_company_phone = $row['config_company_phone'];
 if(strlen($config_company_phone)>2){ 
   $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
 }
+$config_company_country = $row['config_company_country'];
 $config_company_site = $row['config_company_site'];
 
 $config_quote_footer = $row['config_quote_footer'];
diff --git a/settings-company.php b/settings-company.php
index bb7b4c04..6ecbf31a 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -17,21 +17,6 @@
           <input type="text" class="form-control" name="config_company_name" placeholder="Company Name" value="<?php echo $config_company_name; ?>" required>  
         </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="config_company_country">
-            <option value="">- Country -</option>
-            <?php foreach($countries_array as $country_name) { ?>
-            <option <?php if($config_company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-            <?php } ?>
-          </select>
-        </div>
-      </div>
 
       <div class="form-group">
         <label>Address</label>
@@ -88,6 +73,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="config_company_country">
+            <option value="">- Country -</option>
+            <?php foreach($countries_array as $country_name) { ?>
+            <option <?php if($config_company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+            <?php } ?>
+          </select>
+        </div>
+      </div>
+
       <div class="form-group">
         <label>Website</label>
         <div class="input-group">