diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 6a7738602..6d1e40989 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -7,13 +7,33 @@
-
+
+ {{ noMatchingData }}
+
+
@@ -43,21 +63,46 @@
-
- {{ add_new_text }}
-
+
-
+
+ {{ noMatchingData }}
+
+
@@ -87,21 +132,46 @@
-
- {{ add_new_text }}
-
+
-
+
+ {{ noMatchingData }}
+
+
@@ -131,21 +201,46 @@
-
- {{ add_new_text }}
-
+
-
+
+ {{ noMatchingData }}
+
+
@@ -175,9 +270,14 @@
-
- {{ add_new_text }}
-
+
@@ -216,12 +316,12 @@ export default {
title: {
type: String,
default: '',
- description: "Modal header title"
+ description: "Selectbox label"
},
placeholder: {
type: String,
default: '',
- description: "Modal header title"
+ description: "Selectbox input placeholder"
},
formClasses: null,
formError: null,
@@ -252,7 +352,10 @@ export default {
group: false,
multiple:false,
disabled:false,
- collapse: false
+ collapse: false,
+
+ noData: '',
+ noMatchingData: ''
},
data() {
@@ -382,4 +485,37 @@ export default {
.form-group .modal {
z-index: 3050;
}
+
+ .el-select-dropdown__empty {
+ padding: 10px 0 0 !important;
+ }
+
+ .el-select__footer {
+ text-align: center;
+ border-top: 1px solid #dee2e6;
+ padding: 0px;
+ cursor: pointer;
+ color: #3c3f72;
+ font-weight: bold;
+ height: 38px;
+ line-height: 38px;
+ margin-top: 5px;
+ margin-bottom: -6px;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+
+ .el-select__footer.el-select-dropdown__item.hover {
+ background-color: inherit !important;
+ }
+
+ .el-select__footer.el-select-dropdown__item:hover, .el-select__footer.el-select-dropdown__item:focus {
+ background-color: #3c3f72 !important;
+ color: white !important;
+ border-top-color: #3c3f72;
+ }
+
+ .el-select__footer div span {
+ margin-left: 5px;
+ }
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 933e72c50..04116541d 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -147,6 +147,9 @@ return [
'month' => 'Month',
'year' => 'Year',
+ 'no_data' => 'No data',
+ 'no_matching_data' => 'No matching data',
+
'card' => [
'name' => 'Name on Card',
'number' => 'Card Number',
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 1acd96f62..7990481bd 100644
--- a/resources/views/partials/form/bulk_action_row_group.blade.php
+++ b/resources/views/partials/form/bulk_action_row_group.blade.php
@@ -4,12 +4,12 @@
-
- {{ strtolower(trans_choice($text, 1)) }}
-
-
- {{ strtolower(trans_choice($text, 2)) }}
-
+
+ {{ strtolower(trans_choice($text, 1)) }}
+
+
+ {{ strtolower(trans_choice($text, 2)) }}
+
{{ trans('bulk_actions.selected') }}
@@ -17,7 +17,7 @@