Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

move statics into container

Browse Source
This commit is contained in:
David Bomba 2024-06-05 14:48:51 +10:00
parent 836802764a
commit fe6d837123
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Models/Company.php
View File

@ -636,17 +636,19 @@ class Company extends BaseModel
public function country() public function country()
{ {
$companies = Cache::get('countries'); $countries = app('countries');
if (! $companies) { // $countries = Cache::get('countries');
$this->buildCache(true);
$companies = Cache::get('countries'); // if (! $companies) {
} // $this->buildCache(true);
return $companies->filter(function ($item) { // $companies = Cache::get('countries');
// }
return $countries->first(function ($item) {
return $item->id == $this->getSetting('country_id'); return $item->id == $this->getSetting('country_id');
})->first(); });
// return $this->belongsTo(Country::class); // return $this->belongsTo(Country::class);
// return Country::find($this->settings->country_id); // return Country::find($this->settings->country_id);
@ -659,15 +661,17 @@ class Company extends BaseModel
public function timezone() public function timezone()
{ {
$timezones = Cache::get('timezones'); // $timezones = Cache::get('timezones');
if (! $timezones) { $timezones = app('timezones');
$this->buildCache(true);
}
return $timezones->filter(function ($item) { // if (! $timezones) {
// $this->buildCache(true);
// }
return $timezones->first(function ($item) {
return $item->id == $this->settings->timezone_id; return $item->id == $this->settings->timezone_id;
})->first(); });
// return Timezone::find($this->settings->timezone_id); // return Timezone::find($this->settings->timezone_id);
} }

2
config/app.php
View File

@ -201,7 +201,7 @@ return [
App\Providers\MultiDBProvider::class, App\Providers\MultiDBProvider::class,
App\Providers\ClientPortalServiceProvider::class, App\Providers\ClientPortalServiceProvider::class,
App\Providers\NinjaTranslationServiceProvider::class, App\Providers\NinjaTranslationServiceProvider::class,
App\Providers\StaticServiceProvider::class, App\Providers\StaticServiceProvider::class,
], ],
/* /*