From 4fe77ea76c8423b9f4569ec3b5234442ad049df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 13 Feb 2020 16:37:27 +0300
Subject: [PATCH] Bulk action permission fixed and badge style.

---
 app/Providers/Form.php                             |  4 ++--
 public/css/custom.css                              |  6 ++++++
 resources/views/auth/users/index.blade.php         | 14 ++++++++++----
 resources/views/banking/accounts/index.blade.php   | 10 +++++++---
 resources/views/common/companies/index.blade.php   | 14 ++++++++++----
 resources/views/common/dashboards/index.blade.php  | 12 +++++++++---
 resources/views/common/items/index.blade.php       | 10 +++++++---
 .../partials/form/bulk_action_group.blade.php      |  7 ++++++-
 resources/views/purchases/vendors/index.blade.php  | 10 +++++++---
 resources/views/sales/customers/index.blade.php    | 14 +++++++++-----
 .../views/settings/categories/index.blade.php      | 12 +++++++++---
 .../views/settings/currencies/index.blade.php      | 12 +++++++++---
 resources/views/settings/taxes/index.blade.php     | 12 +++++++++---
 resources/views/wizard/currencies/index.blade.php  |  4 ++--
 resources/views/wizard/taxes/index.blade.php       |  4 ++--
 15 files changed, 104 insertions(+), 41 deletions(-)

