diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index 5655185d4..0e7846a1c 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -64,6 +64,7 @@ import AkauntingRecurring from './AkauntingRecurring'; import Form from './../plugins/form'; import { Alert, ColorPicker } from 'element-ui'; +import Global from './../mixins/global'; export default { name: 'akaunting-modal-add-new', @@ -150,7 +151,7 @@ export default { this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ template : '', - + mixins: [Global], components: { AkauntingRadioGroup, AkauntingSelect, diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 262960718..3dc640606 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -318,11 +318,16 @@ export default { this.selected = this.value; if (this.model.length) { - if (eval(this.model) !== undefined) { - this.selected = eval(this.model); - } else { + try { + if (eval(this.model) !== undefined) { + this.selected = eval(this.model); + } else { + this.selected = this.model; + } + } catch (e) { this.selected = this.model; } + } if (this.multiple && !this.selected.length) { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index e6e164de6..73f90a0e7 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -430,11 +430,16 @@ export default { this.selected = this.value; if (this.model.length) { - if (eval(this.model) !== undefined) { - this.selected = eval(this.model); - } else { + try { + if (eval(this.model) !== undefined) { + this.selected = eval(this.model); + } else { + this.selected = this.model; + } + } catch (e) { this.selected = this.model; } + } if (this.multiple && !this.selected.length) {