From 504bc5d3a7ce098a0fa96c0a77e3ca11ceeef96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 1 Jan 2021 17:59:33 +0300 Subject: [PATCH] file updated.. --- app/Providers/Form.php | 2 +- resources/assets/js/components/AkauntingSelect.vue | 10 ++++------ .../assets/js/components/AkauntingSelectRemote.vue | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/Providers/Form.php b/app/Providers/Form.php index 50bcc4bad..2e8fbaf5a 100644 --- a/app/Providers/Form.php +++ b/app/Providers/Form.php @@ -120,7 +120,7 @@ class Form extends Provider ]); Facade::component('recurring', 'partials.form.recurring', [ - 'page', 'model' => null, 'col' => 'col-md-12', + 'page', 'model' => null, 'col' => 'col-md-6', ]); Facade::component('invoice_text', 'partials.form.invoice_text', [ diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 18c93b71d..a97f34f92 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -435,7 +435,6 @@ export default { this.$emit('change', this.selected); // Option changed sort_option data - /* if (this.group) { this.sort_options.forEach(function (option_group, group_index) { this.option_group.value.forEach(function (option, index) { @@ -446,7 +445,7 @@ export default { let options = []; this.selected.forEach(function (selected_option_id, selected_index) { - if (option.value = this.selected) { + if (option.key == this.selected) { indexs.push(selected_index); values.push(option.id); labels.push(option.value); @@ -459,7 +458,7 @@ export default { this.$emit('label', labels); this.$emit('option', options); } else { - if (option.value = this.selected) { + if (option.key == this.selected) { this.$emit('index', index); this.$emit('value', option.id); this.$emit('label', option.value); @@ -477,7 +476,7 @@ export default { let options = []; this.selected.forEach(function (selected_option_id, selected_index) { - if (option.value = this.selected) { + if (option.key == this.selected) { indexs.push(selected_index); values.push(option.id); labels.push(option.value); @@ -490,7 +489,7 @@ export default { this.$emit('label', labels); this.$emit('option', options); } else { - if (option.value = this.selected) { + if (option.key == this.selected) { this.$emit('index', index); this.$emit('value', option.id); this.$emit('label', option.value); @@ -499,7 +498,6 @@ export default { } }, this); } - */ }, visibleChange(event) { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index 80a139074..d502d9882 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -551,7 +551,6 @@ export default { this.$emit('change', this.selected); // Option changed sort_option data - /* if (this.group) { this.sort_options.forEach(function (option_group, group_index) { this.option_group.value.forEach(function (option, index) { @@ -562,7 +561,7 @@ export default { let options = []; this.selected.forEach(function (selected_option_id, selected_index) { - if (option.value = this.selected) { + if (option.value == this.selected) { indexs.push(selected_index); values.push(option.id); labels.push(option.value); @@ -575,7 +574,7 @@ export default { this.$emit('label', labels); this.$emit('option', options); } else { - if (option.value = this.selected) { + if (option.value == this.selected) { this.$emit('index', index); this.$emit('value', option.id); this.$emit('label', option.value); @@ -593,7 +592,7 @@ export default { let options = []; this.selected.forEach(function (selected_option_id, selected_index) { - if (option.value = this.selected) { + if (option.value == this.selected) { indexs.push(selected_index); values.push(option.id); labels.push(option.value); @@ -606,7 +605,7 @@ export default { this.$emit('label', labels); this.$emit('option', options); } else { - if (option.value = this.selected) { + if (option.value == this.selected) { this.$emit('index', index); this.$emit('value', option.id); this.$emit('label', option.value); @@ -615,7 +614,6 @@ export default { } }, this); } - */ }, visibleChange(event) {