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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-09-23 14:25:40 +03:00
parent f62374b0d4 520d0e6290
commit 8f9ed000a2
54 changed files with 1364 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Kernel.php
View File

@@ -52,9 +52,9 @@ class Kernel extends HttpKernel
'api.auth',
'auth.disabled',
'throttle:60,1',
'bindings',
'api.company',
'permission:read-api',
'api.company',
'bindings',
'company.settings',
'company.currencies',
'language',

16
app/Http/ViewComposers/Index.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\ViewComposers;
use Akaunting\Module\Module;
use App\Events\Common\BulkActionsAdding;
use Date;
use Illuminate\Support\Str;
use Illuminate\View\View;
@@ -67,10 +68,19 @@ class Index
$class_name = 'App\BulkActions\\' . $file_name;
}
if (!class_exists($class_name)) {
return;
if (class_exists($class_name)) {
event(new BulkActionsAdding(app($class_name)));
$bulk_actions = app($class_name)->actions;
} else {
$b = new \stdClass();
$b->actions = [];
event(new BulkActionsAdding($b));
$bulk_actions = $b->actions;
}
$view->with(['bulk_actions' => app($class_name)->actions]);
$view->with(['bulk_actions' => $bulk_actions]);
}
}