diff --git a/app/Providers/Form.php b/app/Providers/Form.php
index 635582cbb..245d23c0f 100644
--- a/app/Providers/Form.php
+++ b/app/Providers/Form.php
@@ -120,7 +120,7 @@ class Form extends Provider
         ]);
 
         Facade::component('bulkActionRowGroup', 'partials.form.bulk_action_row_group', [
-            'text', 'actions', 'path'
+            'text', 'actions', 'path', 'attributes' => []
         ]);
 
         Facade::component('bulkActionAllGroup', 'partials.form.bulk_action_all_group', [
@@ -128,7 +128,7 @@ class Form extends Provider
         ]);
 
         Facade::component('bulkActionGroup', 'partials.form.bulk_action_group', [
-            'id', 'name'
+            'id', 'name', 'attributes' => []
         ]);
 
         Facade::component('enabledGroup', 'partials.form.enabled_group', [
diff --git a/public/css/custom.css b/public/css/custom.css
index 729435bb6..5feb89a8e 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -882,3 +882,9 @@ table .align-items-center td span.badge {
 }
 /*--Lg Breakpoint Finish--*/
 /*--------Responsive Finish--------*/
+
+/*--------Index Pages Badge Min Width--------*/
+.mw-60 {
+    min-width: 60px;
+}
+/*--------Index Pages Badge Min Finish--------*/
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index 64c35d25a..3c4198c24 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -44,7 +44,13 @@
                 <tbody>
                     @foreach($users as $item)
                         <tr class="row align-items-center border-top-1">
-                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">
+                                @if ((user()->id != $item->id) && user()->can('update-auth-users'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
+                            </td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-3">
                                 <a class="col-aka" href="{{ route('users.edit', $item->id) }}">
                                     @if (setting('default.use_gravatar', '0') == '1')
@@ -64,13 +70,13 @@
                                 @endforeach
                             </td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-2">
-                                @if (user()->can('update-auth-users'))
+                                @if ((user()->id != $item->id) && user()->can('update-auth-users'))
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php
index ec3337cb6..dc5973a88 100644
--- a/resources/views/banking/accounts/index.blade.php
+++ b/resources/views/banking/accounts/index.blade.php
@@ -45,7 +45,11 @@
                     @foreach($accounts as $item)
                         <tr class="row align-items-center border-top-1">
                             <td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
-                                {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @if (user()->can('update-banking-accounts'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
                             </td>
                             <td class="col-xs-4 col-sm-4 col-md-3 col-lg-3 col-xl-2"><a class="col-aka" href="{{ route('accounts.edit', $item->id) }}">{{ $item->name }}</a></td>
                             <td class="col-md-2 col-lg-2 col-xl-3 d-none d-md-block text-left">{{ $item->number }}</td>
@@ -55,9 +59,9 @@
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php
index b11035723..befd40551 100644
--- a/resources/views/common/companies/index.blade.php
+++ b/resources/views/common/companies/index.blade.php
@@ -45,19 +45,25 @@
                 <tbody>
                     @foreach($companies as $item)
                         <tr class="row align-items-center border-top-1">
-                            <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                            <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">
+                                @if ((session('company_id') != $item->id) && user()->can('update-common-companies'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
+                            </td>
                             <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block"><a class="col-aka">{{ $item->id }}</a></td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-3 col-xl-3 long-texts"><a href="{{ route('companies.edit', $item->id) }}">{{ $item->name }}</a></td>
                             <td class="col-md-2 col-lg-2 col-xl-2 d-none d-md-block long-texts">{{ $item->email }}</td>
                             <td class="col-lg-2 col-xl-2 d-none d-lg-block">@date($item->created_at)</td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-2 col-xl-2">
-                                @if (user()->can('update-common-companies'))
+                                @if ((session('company_id') != $item->id) && user()->can('update-common-companies'))
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php
index c963d0788..ad184d75e 100644
--- a/resources/views/common/dashboards/index.blade.php
+++ b/resources/views/common/dashboards/index.blade.php
@@ -42,16 +42,22 @@
                 <tbody>
                     @foreach($dashboards as $item)
                         <tr class="row align-items-center border-top-1">
-                            <td class="col-sm-3 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                            <td class="col-sm-3 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">
+                                @if (user()->can('update-common-dashboards'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
+                            </td>
                             <td class="col-xs-4 col-sm-3 col-md-6 col-lg-7 col-xl-7 long-texts"><a href="{{ route('dashboards.edit', $item->id) }}">{{ $item->name }}</a></td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-2 col-xl-2">
                                 @if (user()->can('update-common-dashboards'))
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 84c843a2e..766f08255 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -49,7 +49,11 @@
                         @foreach($items as $item)
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
-                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @if (user()->can('update-common-items'))
+                                        {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @else
+                                        {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                    @endif
                                 </td>
                                 <td class="col-xs-4 col-sm-4 col-md-4 col-lg-3 col-xl-3 py-2">
                                     <img src="{{ $item->picture ? Storage::url($item->picture->id) : asset('public/img/akaunting-logo-green.svg') }}" class="avatar image-style p-1 mr-3 item-img hidden-md col-aka" alt="{{ $item->name }}">
@@ -69,9 +73,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>
diff --git a/resources/views/partials/form/bulk_action_group.blade.php b/resources/views/partials/form/bulk_action_group.blade.php
index 601b7482f..96301e3ca 100644
--- a/resources/views/partials/form/bulk_action_group.blade.php
+++ b/resources/views/partials/form/bulk_action_group.blade.php
@@ -1,7 +1,12 @@
 @stack($name . '_input_start')
 
     <div class="custom-control custom-checkbox">
-        <input type="checkbox" class="custom-control-input" id="bulk-action-{{ $id }}" data-bulk-action="{{ $id }}"
+        <input type="checkbox" class="custom-control-input" id="bulk-action-{{ $id }}"
+            @if (isset($attributes['disabled']))
+            :disabled="{{ ($attributes['disabled']) ? true : false }}"
+            @else
+            data-bulk-action="{{ $id }}"
+            @endif
             :value="{{ $id }}"
             v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : 'bulk_action.selected' }}"
             v-on:change="onSelect">
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index 51fefe3ac..83d06f5ec 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -49,7 +49,11 @@
                         @foreach($vendors as $item)
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
-                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @if (user()->can('update-purchases-vendors'))
+                                        {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @else
+                                        {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                    @endif
                                 </td>
                                 <td class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">
                                     <a class="col-aka" href="{{ route('vendors.show', $item->id) }}">{{ $item->name }}</a>
@@ -68,9 +72,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index eb2c90523..4f820e076 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -49,7 +49,11 @@
                         @foreach($customers as $item)
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
-                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @if (user()->can('update-sales-customers'))
+                                        {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @else
+                                        {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                    @endif
                                 </td>
                                 <td class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">
                                     <a class="col-aka" href="{{ route('customers.show', $item->id) }}">{{ $item->name }}</a>
@@ -68,9 +72,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>
@@ -81,9 +85,9 @@
                                         </a>
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
                                             <a class="dropdown-item" href="{{ route('customers.show', $item->id) }}">{{ trans('general.show') }}</a>
-                                                <a class="dropdown-item" href="{{ route('customers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
+                                            <a class="dropdown-item" href="{{ route('customers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
 
-                                                <div class="dropdown-divider"></div>
+                                            <div class="dropdown-divider"></div>
                                             @permission('create-sales-customers')
                                                 <a class="dropdown-item" href="{{ route('customers.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
 
diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php
index 92d2de8d6..8266341f7 100644
--- a/resources/views/settings/categories/index.blade.php
+++ b/resources/views/settings/categories/index.blade.php
@@ -44,7 +44,13 @@
                 <tbody>
                     @foreach($categories as $item)
                         <tr class="row align-items-center border-top-1">
-                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">
+                                @if (user()->can('update-settings-categories'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
+                            </td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-4"><a class="col-aka" href="{{ route('categories.edit',  $item->id) }}">{{ $item->name }}</a></td>
                             <td class="col-sm-2 col-md-2 col-lg-2 d-none d-sm-block">{{ $types[$item->type] }}</td>
                             <td class="col-md-2  col-lg-2 d-none d-md-block"><i class="fa fa-2x fa-circle" style="color:{{ $item->color }};"></i></td>
@@ -53,9 +59,9 @@
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/settings/currencies/index.blade.php b/resources/views/settings/currencies/index.blade.php
index 026c70e76..e863fed2d 100644
--- a/resources/views/settings/currencies/index.blade.php
+++ b/resources/views/settings/currencies/index.blade.php
@@ -44,7 +44,13 @@
                 <tbody>
                     @foreach($currencies as $item)
                         <tr class="row align-items-center border-top-1">
-                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                            <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">
+                                @if (user()->can('update-settings-currencies'))
+                                    {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                @else
+                                    {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                @endif
+                            </td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-4"><a class="col-aka" href="{{ route('currencies.edit', $item->id) }}">{{ $item->name }}</a></td>
                             <td class="col-md-2  col-lg-2 d-none d-md-block">{{ $item->code }}</td>
                             <td class="col-sm-2 col-md-2 col-lg-2 d-none d-sm-block">{{ $item->rate }}</td>
@@ -53,9 +59,9 @@
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                        <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                     @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                        <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                     @endif
                                 @endif
                             </td>
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index c8ab3da9c..50aa58fa5 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -45,7 +45,13 @@
                     <tbody>
                         @foreach($taxes as $item)
                             <tr class="row align-items-center border-top-1">
-                                <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->name) }}</td>
+                                <td class="col-sm-2 col-md-2 col-lg-1 d-none d-sm-block">
+                                    @if (user()->can('update-settings-taxes'))
+                                        {{ Form::bulkActionGroup($item->id, $item->name) }}
+                                    @else
+                                        {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'disabled']) }}
+                                    @endif
+                                </td>
                                 <td class="col-xs-4 col-sm-3 col-md-2 col-lg-4"><a class="col-aka" href="{{ route('taxes.edit', $item->id) }}">{{ $item->name }}</a></td>
                                 <td class="col-md-2 col-lg-2 d-none d-md-block">{{ $item->rate }}</td>
                                 <td class="col-sm-2 col-md-2 col-lg-2 d-none d-sm-block">{{ $types[$item->type] }}</td>
@@ -54,9 +60,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index 68f84d880..9a90341c6 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -54,9 +54,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index 56f3161d9..d048285fe 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -52,9 +52,9 @@
                                         {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                     @else
                                         @if ($item->enabled)
-                                            <badge rounded type="success">{{ trans('general.enabled') }}</badge>
+                                            <badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
                                         @else
-                                            <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
+                                            <badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
                                         @endif
                                     @endif
                                 </td>