From 6e8588e06bf518b7f0d548dd1b8fef1e9e729c5a Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Wed, 19 Oct 2022 15:55:20 +0300
Subject: [PATCH] some console error fixed

---
 .../js/components/AkauntingContactCard.vue    | 40 +++++++++----------
 .../assets/js/components/AkauntingSearch.vue  | 10 ++---
 .../assets/js/components/AkauntingSelect.vue  |  4 +-
 .../js/components/AkauntingSelectRemote.vue   |  4 +-
 resources/assets/js/mixins/global.js          |  3 ++
 .../settings/categories/create.blade.php      |  2 +-
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue
index 5dee23121..113d18163 100644
--- a/resources/assets/js/components/AkauntingContactCard.vue
+++ b/resources/assets/js/components/AkauntingContactCard.vue
@@ -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>
@@ -556,6 +552,10 @@ export default {
                 document.removeEventListener('click', this.closeIfClickedOutside);
             }
         },
+
+        // closeIfClickedOutside() {
+        //     this.show.contact_list = false;
+        // }
     },
 
     created() {
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index dfdd14000..83ae1def0 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -76,9 +76,9 @@
                     <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" data-btn="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
                 </li>
 
-                <li ref="" v-if="search" class="p-2 hover:bg-lilac-900 dropdown-item">
-                    <button type="button" class="text-left" @click="onInputConfirm">{{ searchText }}</button>
-                </li>
+                <!-- <li ref="" v-if="search" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
+                    <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onInputConfirm">{{ searchText }}</button>
+                </li> -->
             </div>
 
             <div :id="'search-field-operator-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu operator" :class="[{'show': visible.operator}]">
@@ -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) {
diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 41321fac4..cee481cc3 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -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 = '';
                 }
             }
         }
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index f7a73337d..90db6c7be 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -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 = '';
             }
         }
     },
diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index a28565359..c938855c6 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -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
diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php
index e681c0703..0c646749c 100644
--- a/resources/views/settings/categories/create.blade.php
+++ b/resources/views/settings/categories/create.blade.php
@@ -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>