Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-07 05:44:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5639 from turbo124/v5-develop

Browse Source 
Fixes for caching
This commit is contained in:
David Bomba 2021-05-07 23:29:32 +10:00 committed by GitHub
commit e700ac3095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Util/SchedulerCheck.php
View File

@ -53,7 +53,6 @@ class SchedulerCheck implements ShouldQueue
try { try {
Artisan::call('clear-compiled'); Artisan::call('clear-compiled');
Artisan::call('cache:clear');
Artisan::call('route:clear'); Artisan::call('route:clear');
Artisan::call('config:cache'); Artisan::call('config:cache');
} catch (\Exception $e) { } catch (\Exception $e) {

5
app/Models/Credit.php
View File

@ -128,6 +128,11 @@ class Credit extends BaseModel
return $this->hasManyThrough(Backup::class, Activity::class); return $this->hasManyThrough(Backup::class, Activity::class);
} }
public function activities()
{
return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(300);
}
public function company() public function company()
{ {
return $this->belongsTo(Company::class); return $this->belongsTo(Company::class);

2
app/Models/Invoice.php
View File

@ -204,7 +204,7 @@ class Invoice extends BaseModel
public function activities() public function activities()
{ {
return $this->hasMany(Activity::class); return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(300);
} }
public function history() public function history()

5
app/Models/Quote.php
View File

@ -130,6 +130,11 @@ class Quote extends BaseModel
return $this->hasManyThrough(Backup::class, Activity::class); return $this->hasManyThrough(Backup::class, Activity::class);
} }
public function activities()
{
return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(300);
}
public function user() public function user()
{ {
return $this->belongsTo(User::class)->withTrashed(); return $this->belongsTo(User::class)->withTrashed();

38
app/Utils/Statics.php
View File

@ -71,26 +71,26 @@ class Statics
foreach (config('ninja.cached_tables') as $name => $class) { foreach (config('ninja.cached_tables') as $name => $class) {
if (!Cache::has($name)) { // if (!Cache::has($name)) {
// check that the table exists in case the migration is pending // // check that the table exists in case the migration is pending
if (!Schema::hasTable((new $class())->getTable())) { // if (!Schema::hasTable((new $class())->getTable())) {
continue; // continue;
} // }
if ($name == 'payment_terms') { // if ($name == 'payment_terms') {
$orderBy = 'num_days'; // $orderBy = 'num_days';
} elseif ($name == 'fonts') { // } elseif ($name == 'fonts') {
$orderBy = 'sort_order'; // $orderBy = 'sort_order';
} elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) { // } elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) {
$orderBy = 'name'; // $orderBy = 'name';
} else { // } else {
$orderBy = 'id'; // $orderBy = 'id';
} // }
$tableData = $class::orderBy($orderBy)->get(); // $tableData = $class::orderBy($orderBy)->get();
if ($tableData->count()) { // if ($tableData->count()) {
Cache::forever($name, $tableData); // Cache::forever($name, $tableData);
} // }
} // }
$data[$name] = Cache::get($name); $data[$name] = Cache::get($name);
} }