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

removed session from jobs

Browse Source
This commit is contained in:
Denis Duliçi
2020-12-25 12:08:15 +03:00
parent 5fa882b4e3
commit 7c126169c8
17 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Common/CreateContact.php
View File

@ -59,7 +59,7 @@ class CreateContact extends Job
$user = User::create($data);
$user->roles()->attach($customer_role);
$user->companies()->attach(session('company_id'));
$user->companies()->attach($data['company_id']);
$this->request['user_id'] = $user->id;
}

8
app/Jobs/Common/DeleteCompany.php
View File

@ -3,7 +3,6 @@
namespace App\Jobs\Common;
use App\Abstracts\Job;
use App\Models\Common\Company;
use App\Traits\Users;
class DeleteCompany extends Job
@ -12,14 +11,17 @@ class DeleteCompany extends Job
protected $company;
protected $active_company_id;
/**
* Create a new job instance.
*
* @param $request
*/
public function __construct($company)
public function __construct($company, $active_company_id)
{
$this->company = $company;
$this->active_company_id = $active_company_id;
}
/**
@ -53,7 +55,7 @@ class DeleteCompany extends Job
public function authorize()
{
// Can't delete active company
if ($this->company->id == session('company_id')) {
if ($this->company->id == $this->active_company_id) {
$message = trans('companies.error.delete_active');
throw new \Exception($message);

7
app/Jobs/Common/UpdateCompany.php
View File

@ -16,16 +16,19 @@ class UpdateCompany extends Job
protected $request;
protected $active_company_id;
/**
* Create a new job instance.
*
* @param $company
* @param $request
*/
public function __construct($company, $request)
public function __construct($company, $request, $active_company_id)
{
$this->company = $company;
$this->request = $this->getRequestInstance($request);
$this->active_company_id = $active_company_id;
}
/**
@ -94,7 +97,7 @@ class UpdateCompany extends Job
public function authorize()
{
// Can't disable active company
if (($this->request->get('enabled', 1) == 0) && ($this->company->id == session('company_id'))) {
if (($this->request->get('enabled', 1) == 0) && ($this->company->id == $this->active_company_id)) {
$message = trans('companies.error.disable_active');
throw new \Exception($message);

2
app/Jobs/Common/UpdateContact.php
View File

@ -77,7 +77,7 @@ class UpdateContact extends Job
$user = User::create($data);
$user->roles()->attach($customer_role);
$user->companies()->attach(session('company_id'));
$user->companies()->attach($data['company_id']);
$this->request['user_id'] = $user->id;
}