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

Drop columns and company logo change variable name.

Browse Source
This commit is contained in:
cuneytsenturk
2018-01-03 17:54:02 +03:00
parent 3ffdb98a4b
commit 3c15d3e96f
14 changed files with 304 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Companies/Companies.php
View File

@ -60,12 +60,12 @@ class Companies extends Controller
setting()->set('general.company_address', $request->get('company_address'));
if ($request->file('company_logo')) {
$logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
$company_logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
if ($logo) {
$company->attachMedia($logo, 'logo');
if ($company_logo) {
$company->attachMedia($company_logo, 'company_logo');
setting()->set('general.company_logo', $logo->id);
setting()->set('general.company_logo', $company_logo->id);
}
}
@ -141,12 +141,12 @@ class Companies extends Controller
setting()->set('general.company_address', $request->get('company_address'));
if ($request->file('company_logo')) {
$logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
$company_logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
if ($logo) {
$company->attachMedia($logo, 'logo');
if ($company_logo) {
$company->attachMedia($company_logo, 'company_logo');
setting()->set('general.company_logo', $logo->id);
setting()->set('general.company_logo', $company_logo->id);
}
}

28
app/Listeners/Updates/Version116.php Normal file
View File

@ -0,0 +1,28 @@
<?php
namespace App\Listeners\Updates;
use App\Events\UpdateFinished;
use App\Models\Setting\Currency;
class Version116 extends Listener
{
const ALIAS = 'core';
const VERSION = '1.1.6';
/**
* Handle the event.
*
* @param $event
* @return void
*/
public function handle(UpdateFinished $event)
{
// Check if should listen
if (!$this->check($event)) {
return;
}
}
}

6
app/Models/Company/Company.php
View File

@ -236,12 +236,12 @@ class Company extends Eloquent
*
* @return string
*/
public function getLogoAttribute()
public function getCompanyLogoAttribute()
{
if (!$this->hasMedia('logo')) {
if (!$this->hasMedia('company_logo')) {
return false;
}
return $this->getMedia('logo')->last();
return $this->getMedia('company_logo')->last();
}
}

1
app/Providers/EventServiceProvider.php
View File

@ -21,6 +21,7 @@ class EventServiceProvider extends ServiceProvider
'App\Listeners\Updates\Version110',
'App\Listeners\Updates\Version112',
'App\Listeners\Updates\Version113',
'App\Listeners\Updates\Version116',
],
'Illuminate\Auth\Events\Login' => [
'App\Listeners\Auth\Login',