shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #174 some fixed

Browse Source
This commit is contained in:
cuneytsenturk 2018-01-09 21:11:06 +03:00
parent 5e4e27f2ca
commit 262ba871b7
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/Listeners/Updates/Version117.php
View File

@ -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);
}

2
app/Providers/EventServiceProvider.php
View File

@ -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',