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

improved tenant identification

Browse Source
This commit is contained in:
Denis Duliçi
2021-04-16 00:59:43 +03:00
parent 9635e6be5d
commit 2b07442260
126 changed files with 1719 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Settings/Categories.php
View File

@ -92,20 +92,16 @@ class Categories extends Controller
*/
public function import(ImportRequest $request)
{
$response = $this->importExcel(new Import, $request);
$response = $this->importExcel(new Import, $request, trans_choice('general.categories', 2));
if ($response['success']) {
$response['redirect'] = route('categories.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.categories', 2)]);
flash($message)->success();
flash($response['message'])->success();
} else {
$response['redirect'] = route('import.create', ['settings', 'categories']);
$message = $response['message'];
flash($message)->error()->important();
flash($response['message'])->error()->important();
}
return response()->json($response);

2
app/Http/Controllers/Settings/Modules.php
View File

@ -16,7 +16,7 @@ class Modules extends Controller
*/
public function __construct()
{
$alias = request()->segment(1);
$alias = request()->segment(2);
// Add CRUD permission check
$this->middleware('permission:create-' . $alias . '-settings')->only('create', 'store', 'duplicate', 'import');

2
app/Http/Controllers/Settings/Settings.php
View File

@ -80,7 +80,7 @@ class Settings extends Controller
$company_id = $request->get('company_id');
if (empty($company_id)) {
$company_id = session('company_id');
$company_id = company_id();
}
$company = Company::find($company_id);