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

Merge branch 'akaunting:master' into invoice-form-enhancements

Browse Source
This commit is contained in:
bengü thon mai mochi
2021-08-25 11:15:51 +03:00
committed by GitHub
parent 197aa5ce1a e9e0012175
commit af8b75487f
148 changed files with 2103 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@
<el-select v-model="selected" :placeholder="placeholder" filterable
@change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
:clearable="clearable"
:disabled="disabled"
:multiple="multiple"
:readonly="readonly"
@ -247,6 +248,12 @@ export default {
description: "Selectbox disabled status"
},
clearable: {
type: Boolean,
default: true,
description: "Selectbox clearable status"
},
disabled: {
type: Boolean,
default: false,
@ -384,13 +391,13 @@ export default {
for (const [key, value] of Object.entries(options)) {
values.push({
key: key,
key: key.toString(),
value: value
});
}
this.sorted_options.push({
key: index,
key: index.toString(),
value: values
});
}
@ -405,7 +412,7 @@ export default {
} else {
this.sorted_options.push({
index: index,
key: option.id,
key: option.id.toString(),
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
});
}
@ -416,7 +423,7 @@ export default {
if (!Array.isArray(created_options)) {
for (const [key, value] of Object.entries(created_options)) {
this.sorted_options.push({
key: key,
key: key.toString(),
value: value
});
}
@ -431,7 +438,7 @@ export default {
} else {
this.sorted_options.push({
index: index,
key: option.id,
key: option.id.toString(),
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
});
}
@ -654,6 +661,7 @@ export default {
}
})
.then(response => {
this.loading = false;
this.form.loading = false;
if (response.data.success) {
@ -675,10 +683,14 @@ export default {
this.add_new.html = '';
this.add_new_html = null;
response.data.data.mark_new = true;
this.$emit('new', response.data.data);
this.change();
this.$emit('visible-change', event);
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");

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

@ -11,6 +11,7 @@
<el-select v-model="selected" :placeholder="placeholder" filterable remote reserve-keyword
@change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
:clearable="clearable"
:disabled="disabled"
:multiple="multiple"
:readonly="readonly"
@ -110,6 +111,7 @@
<span v-else>
<el-select v-model="selected" :placeholder="placeholder" filterable remote reserve-keyword
@change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
:clearable="clearable"
:disabled="disabled"
:multiple="multiple"
:readonly="readonly"
@ -338,6 +340,12 @@ export default {
description: "Selectbox disabled status"
},
clearable: {
type: Boolean,
default: true,
description: "Selectbox clearable status"
},
disabled: {
type: Boolean,
default: false,