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

Merge pull request #2419 from EnesSacid-Buker/master

Browse Source 
Tests fixed
This commit is contained in:
Denis Duliçi 2022-06-03 18:03:50 +03:00 committed by GitHub
commit 3dae278227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Abstracts/Factory.php
View File

@ -5,9 +5,10 @@ namespace App\Abstracts;
use App\Models\Auth\User; use App\Models\Auth\User;
use App\Models\Common\Company; use App\Models\Common\Company;
use App\Traits\Jobs; use App\Traits\Jobs;
use Closure; use App\Utilities\Date;
use Illuminate\Database\Eloquent\Factories\Factory as BaseFactory; use Illuminate\Database\Eloquent\Factories\Factory as BaseFactory;
use Illuminate\Database\Eloquent\Model as EloquentModel; use Illuminate\Database\Eloquent\Model as EloquentModel;
use Illuminate\Support\Facades\Cache;
abstract class Factory extends BaseFactory abstract class Factory extends BaseFactory
{ {
@ -44,6 +45,8 @@ abstract class Factory extends BaseFactory
public function company(int $id): static public function company(int $id): static
{ {
Cache::put('state_company_id', $id, Date::now()->addHour(6));
return $this->state([ return $this->state([
'company_id' => $id, 'company_id' => $id,
]); ]);
@ -56,13 +59,13 @@ abstract class Factory extends BaseFactory
public function setCompany(): void public function setCompany(): void
{ {
$company_id = $this->getRawAttribute('company_id'); $state_id = Cache::get('state_company_id');
$this->company = !empty($company_id) ? Company::find($company_id) : $this->user->companies()->first(); $this->company = ! is_null($state_id) ? company($state_id) : $this->user->companies()->first();
$this->company->makeCurrent(); $this->company->makeCurrent();
app('url')->defaults(['company_id' => company_id()]); app('url')->defaults(['company_id' => $this->company->id]);
} }
public function getRawAttribute($key) public function getRawAttribute($key)