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

Merge pull request #2676 from brkcvn/master

Browse Source 
Some console error fixed
This commit is contained in:
Burak Civan 2022-10-20 09:28:37 +03:00 committed by GitHub
commit 845448d3cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/assets/js/components/AkauntingContactCard.vue
View File

@ -52,13 +52,11 @@
</div>
</div>
</div>
</div>
</div>
<div v-else class="document-contact-with-contact-bill-to">
<div>
<span class="text-sm">{{ contactInfoText }}</span>
</div>
</div>
<div class="overflow-x-visible mt-0">
<table class="table table-borderless p-0">
<tbody>
@ -88,28 +86,26 @@
<th class="font-normal text-xs text-left p-0">
{{ contact.phone }} &nbsp;
<span v-if="contact.email">
- {{ contact.email }}
- {{ contact.email }}
</span>
</th>
</tr>
</tbody>
</table>
</div>
<div class="absolute flex flex-col mt-2">
<button type="button" class="p-0 text-xs text-purple ltr:text-left rtl:text-right" @click="onContactEdit">
<span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">
{{ editContactText.replace(':contact_name', contact.name).replace(':field', contact.name) }}
</span>
</button>
<button type="button" class="p-0 text-xs text-purple ltr:text-left rtl:text-right" @click="onContactList">
<span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">
{{ chooseDifferentContactText }}
</span>
</button>
</div>
</div>
</div>
<div :class="show.contact_selected ? 'flex' : 'hidden'" class="absolute flex-col mt-2">
<button type="button" class="p-0 text-xs text-purple ltr:text-left rtl:text-right" @click="onContactEdit">
<span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">
{{ editContactText.replace(':contact_name', contact.name).replace(':field', contact.name) }}
</span>
</button>
<button type="button" class="p-0 text-xs text-purple ltr:text-left rtl:text-right" @click="onContactList">
<span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">
{{ chooseDifferentContactText }}
</span>
</button>
</div>
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
</div>
</div>

12
resources/assets/js/components/AkauntingSearch.vue
View File

@ -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: {

4
resources/assets/js/components/AkauntingSelect.vue
View File

@ -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 = '';
}
}
}

4
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -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 = '';
}
}
},

3
resources/assets/js/mixins/global.js vendored
View File

@ -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

2
resources/views/settings/categories/create.blade.php
View File

@ -24,7 +24,7 @@
<x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" :selected="config('general.types')" change="updateParentCategories" />
<x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="[]" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" v-disabled="isParentCategoryDisabled" />
<x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="[]" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" />
<x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
</x-slot>