From 81852f00fa922e813e749a70f816582d03d70eb9 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Mon, 31 May 2021 16:18:30 +0300
Subject: [PATCH 1/2] Javascript console error fixed

---
 resources/assets/js/components/AkauntingModalAddNew.vue  | 3 ++-
 resources/assets/js/components/AkauntingSelect.vue       | 4 +---
 resources/assets/js/components/AkauntingSelectRemote.vue | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

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 : '<div id="modal-add-new-form-' + form_prefix + '">' + this.message + '</div>',
-
+                    mixins: [Global],
                     components: {
                         AkauntingRadioGroup,
                         AkauntingSelect,
diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 262960718..4a232ca1c 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -318,9 +318,7 @@ export default {
         this.selected = this.value;
 
         if (this.model.length) {
-            if (eval(this.model) !== undefined) {
-                this.selected = eval(this.model);
-            } else {
+            if (this.model !== undefined) {
                 this.selected = this.model;
             }
         }
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index e6e164de6..277ecc400 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -430,9 +430,7 @@ export default {
         this.selected = this.value;
 
         if (this.model.length) {
-            if (eval(this.model) !== undefined) {
-                this.selected = eval(this.model);
-            } else {
+            if (this.model !== undefined) {
                 this.selected = this.model;
             }
         }

From 8808d326ce6099ee86e62f24b551cc1497fba1db Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Mon, 31 May 2021 18:46:16 +0300
Subject: [PATCH 2/2] Try cactch control edited

---
 resources/assets/js/components/AkauntingSelect.vue       | 9 ++++++++-
 resources/assets/js/components/AkauntingSelectRemote.vue | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 4a232ca1c..3dc640606 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -318,9 +318,16 @@ export default {
         this.selected = this.value;
 
         if (this.model.length) {
-            if (this.model !== undefined) {
+            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 277ecc400..73f90a0e7 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -430,9 +430,16 @@ export default {
         this.selected = this.value;
 
         if (this.model.length) {
-            if (this.model !== undefined) {
+            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) {