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

8
app/Http/Controllers/Api/Common/Companies.php
View File

@ -69,7 +69,7 @@ class Companies extends ApiController
public function update(Company $company, Request $request)
{
try {
$company = $this->dispatch(new UpdateCompany($company, $request));
$company = $this->dispatch(new UpdateCompany($company, $request, session('company_id')));
return $this->item($company->fresh(), new Transformer());
} catch (\Exception $e) {
@ -86,7 +86,7 @@ class Companies extends ApiController
public function enable(Company $company)
{
try {
$company = $this->dispatch(new UpdateCompany($company, request()->merge(['enabled' => 1])));
$company = $this->dispatch(new UpdateCompany($company, request()->merge(['enabled' => 1]), session('company_id')));
return $this->item($company->fresh(), new Transformer());
} catch (\Exception $e) {
@ -103,7 +103,7 @@ class Companies extends ApiController
public function disable(Company $company)
{
try {
$company = $this->dispatch(new UpdateCompany($company, request()->merge(['enabled' => 0])));
$company = $this->dispatch(new UpdateCompany($company, request()->merge(['enabled' => 0]), session('company_id')));
return $this->item($company->fresh(), new Transformer());
} catch (\Exception $e) {
@ -120,7 +120,7 @@ class Companies extends ApiController
public function destroy(Company $company)
{
try {
$this->dispatch(new DeleteCompany($company));
$this->dispatch(new DeleteCompany($company, session('company_id')));
return $this->response->noContent();
} catch (\Exception $e) {

8
app/Http/Controllers/Common/Companies.php
View File

@ -115,7 +115,7 @@ class Companies extends Controller
{
$company_id = session('company_id');
$response = $this->ajaxDispatch(new UpdateCompany($company, $request));
$response = $this->ajaxDispatch(new UpdateCompany($company, $request, session('company_id')));
if ($response['success']) {
$response['redirect'] = route('companies.index');
@ -147,7 +147,7 @@ class Companies extends Controller
*/
public function enable(Company $company)
{
$response = $this->ajaxDispatch(new UpdateCompany($company, request()->merge(['enabled' => 1])));
$response = $this->ajaxDispatch(new UpdateCompany($company, request()->merge(['enabled' => 1]), session('company_id')));
if ($response['success']) {
$response['message'] = trans('messages.success.enabled', ['type' => trans_choice('general.companies', 1)]);
@ -165,7 +165,7 @@ class Companies extends Controller
*/
public function disable(Company $company)
{
$response = $this->ajaxDispatch(new UpdateCompany($company, request()->merge(['enabled' => 0])));
$response = $this->ajaxDispatch(new UpdateCompany($company, request()->merge(['enabled' => 0]), session('company_id')));
if ($response['success']) {
$response['message'] = trans('messages.success.disabled', ['type' => trans_choice('general.companies', 1)]);
@ -183,7 +183,7 @@ class Companies extends Controller
*/
public function destroy(Company $company)
{
$response = $this->ajaxDispatch(new DeleteCompany($company));
$response = $this->ajaxDispatch(new DeleteCompany($company, session('company_id')));
$response['redirect'] = route('companies.index');

2
app/Http/Controllers/Install/Updates.php
View File

@ -274,7 +274,7 @@ class Updates extends Controller
set_time_limit(900); // 15 minutes
try {
$this->dispatch(new FinishUpdate($request['alias'], $request['version'], $request['installed']));
$this->dispatch(new FinishUpdate($request['alias'], $request['version'], $request['installed'], session('company_id')));
$json = [
'success' => true,

8
app/Http/Controllers/Modules/Item.php
View File

@ -236,7 +236,7 @@ class Item extends Controller
public function install(Request $request)
{
try {
$this->dispatch(new InstallModule($request['alias']));
$this->dispatch(new InstallModule($request['alias'], session('company_id')));
$name = module($request['alias'])->getName();
@ -275,7 +275,7 @@ class Item extends Controller
try {
$name = module($alias)->getName();
$this->dispatch(new UninstallModule($alias));
$this->dispatch(new UninstallModule($alias, session('company_id')));
$message = trans('modules.uninstalled', ['module' => $name]);
@ -294,7 +294,7 @@ class Item extends Controller
try {
$name = module($alias)->getName();
$this->dispatch(new EnableModule($alias));
$this->dispatch(new EnableModule($alias, session('company_id')));
$message = trans('modules.enabled', ['module' => $name]);
@ -313,7 +313,7 @@ class Item extends Controller
try {
$name = module($alias)->getName();
$this->dispatch(new DisableModule($alias));
$this->dispatch(new DisableModule($alias, session('company_id')));
$message = trans('modules.disabled', ['module' => $name]);