Fixed bug with composer install post dump autoload when database not connected yet

Author: andrewdrake

src/LaravelCrmServiceProvider.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Livewire\Livewire;
 use VentureDrake\LaravelCrm\Console\LaravelCrmAddressTypes;
@@ -134,6 +133,7 @@
 use VentureDrake\LaravelCrm\Observers\XeroItemObserver;
 use VentureDrake\LaravelCrm\Observers\XeroPersonObserver;
 use VentureDrake\LaravelCrm\Observers\XeroTokenObserver;
+use VentureDrake\LaravelCrm\View\Composers\SettingsComposer;
 
 class LaravelCrmServiceProvider extends ServiceProvider
 {
@@ -479,13 +479,9 @@ function ($perPage = 30, $page = null, $options = []) {
             });
         }
 
-        if (Schema::hasTable(config('laravel-crm.db_table_prefix').'settings')) {
-            view()->share('dateFormat', Setting::where('name', 'date_format')->first()->value ?? 'Y/m/d');
-            view()->share('timeFormat', Setting::where('name', 'time_format')->first()->value ?? 'H:i');
-        } else {
-            view()->share('dateFormat', 'Y/m/d');
-            view()->share('timeFormat', 'H:i');
-        }
+        view()->composer('laravel-crm::layouts.app', SettingsComposer::class);
+        view()->composer('laravel-crm::layouts.document', SettingsComposer::class);
+        view()->composer('laravel-crm::layouts.portal', SettingsComposer::class);
     }
 
     /**

src/Traits/HasGlobalSettings.php

@@ -8,15 +8,11 @@ trait HasGlobalSettings
 {
     public static function dateFormat()
     {
-        if(\DB::connection()->getPDO()){
-            return Setting::where('name', 'date_format')->first()->value ?? 'Y/m/d';
-        }
+        return Setting::where('name', 'date_format')->first()->value ?? 'Y/m/d';
     }
 
     public static function timeFormat()
     {
-        if(\DB::connection()->getPDO()) {
-            return Setting::where('name', 'time_format')->first()->value ?? 'H:i';
-        }
+        return Setting::where('name', 'time_format')->first()->value ?? 'H:i';
     }
 }

src/View/Composers/SettingsComposer.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace VentureDrake\LaravelCrm\View\Composers;
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\View\View;
+use VentureDrake\LaravelCrm\Models\Setting;
+
+class SettingsComposer
+{
+    public function compose(View $view)
+    {
+        if (Schema::hasTable(config('laravel-crm.db_table_prefix').'settings')) {
+            $view->with('dateFormat', Setting::where('name', 'date_format')->first()->value ?? 'Y/m/d');
+            $view->with('timeFormat', Setting::where('name', 'time_format')->first()->value ?? 'H:i');
+        } else {
+            $view->with('dateFormat', 'Y/m/d');
+            $view->with('timeFormat', 'H:i');
+        }
+    }
+}