From 17bb80eadb4007a149a873a39eb43829cb51e38a Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 9 Mar 2019 19:31:03 +0300
Subject: [PATCH] fixed console #785

---
 app/Utilities/Overrider.php | 3 +++
 config/charts.php           | 2 +-
 config/filesystems.php      | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Utilities/Overrider.php b/app/Utilities/Overrider.php
index a3467997d..bf3982a2d 100644
--- a/app/Utilities/Overrider.php
+++ b/app/Utilities/Overrider.php
@@ -58,6 +58,9 @@ class Overrider
             //Session::put('locale', setting('general.default_language'));
             config(['app.locale' => setting('general.default_locale')]);
         }
+
+        // Set app url dynamically
+        config(['app.url' => url('/')]);
     }
 
     protected static function loadCurrencies()
diff --git a/config/charts.php b/config/charts.php
index 024416e48..d6111b6c7 100644
--- a/config/charts.php
+++ b/config/charts.php
@@ -94,7 +94,7 @@ return [
 
         'chartjs' => [
             'scripts' => [
-                asset('public/js/chartjs/Chart.min.js'),
+                app()->runningInConsole() ? '' : asset('public/js/chartjs/Chart.min.js'),
             ],
         ],
 
diff --git a/config/filesystems.php b/config/filesystems.php
index 370d5a2be..3ae584497 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -51,14 +51,14 @@ return [
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
-            'url' => url('/') . '/storage',
+            'url' => app()->runningInConsole() ? '' : url('/') . '/storage',
             'visibility' => 'public',
         ],
 
         'uploads' => [
             'driver' => 'local',
             'root' => storage_path('app/uploads'),
-            'url' => url('/') . '/uploads',
+            'url' => app()->runningInConsole() ? '' : url('/') . '/uploads',
             'visibility' => 'private',
         ],