diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue index 5dee23121..702720cca 100644 --- a/resources/assets/js/components/AkauntingContactCard.vue +++ b/resources/assets/js/components/AkauntingContactCard.vue @@ -52,13 +52,11 @@ - - +
{{ contactInfoText }} -
- +
@@ -88,28 +86,26 @@
{{ contact.phone }}   - - {{ contact.email }} + - {{ contact.email }}
- -
- - -
- - + +
+ + +
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index dfdd14000..7ba705ff1 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -303,8 +303,8 @@ export default { onInput(evt) { this.search = evt.target.value; - - let option_url = this.selected_options[this.filter_index].url; + + let option_url = this.selected_options.length > 0 ? this.selected_options[this.filter_index].url : ''; if (this.search) { if (option_url.indexOf('?') === -1) { @@ -581,7 +581,7 @@ export default { onFilterDelete(index) { this.show_icon = true; - this.show_close_icon = false; + this.filter_list.push(this.selected_options[index]); if (this.filter_last_step == 'options') { @@ -598,8 +598,10 @@ export default { if (this.filter_index == 0) { this.onChangeSearchAndFilterText(this.defaultPlaceholder, true); + this.show_close_icon = false; } else { this.show_icon = false; + this.show_close_icon = true; } this.filter_last_step = 'options'; @@ -790,6 +792,10 @@ export default { if (this.filter_index > 0) { this.onChangeSearchAndFilterText(this.enterPlaceholder, false); } + + if (this.selected_values.length > 0) { + this.show_close_icon = true; + } }, computed: { diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 41321fac4..cee481cc3 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -875,7 +875,7 @@ export default { if (this.multiple) { this.selected = []; } else { - this.selected = null; + this.selected = ''; } return; @@ -892,7 +892,7 @@ export default { }, this); } else { if (! options.find((option) => option == this.selected)) { - this.selected = null; + this.selected = ''; } } } diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index f7a73337d..90db6c7be 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -1094,7 +1094,7 @@ export default { if (this.multiple) { this.selected = []; } else { - this.selected = null; + this.selected = ''; } return; @@ -1111,7 +1111,7 @@ export default { }, this); } else { if (! options.find((option) => option == this.selected)) { - this.selected = null; + this.selected = ''; } } }, diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index a28565359..c938855c6 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -229,6 +229,9 @@ export default { // Bulk Action modal cancel onCancelBulkAction() { this.bulk_action.modal = false; + + let documentClasses = document.body.classList; + documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4'); }, // Bulk Action Clear selected items diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php index e681c0703..0c646749c 100644 --- a/resources/views/settings/categories/create.blade.php +++ b/resources/views/settings/categories/create.blade.php @@ -24,7 +24,7 @@ - +