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

Merge pull request #2902 from EnesSacid-Buker/bulk-actions

Browse Source 
Detailing bulk actions messages
This commit is contained in:
Cüneyt Şentürk 2023-02-23 01:07:55 +03:00 committed by GitHub
commit 0ff041467d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Common/BulkActions.php
View File

@ -61,19 +61,28 @@ class BulkActions extends Controller
$result = $bulk_actions->{$handle}($request); $result = $bulk_actions->{$handle}($request);
$message = trans($bulk_actions->messages['general'], ['type' => $handle, 'count' => count($request->get('selected'))]); $count = count($request->get('selected'));
$not_passed = 0;
if (array_key_exists($handle, $bulk_actions->messages)) { flash()->messages->each(function ($message) use (&$not_passed) {
if (in_array($message->level, ['danger', 'warning'])) {
$not_passed++;
}
});
$message = trans($bulk_actions->messages['general'], ['type' => $handle, 'count' => $count - $not_passed]);
if (array_key_exists($handle, $bulk_actions->messages) && $not_passed === 0) {
$message = trans($bulk_actions->messages[$handle], ['type' => $page]); $message = trans($bulk_actions->messages[$handle], ['type' => $page]);
} }
if (! empty($result) && ($result instanceof \Symfony\Component\HttpFoundation\BinaryFileResponse)) { $level = $not_passed > 0 ? 'info' : 'success';
flash($message)->success();
flash($message)->{$level}();
if (! empty($result) && ($result instanceof \Symfony\Component\HttpFoundation\BinaryFileResponse)) {
return $result; return $result;
} elseif (! empty($result) && ($result instanceof RedirectResponse)) { } elseif (! empty($result) && ($result instanceof RedirectResponse)) {
flash($message)->success();
return response()->json([ return response()->json([
'success' => true, 'success' => true,
'redirect' => $result->getTargetUrl(), 'redirect' => $result->getTargetUrl(),
@ -82,8 +91,6 @@ class BulkActions extends Controller
'message' => '' 'message' => ''
]); ]);
} else { } else {
flash($message)->success();
return response()->json([ return response()->json([
'success' => true, 'success' => true,
'redirect' => true, 'redirect' => true,