From 262ba871b73a8ed9e45cc53734e9ef7ea9f157a9 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Tue, 9 Jan 2018 21:11:06 +0300
Subject: [PATCH] refs #174 some fixed

---
 app/Listeners/Updates/Version117.php   | 35 +++++++++++++++++++++++++-
 app/Providers/EventServiceProvider.php |  2 +-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/Updates/Version117.php b/app/Listeners/Updates/Version117.php
index 048bf52b1..eee8d4ab3 100644
--- a/app/Listeners/Updates/Version117.php
+++ b/app/Listeners/Updates/Version117.php
@@ -4,6 +4,7 @@ namespace App\Listeners\Updates;
 
 use App\Events\UpdateFinished;
 use MediaUploader;
+use Storage;
 use Artisan;
 
 class Version117 extends Listener
@@ -48,6 +49,9 @@ class Version117 extends Listener
             $data[basename($model)] = $items;
         }
 
+        // Clear cache after update
+        Artisan::call('cache:clear');
+
         // Update database
         Artisan::call('migrate', ['--force' => true]);
 
@@ -58,7 +62,36 @@ class Version117 extends Listener
                 if ($item->$name) {
                     $path = explode('uploads/', $item->$name);
 
-                    $media = MediaUploader::importPath(config('mediable.default_disk'), $path[1]);
+                    $path = end($path);
+
+                    if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
+                        $path = $item->company_id . '/' . $path;
+                    }
+
+                    if (!empty($path) && Storage::exists($path)) {
+                        $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
+
+                        $item->attachMedia($media, $name);
+                    }
+                }
+            }
+        }
+
+        $settings['company_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.company_logo')->get();
+        $settings['invoice_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.invoice_logo')->get();
+
+        foreach ($settings as $name => $item) {
+            if ($item->value) {
+                $path = explode('uploads/', $item->value);
+
+                $path = end($path);
+
+                if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
+                    $path = $item->company_id . '/' . $path;
+                }
+
+                if (!empty($path) && Storage::exists($path)) {
+                    $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
 
                     $item->attachMedia($media, $name);
                 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 8ecb8073e..fc1954050 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -21,7 +21,7 @@ class EventServiceProvider extends ServiceProvider
             'App\Listeners\Updates\Version110',
             'App\Listeners\Updates\Version112',
             'App\Listeners\Updates\Version113',
-            'App\Listeners\Updates\Version116',
+            'App\Listeners\Updates\Version117',
         ],
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\Auth\Login',