From e47b4628a0538693657ce1dd45e05baa5d082ab6 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 5 Jul 2017 23:05:17 -0500
Subject: [PATCH] read in a local.conf.php in the root for overrides

---
 app/Providers/AppServiceProvider.php | 11 +++++++++--
 config/enums.php                     |  5 ++++-
 config/phpvms.php                    | 12 ++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d414b185..4a2905b4 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,7 +4,6 @@ namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
-use App\Services\AircraftService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -15,7 +14,15 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        # if there's a local.conf.php in the root, then merge that in
+        if(file_exists(base_path('local.conf.php'))) {
+            $local_conf = include(base_path('local.conf.php'));
+            $config = $this->app['config']->get('phpvms', []);
+            $this->app['config']->set(
+                'phpvms',
+                array_merge($config, $local_conf)
+            );
+        }
     }
 
     /**
diff --git a/config/enums.php b/config/enums.php
index 6f4b6ef2..29893d8b 100644
--- a/config/enums.php
+++ b/config/enums.php
@@ -4,7 +4,9 @@ return [
 
     'status' => [
         'INACTIVE' => 0,
-        'ACTIVE' => 1,
+        'DISABLED' => 0,
+        'ACTIVE'   => 1,
+        'ENABLED'  => 1,
     ],
 
     'sources' => [
@@ -23,5 +25,6 @@ return [
         'JETA'  => 1,
         'MOGAS' => 2,
     ],
+
 ];
 
diff --git a/config/phpvms.php b/config/phpvms.php
index 39459741..c60efead 100644
--- a/config/phpvms.php
+++ b/config/phpvms.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * DO NOT MODIFY THIS FILE DIRECTLY!
+ * It will just make upgrading (a little) more difficult
+ *
+ * Create a local.conf.php in the root (in the same directory
+ * as your .env file), and then copy this file into there, and
+ * make your changes there.
+ */
+
 return [
 
     /**
      * Pick one of:
      *  dollar, euro, gbp, yen, jpy, rupee, ruble
      */
-    'currency' => env('PHPVMS_CURRENCY', 'dollar'),
-
+    'currency' => 'dollar',
 ];