diff --git a/resources/lang/en-GB/bulk_actions.php b/resources/lang/en-GB/bulk_actions.php
index 3873e45fb..a9ad32f04 100644
--- a/resources/lang/en-GB/bulk_actions.php
+++ b/resources/lang/en-GB/bulk_actions.php
@@ -2,8 +2,9 @@
return [
- 'bulk_actions' => 'Bulk Action|Bulk Actions',
- 'selected' => 'selected',
+ 'bulk_actions' => 'Bulk Action|Bulk Actions',
+ 'selected' => 'selected',
+ 'no_action' => 'No action available',
'message' => [
'duplicate' => 'Are you sure you want to duplicate selected record?',
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index 3c4198c24..3aa4ac2da 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -45,7 +45,7 @@
@foreach($users as $item)
- @if ((user()->id != $item->id) && user()->can('update-auth-users'))
+ @if (user()->id != $item->id)
{{ Form::bulkActionGroup($item->id, $item->name) }}
@else
{{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php
index dc5973a88..a3b30c3e0 100644
--- a/resources/views/banking/accounts/index.blade.php
+++ b/resources/views/banking/accounts/index.blade.php
@@ -45,11 +45,7 @@
@foreach($accounts as $item)
|
- @if (user()->can('update-banking-accounts'))
- {{ Form::bulkActionGroup($item->id, $item->name) }}
- @else
- {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
- @endif
+ {{ Form::bulkActionGroup($item->id, $item->name) }}
|
{{ $item->name }} |
{{ $item->number }} |
diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php
index befd40551..7689a7c04 100644
--- a/resources/views/common/companies/index.blade.php
+++ b/resources/views/common/companies/index.blade.php
@@ -46,7 +46,7 @@
@foreach($companies as $item)
- @if ((session('company_id') != $item->id) && user()->can('update-common-companies'))
+ @if ((session('company_id') != $item->id))
{{ Form::bulkActionGroup($item->id, $item->name) }}
@else
{{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php
index ad184d75e..15a1e7124 100644
--- a/resources/views/common/dashboards/index.blade.php
+++ b/resources/views/common/dashboards/index.blade.php
@@ -43,11 +43,7 @@
@foreach($dashboards as $item)
|
- @if (user()->can('update-common-dashboards'))
- {{ Form::bulkActionGroup($item->id, $item->name) }}
- @else
- {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
- @endif
+ {{ Form::bulkActionGroup($item->id, $item->name) }}
|
{{ $item->name }} |
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 766f08255..945a1acd3 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -49,18 +49,14 @@
@foreach($items as $item)
|
- @if (user()->can('update-common-items'))
- {{ Form::bulkActionGroup($item->id, $item->name) }}
- @else
- {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
- @endif
+ {{ Form::bulkActionGroup($item->id, $item->name) }}
|
{{ $item->name }}
|
- {{ $item->category ? $item->category->name : trans('general.na') }}
+ {{ $item->category->name }}
|
{{ money($item->sale_price, setting('default.currency'), true) }}
diff --git a/resources/views/partials/form/bulk_action_row_group.blade.php b/resources/views/partials/form/bulk_action_row_group.blade.php
index b20e419b2..21887d12f 100644
--- a/resources/views/partials/form/bulk_action_row_group.blade.php
+++ b/resources/views/partials/form/bulk_action_row_group.blade.php
@@ -1,12 +1,23 @@
@stack('bulk_action_row_input_start')
+
@php
if (is_array($path)) {
$path = route('bulk-actions.action', $path);
} else {
$path = url('common/bulk-actions/' . $path);
}
+
+ $actions_to_show = [];
+ foreach ($actions as $key => $action) {
+ if ((isset($action['permission']) && !user()->can($action['permission']))) {
+ continue;
+ }
+
+ $actions_to_show[$key] = true;
+ }
@endphp
+@if(!empty($actions_to_show))
@@ -31,7 +42,7 @@
@change="onChange">
@foreach($actions as $key => $action)
- @if((!isset($action['permission'])) || (isset($action['permission']) && user()->can($action['permission'])))
+ @if(isset($actions_to_show[$key]))
|