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/Banking/CreateBankingDocumentTransaction.php
View File

@ -71,7 +71,7 @@ class CreateBankingDocumentTransaction extends Job
$this->request['amount'] = $this->model->amount - $this->model->paid_amount;
}
$this->request['company_id'] = session('company_id');
$this->request['company_id'] = $this->model->company_id;
$this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code;
$this->request['type'] = ($this->model->type === Document::INVOICE_TYPE) ? 'income' : 'expense';
$this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->format('Y-m-d');

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;
}

4
app/Jobs/Install/DisableModule.php
View File

@ -20,10 +20,10 @@ class DisableModule extends Job
* @param $company_id
* @param $locale
*/
public function __construct($alias, $company_id = null, $locale = null)
public function __construct($alias, $company_id, $locale = null)
{
$this->alias = $alias;
$this->company_id = $company_id ?: session('company_id');
$this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale();
}

4
app/Jobs/Install/DownloadModule.php
View File

@ -17,10 +17,10 @@ class DownloadModule extends Job
* @param $alias
* @param $company_id
*/
public function __construct($alias, $company_id = null)
public function __construct($alias, $company_id)
{
$this->alias = $alias;
$this->company_id = $company_id ?: session('company_id');
$this->company_id = $company_id;
}
/**

4
app/Jobs/Install/EnableModule.php
View File

@ -20,10 +20,10 @@ class EnableModule extends Job
* @param $company_id
* @param $locale
*/
public function __construct($alias, $company_id = null, $locale = null)
public function __construct($alias, $company_id, $locale = null)
{
$this->alias = $alias;
$this->company_id = $company_id ?: session('company_id');
$this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale();
}

8
app/Jobs/Install/FinishUpdate.php
View File

@ -14,18 +14,22 @@ class FinishUpdate extends Job
protected $old;
protected $company_id;
/**
* Create a new job instance.
*
* @param $alias
* @param $new
* @param $old
* @param $company_id
*/
public function __construct($alias, $new, $old)
public function __construct($alias, $new, $old, $company_id)
{
$this->alias = $alias;
$this->new = $new;
$this->old = $old;
$this->company_id = $company_id;
}
/**
@ -36,7 +40,7 @@ class FinishUpdate extends Job
public function handle()
{
if ($this->alias == 'core') {
$companies = [session('company_id')];
$companies = [$this->company_id];
} else {
$companies = Module::alias($this->alias)->allCompanies()->cursor();
}

4
app/Jobs/Install/InstallModule.php
View File

@ -20,10 +20,10 @@ class InstallModule extends Job
* @param $company_id
* @param $locale
*/
public function __construct($alias, $company_id = null, $locale = null)
public function __construct($alias, $company_id, $locale = null)
{
$this->alias = $alias;
$this->company_id = $company_id ?: session('company_id');
$this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale();
}

4
app/Jobs/Install/UninstallModule.php
View File

@ -20,10 +20,10 @@ class UninstallModule extends Job
* @param $company_id
* @param $locale
*/
public function __construct($alias, $company_id = null, $locale = null)
public function __construct($alias, $company_id, $locale = null)
{
$this->alias = $alias;
$this->company_id = $company_id ?: session('company_id');
$this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale();
}