From db8507b8565e1ae8ca13b65c8b9d0cc6ab1e4164 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Fri, 30 Jul 2021 18:49:30 +0300
Subject: [PATCH 01/26] Focus on name input area is active when a new item is
 created

---
 .../assets/js/components/AkauntingItemButton.vue     |  5 +++--
 resources/assets/js/plugins/functions.js             | 12 +++++++++++-
 resources/assets/js/views/common/documents.js        |  8 ++++++++
 .../components/documents/form/line-item.blade.php    |  4 +++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 64fe00314..fb7e87884 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -280,6 +280,8 @@ export default {
         onItemList() {
             this.show.item_list = true;
 
+            console.log(this.$refs['input-item-field-' + this._uid].focus());
+
             setTimeout(function() {
                 this.$refs['input-item-field-' + this._uid].focus();
             }.bind(this), 100);
@@ -367,9 +369,8 @@ export default {
 
             this.selected_items.push(item);
 
-            this.$emit('item', item);
+            this.$emit('item', item)
             this.$emit('items', this.selected_items);
-
             this.setItemList(this.items);
 
             this.show.item_selected = false;
diff --git a/resources/assets/js/plugins/functions.js b/resources/assets/js/plugins/functions.js
index abd9bdddf..a55d63ae2 100644
--- a/resources/assets/js/plugins/functions.js
+++ b/resources/assets/js/plugins/functions.js
@@ -15,4 +15,14 @@ function getQueryVariable(variable) {
     return(false);
 }
 
-export {getQueryVariable}
+function promiseTimeout(time) {
+    return new Promise(function(resolve,reject) {
+      setTimeout(function(){
+          resolve(time);
+      }, time);
+    });
+};
+
+
+
+export {getQueryVariable, promiseTimeout}
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 3f252dc83..daefd8619 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -9,6 +9,8 @@ require('./../../bootstrap');
 import Vue from 'vue';
 
 import DashboardPlugin from './../../plugins/dashboard-plugin';
+import { promiseTimeout } from './../../plugins/functions';
+
 
 import Global from './../../mixins/global';
 
@@ -288,11 +290,16 @@ const app = new Vue({
             return totals_taxes;
         },
 
+
         // Select Item added form
         onSelectedItem(item) {
+            let { index } = item;
+
             let total = 1 * item.price;
             let item_taxes = [];
 
+            promiseTimeout(500).then(() => this.$refs['name-input'][index].focus());
+            
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {
                     if (this.taxes.includes(tax_id)) {
@@ -466,6 +473,7 @@ const app = new Vue({
                         methods: {
                             onSubmit(event) {
                                 this.form = event;
+
                                 this.form.response = {};
 
                                 this.loading = true;
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 1a5ae8ec4..ebd9ba116 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -32,7 +32,9 @@
                                             <span class="aka-text aka-text--body" tabindex="0" v-html="row.name" v-if="row.item_id"></span>
                                             <div v-else>
                                                 @stack('name_input_start')
-                                                <input type="text"
+                                                <input 
+                                                    type="text"
+                                                    ref="name-input"
                                                     class="form-control"
                                                     :name="'items.' + index + '.name'"
                                                     autocomplete="off"

From 7a4d28d755f90101fdd15274061525473a537d1c Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Tue, 3 Aug 2021 13:07:09 +0300
Subject: [PATCH 02/26] Input field is active after new item created

---
 .../js/components/AkauntingItemButton.vue     | 93 ++++++++-----------
 resources/assets/js/plugins/functions.js      | 18 ++--
 resources/assets/js/views/common/documents.js | 11 +--
 .../components/select-item-button.blade.php   |  2 +-
 4 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index fb7e87884..dd7c487b2 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -21,9 +21,9 @@
                                 type="text"
                                 data-input="true"
                                 class="form-control"
-                                autocapitalize="default" autocorrect="ON" 
+                                autocapitalize="default" 
+                                autocorrect="ON" 
                                 :placeholder="placeholder"
-                                :ref="'input-item-field-' + _uid"
                                 v-model="search"
                                 @input="onInput"
                                 @keydown.enter="onItemCreate"
@@ -33,7 +33,7 @@
                 </div>
 
                 <ul class="aka-select-menu-options">
-                    <div class="aka-select-menu-option" v-for="(item, index) in sortedItems" :key="index" @click="onItemSeleted(index, item.id)">
+                    <div class="aka-select-menu-option" v-for="(item, index) in sortedItems" :key="index" @click="onItemSelected(item)">
                         <div class="item-select w-100">
                             <div class="item-select-column item-select-info w-75">
                                 <b class="item-select-info-name"><span>{{ item.name }}</span></b>
@@ -196,7 +196,7 @@ export default {
     data() {
         return {
             item_list: [],
-            selected_items: [],
+            invoiceItems: [],
             search: '', // search column model
             show: {
                 item_selected: false,
@@ -208,6 +208,7 @@ export default {
                 show: false,
                 buttons: this.addNew.buttons,
             },
+            newItems: [],
             add_new_html: '',
             money: {
                 decimal: this.currency.decimal_mark,
@@ -279,12 +280,6 @@ export default {
 
         onItemList() {
             this.show.item_list = true;
-
-            console.log(this.$refs['input-item-field-' + this._uid].focus());
-
-            setTimeout(function() {
-                this.$refs['input-item-field-' + this._uid].focus();
-            }.bind(this), 100);
         },
 
         onInput() {
@@ -303,60 +298,55 @@ export default {
             }
 
             window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
-            .then(response => {
-                this.item_list = [];
+                        .then(response => {
+                            this.item_list = [];
 
-                let items = response.data.data;
+                            let items = response.data.data;
 
-                items.forEach(function (item, index) {
-                    this.item_list.push({
-                        index: index,
-                        key: item.id,
-                        value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
-                        type: this.type,
-                        id: item.id,
-                        name: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
-                        description: (item.description) ? item.description : '',
-                        price: (item.price) ? item.price : (this.price == 'purchase_price') ? item.purchase_price : item.sale_price,
-                        tax_ids: (item.tax_ids) ? item.tax_ids : [],
-                    });
-                }, this);
-            })
-            .catch(error => {
+                            items.forEach(function (item, index) {
+                                this.item_list.push({
+                                    index: index,
+                                    key: item.id,
+                                    value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
+                                    type: this.type,
+                                    id: item.id,
+                                    name: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
+                                    description: (item.description) ? item.description : '',
+                                    price: (item.price) ? item.price : (this.price == 'purchase_price') ? item.purchase_price : item.sale_price,
+                                    tax_ids: (item.tax_ids) ? item.tax_ids : [],
+                                });
+                            }, this);
+                        })
+                        .catch(error => {
 
-            });
+                        });
 
             this.$emit('input', this.search);
         },
 
-        onItemSeleted(index, item_id) {
-            let item = '';
+        onItemSelected(item) {
+            const indexeditem = { ...item, index: this.currentIndex };
 
-            this.item_list.forEach(function (item_list, item_index) {
-                if (item_list.id == item_id) {
-                    item = item_list;
-                }
-            });
+            this.addItem(indexeditem);
+        },
 
-            this.selected_items.push(item);
+        addItem(item) {
+            this.invoiceItems.push(item);
 
             this.$emit('item', item);
-            this.$emit('items', this.selected_items);
+            this.$emit('items', this.invoiceItems);
 
             this.show.item_selected = false;
             this.show.item_list = false;
-            this.search = '';
 
-            // Set deault item list
+            this.search = '';
+            // Set default item list
             this.setItemList(this.items);
         },
 
         onItemCreate() {
-            let index = Object.keys(this.item_list).length;
-            index++;
-
-            let item = {
-                index: index,
+            const newItem = {
+                index: this.newItems.length,
                 key: 0,
                 value: this.search,
                 type: this.type,
@@ -367,15 +357,9 @@ export default {
                 tax_ids: [],
             };
 
-            this.selected_items.push(item);
+            this.newItems.push(newItem);
 
-            this.$emit('item', item)
-            this.$emit('items', this.selected_items);
-            this.setItemList(this.items);
-
-            this.show.item_selected = false;
-            this.show.item_list = false;
-            this.search = '';
+            this.addItem(newItem);
 
             /*
             let add_new = this.add_new;
@@ -561,6 +545,9 @@ export default {
         sortedItems() {
             return this.sortItems();
         },
+        currentIndex() {
+            return this.invoiceItems.length;
+        },
     },
 
     watch: {
diff --git a/resources/assets/js/plugins/functions.js b/resources/assets/js/plugins/functions.js
index a55d63ae2..4dd8c7118 100644
--- a/resources/assets/js/plugins/functions.js
+++ b/resources/assets/js/plugins/functions.js
@@ -15,14 +15,12 @@ function getQueryVariable(variable) {
     return(false);
 }
 
-function promiseTimeout(time) {
-    return new Promise(function(resolve,reject) {
-      setTimeout(function(){
-          resolve(time);
-      }, time);
-    });
-};
+//This function wraps setTimeout function in a promise in order to display dom manipulations on root components asynchronously & fast 
+const setPromiseTimeout = time => 
+    new Promise(resolve => 
+        setTimeout(() => 
+            resolve(time)
+        , time)
+    );
 
-
-
-export {getQueryVariable, promiseTimeout}
+export {getQueryVariable, setPromiseTimeout}
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index daefd8619..51d08507b 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -9,8 +9,7 @@ require('./../../bootstrap');
 import Vue from 'vue';
 
 import DashboardPlugin from './../../plugins/dashboard-plugin';
-import { promiseTimeout } from './../../plugins/functions';
-
+import { setPromiseTimeout } from './../../plugins/functions';
 
 import Global from './../../mixins/global';
 
@@ -291,15 +290,13 @@ const app = new Vue({
         },
 
 
-        // Select Item added form
-        onSelectedItem(item) {
+        // addItem to list
+        onAddItem(item) {
             let { index } = item;
-
             let total = 1 * item.price;
             let item_taxes = [];
 
-            promiseTimeout(500).then(() => this.$refs['name-input'][index].focus());
-            
+            setPromiseTimeout(200).then(() => this.$refs['name-input'][index].focus()); //add focus to new item name input 
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {
                     if (this.taxes.includes(tax_id)) {
diff --git a/resources/views/components/select-item-button.blade.php b/resources/views/components/select-item-button.blade.php
index f4855e6d3..61a34b49b 100644
--- a/resources/views/components/select-item-button.blade.php
+++ b/resources/views/components/select-item-button.blade.php
@@ -7,7 +7,7 @@
     :dynamic-currency="currency"
     :items="{{ json_encode($items) }}"
     :search-char-limit="{{ $searchCharLimit }}"
-    @item="onSelectedItem($event)"
+    @item="onAddItem($event)"
     add-item-text="{{ trans('general.form.add_an', ['field' => trans_choice('general.items', 1)]) }}"
     create-new-item-text="{{ trans('general.title.create', ['type' =>  trans_choice('general.items', 1)]) }}"
 ></akaunting-item-button>

From 97ea0a1692c33648d716ee48e08ec181b8d1abcf Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Tue, 3 Aug 2021 13:40:48 +0300
Subject: [PATCH 03/26] Make input focused on dropdown open

---
 resources/assets/js/components/AkauntingItemButton.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index dd7c487b2..70a36c37a 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -1,7 +1,7 @@
 <template>
     <div :id="'select-item-button-' + _uid" class="product-select">
         <div class="item-add-new">
-            <button type="button" class="btn btn-link w-100" @click="onItemList">
+            <button type="button" class="btn btn-link w-100" @click="showItems">
                 <i class="fas fa-plus-circle"></i> &nbsp; {{ addItemText }}
             </button>
         </div>
@@ -10,7 +10,7 @@
             <div class="aka-select-menu" v-if="show.item_list">
                 <div class="aka-select-search-container">
                     <span class="aka-prefixed-input aka-prefixed-input--fluid">
-                        <div class="input-group input-group-merge">
+                        <div class="input-group input-group-merge focused">
                             <div class="input-group-prepend">
                                 <span class="input-group-text">
                                     <i class="fa fa-search"></i>
@@ -278,7 +278,7 @@ export default {
             }
         },
 
-        onItemList() {
+        showItems() {
             this.show.item_list = true;
         },
 

From 17a4237c0990c1100012c213352862e4ce2dfbc0 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Tue, 3 Aug 2021 13:44:10 +0300
Subject: [PATCH 04/26] Fix spacing

---
 resources/assets/js/views/common/documents.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 51d08507b..d0e088842 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -289,7 +289,6 @@ const app = new Vue({
             return totals_taxes;
         },
 
-
         // addItem to list
         onAddItem(item) {
             let { index } = item;

From fe4190c680026490ad5c3f0f9e307e77e4b7322e Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Mon, 23 Aug 2021 14:54:46 +0300
Subject: [PATCH 05/26] Highlighting matched items

---
 resources/assets/js/components/AkauntingItemButton.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 70a36c37a..9777ea3e6 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -297,6 +297,8 @@ export default {
                 return;
             }
 
+            this.onItemMatchedSearchQuery()
+
             window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
                         .then(response => {
                             this.item_list = [];
@@ -324,6 +326,8 @@ export default {
             this.$emit('input', this.search);
         },
 
+        onItemMatchedSearchQuery() {},
+
         onItemSelected(item) {
             const indexeditem = { ...item, index: this.currentIndex };
 
@@ -573,7 +577,7 @@ export default {
                 }
             },
             deep: true
-        }
+        },
     },
 };
 </script>

From 0820b70a78a04af23c2a79273f51b26df626252f Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Tue, 24 Aug 2021 15:42:01 +0300
Subject: [PATCH 06/26] Focus the first matched item && enter event adds
 existing item that is matched

---
 .../js/components/AkauntingItemButton.vue     | 105 ++++++------------
 .../views/install/language/create.blade.php   |  12 +-
 resources/views/layouts/install.blade.php     |  60 +---------
 3 files changed, 41 insertions(+), 136 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 9777ea3e6..d9ef149d0 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -33,7 +33,13 @@
                 </div>
 
                 <ul class="aka-select-menu-options">
-                    <div class="aka-select-menu-option" v-for="(item, index) in sortedItems" :key="index" @click="onItemSelected(item)">
+                    <div 
+                        class="aka-select-menu-option" 
+                        v-for="(item, index) in sortedItems" 
+                        :key="index" 
+                        :class="isItemMatched ? 'highlightItem' : ''"
+                        @click="onItemSelected(item)"
+                    >
                         <div class="item-select w-100">
                             <div class="item-select-column item-select-info w-75">
                                 <b class="item-select-info-name"><span>{{ item.name }}</span></b>
@@ -202,6 +208,7 @@ export default {
                 item_selected: false,
                 item_list: false,
             },
+            isItemMatched: false,
             form: {},
             add_new: {
                 text: this.addNew.text,
@@ -221,6 +228,10 @@ export default {
         };
     },
 
+    created() {
+        this.setItemList(this.items);
+    },
+
     mounted() {
         if (this.dynamicCurrency.code != this.currency.code) {
             if (!this.dynamicCurrency.decimal) {
@@ -283,6 +294,8 @@ export default {
         },
 
         onInput() {
+            this.isItemMatched = false; //to remove the style from first item on input change (option)
+
             //to optimize performance we kept the condition that checks for if search exists or not
             if (!this.search) {
                 return;
@@ -297,9 +310,17 @@ export default {
                 return;
             }
 
-            this.onItemMatchedSearchQuery()
+            this.fetchMatchedItems();
 
-            window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
+            this.item_list.length > 0
+                ? this.isItemMatched = true
+                : {}
+
+            this.$emit('input', this.search);
+        },
+
+        async fetchMatchedItems() {
+            await window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
                         .then(response => {
                             this.item_list = [];
 
@@ -319,15 +340,9 @@ export default {
                                 });
                             }, this);
                         })
-                        .catch(error => {
-
-                        });
-
-            this.$emit('input', this.search);
+                        .catch(error => {});
         },
 
-        onItemMatchedSearchQuery() {},
-
         onItemSelected(item) {
             const indexeditem = { ...item, index: this.currentIndex };
 
@@ -344,12 +359,13 @@ export default {
             this.show.item_list = false;
 
             this.search = '';
+
             // Set default item list
             this.setItemList(this.items);
         },
 
         onItemCreate() {
-            const newItem = {
+            let item = {
                 index: this.newItems.length,
                 key: 0,
                 value: this.search,
@@ -361,60 +377,11 @@ export default {
                 tax_ids: [],
             };
 
-            this.newItems.push(newItem);
+            this.item_list.length === 1 
+                ? item = this.item_list[0] 
+                : this.newItems.push(item)
 
-            this.addItem(newItem);
-
-            /*
-            let add_new = this.add_new;
-
-            window.axios.get(this.createRoute)
-            .then(response => {
-                add_new.show = true;
-                add_new.html = response.data.html;
-
-                this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
-                    resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
-
-                        components: {
-                            [Select.name]: Select,
-                            [Option.name]: Option,
-                            [OptionGroup.name]: OptionGroup,
-                            [ColorPicker.name]: ColorPicker,
-                            AkauntingModalAddNew,
-                            AkauntingModal,
-                            AkauntingMoney,
-                            AkauntingRadioGroup,
-                            AkauntingSelect,
-                            AkauntingDate,
-                        },
-
-                        data: function () {
-                            return {
-                                add_new: add_new,
-                            }
-                        },
-
-                        methods: {
-                            onSubmit(event) {
-                                this.$emit('submit', event);
-                            },
-
-                            onCancel(event) {
-                                this.$emit('cancel', event);
-                            }
-                        }
-                    })
-                });
-            })
-            .catch(e => {
-                console.log(e);
-            })
-            .finally(function () {
-                // always executed
-            });
-            */
+            this.addItem(item);
         },
 
         onSubmit(event) {
@@ -541,10 +508,6 @@ export default {
         },
     },
 
-    created() {
-        this.setItemList(this.items);
-    },
-
     computed: {
         sortedItems() {
             return this.sortItems();
@@ -581,3 +544,9 @@ export default {
     },
 };
 </script>
+
+<style scoped>
+    .highlightItem:first-child {
+        background-color: #F5F7FA;    
+    }
+</style>
diff --git a/resources/views/install/language/create.blade.php b/resources/views/install/language/create.blade.php
index 356f6f1e1..849716352 100644
--- a/resources/views/install/language/create.blade.php
+++ b/resources/views/install/language/create.blade.php
@@ -3,15 +3,5 @@
 @section('header', trans('install.steps.language'))
 
 @section('content')
-    <div class="row">
-        <div class="col-md-12">
-            <div class="form-group mb-0">
-                <select name="lang" id="lang" size="14" class="col-xl-12 form-control-label">
-                    @foreach (language()->allowed() as $code => $name)
-                        <option value="{{ $code }}" @if ($code == 'en-GB') {{ 'selected="selected"' }} @endif>{{ $name }}</option>
-                    @endforeach
-                </select>
-            </div>
-        </div>
-    </div>
+
 @endsection
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index e3fc92f79..8a0c1e311 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -1,69 +1,15 @@
 <html>
     @include('partials.install.head')
 
+    @stack('body_start')
     <body class="installation-page">
-
         <div class="main-content">
-            <div class="header pt-3 pb-2">
                 <div class="container">
-                    <div class="header-body text-center mb-5">
-                        <div class="row justify-content-center">
-                            <div class="col-md-8 col-lg-6 col-xl-5">
-                                <img class="pb-6" src="{{ asset('public/img/akaunting-logo-white.svg') }}" width="22%" alt="Akaunting"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="container mt--7 pb-5">
-                <div class="row justify-content-center">
-                    <div class="col-lg-5 col-md-7">
-                        <div id="app">
-                            {!! Form::open([
-                                'url' => url()->current(),
-                                'role' => 'form',
-                                'id' => 'form-install',
-                                '@submit.prevent' => 'onSubmit',
-                                '@keydown' => 'form.errors.clear($event.target.name)',
-                            ]) !!}
-                            <div class="card-body">
-                                <div class="text-center text-muted mt-2 mb-4">
-                                    <small>@yield('header')</small>
-                                </div>
-
-                                @include('flash::message')
-
-                                @yield('content')
-                            </div>
-
-                            <div class="card-footer">
-                                <div class="float-right">
-                                    @if (Request::is('install/requirements'))
-                                        <a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }}</a>
-                                    @else
-                                        {!! Form::button(
-                                            '<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
-                                            trans('install.next'),
-                                            [
-                                                ':disabled' => 'loading',
-                                                'type' => 'submit',
-                                                'id' => 'next-button',
-                                                'class' => 'btn btn-success'
-                                            ]
-                                        ) !!}
-                                    @endif
-                                </div>
-                            </div>
-                            {!! Form::close() !!}
-                        </div>
-                    </div>
+                    @stack('body_start')
+                    <div id="app"></div>
                 </div>
             </div>
         </div>
-
         @include('partials.install.scripts')
-
     </body>
-
 </html>

From 197aa5ce1aade359c8edadc9978a93161dadb83f Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Wed, 25 Aug 2021 10:36:33 +0300
Subject: [PATCH 07/26] Refactor

---
 resources/assets/js/components/AkauntingItemButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index d9ef149d0..5484c492b 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -540,7 +540,7 @@ export default {
                 }
             },
             deep: true
-        },
+        }
     },
 };
 </script>

From e6b0aa3ead141ff1a09037fb0e93c82f37ab8239 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Wed, 25 Aug 2021 11:21:15 +0300
Subject: [PATCH 08/26] Undo unwanted changes in branch

---
 .../views/install/language/create.blade.php   | 12 +++-
 resources/views/layouts/install.blade.php     | 58 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/resources/views/install/language/create.blade.php b/resources/views/install/language/create.blade.php
index 849716352..356f6f1e1 100644
--- a/resources/views/install/language/create.blade.php
+++ b/resources/views/install/language/create.blade.php
@@ -3,5 +3,15 @@
 @section('header', trans('install.steps.language'))
 
 @section('content')
-
+    <div class="row">
+        <div class="col-md-12">
+            <div class="form-group mb-0">
+                <select name="lang" id="lang" size="14" class="col-xl-12 form-control-label">
+                    @foreach (language()->allowed() as $code => $name)
+                        <option value="{{ $code }}" @if ($code == 'en-GB') {{ 'selected="selected"' }} @endif>{{ $name }}</option>
+                    @endforeach
+                </select>
+            </div>
+        </div>
+    </div>
 @endsection
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index 8a0c1e311..9f49d9012 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -3,13 +3,67 @@
 
     @stack('body_start')
     <body class="installation-page">
+
         <div class="main-content">
+            <div class="header pt-3 pb-2">
                 <div class="container">
-                    @stack('body_start')
-                    <div id="app"></div>
+                    <div class="header-body text-center mb-5">
+                        <div class="row justify-content-center">
+                            <div class="col-md-8 col-lg-6 col-xl-5">
+                                <img class="pb-6" src="{{ asset('public/img/akaunting-logo-white.svg') }}" width="22%" alt="Akaunting"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="container mt--7 pb-5">
+                <div class="row justify-content-center">
+                    <div class="col-lg-5 col-md-7">
+                        <div id="app">
+                            {!! Form::open([
+                                'url' => url()->current(),
+                                'role' => 'form',
+                                'id' => 'form-install',
+                                '@submit.prevent' => 'onSubmit',
+                                '@keydown' => 'form.errors.clear($event.target.name)',
+                            ]) !!}
+                            <div class="card-body">
+                                <div class="text-center text-muted mt-2 mb-4">
+                                    <small>@yield('header')</small>
+                                </div>
+
+                                @include('flash::message')
+
+                                @yield('content')
+                            </div>
+
+                            <div class="card-footer">
+                                <div class="float-right">
+                                    @if (Request::is('install/requirements'))
+                                        <a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }}</a>
+                                    @else
+                                        {!! Form::button(
+                                            '<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
+                                            trans('install.next'),
+                                            [
+                                                ':disabled' => 'loading',
+                                                'type' => 'submit',
+                                                'id' => 'next-button',
+                                                'class' => 'btn btn-success'
+                                            ]
+                                        ) !!}
+                                    @endif
+                                </div>
+                            </div>
+                            {!! Form::close() !!}
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
+
         @include('partials.install.scripts')
+
     </body>
 </html>

From b43b7265876226c8efecaf8c52468e2eaf002569 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Wed, 25 Aug 2021 11:58:33 +0300
Subject: [PATCH 09/26] Lint & refactor

---
 .../js/components/AkauntingItemButton.vue     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 5484c492b..fec7ddd20 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -202,7 +202,7 @@ export default {
     data() {
         return {
             item_list: [],
-            invoiceItems: [],
+            selected_items: [],
             search: '', // search column model
             show: {
                 item_selected: false,
@@ -321,26 +321,25 @@ export default {
 
         async fetchMatchedItems() {
             await window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
-                        .then(response => {
-                            this.item_list = [];
+                .then(response => {
+                    this.item_list = [];
+                    let items = response.data.data;
 
-                            let items = response.data.data;
-
-                            items.forEach(function (item, index) {
-                                this.item_list.push({
-                                    index: index,
-                                    key: item.id,
-                                    value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
-                                    type: this.type,
-                                    id: item.id,
-                                    name: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
-                                    description: (item.description) ? item.description : '',
-                                    price: (item.price) ? item.price : (this.price == 'purchase_price') ? item.purchase_price : item.sale_price,
-                                    tax_ids: (item.tax_ids) ? item.tax_ids : [],
-                                });
-                            }, this);
-                        })
-                        .catch(error => {});
+                    items.forEach(function (item, index) {
+                        this.item_list.push({
+                            index: index,
+                            key: item.id,
+                            value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
+                            type: this.type,
+                            id: item.id,
+                            name: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
+                            description: (item.description) ? item.description : '',
+                            price: (item.price) ? item.price : (this.price == 'purchase_price') ? item.purchase_price : item.sale_price,
+                            tax_ids: (item.tax_ids) ? item.tax_ids : [],
+                        });
+                    }, this);
+                })
+                .catch(error => {});
         },
 
         onItemSelected(item) {
@@ -350,10 +349,10 @@ export default {
         },
 
         addItem(item) {
-            this.invoiceItems.push(item);
+            this.selected_items.push(item);
 
             this.$emit('item', item);
-            this.$emit('items', this.invoiceItems);
+            this.$emit('items', this.selected_items);
 
             this.show.item_selected = false;
             this.show.item_list = false;
@@ -513,7 +512,7 @@ export default {
             return this.sortItems();
         },
         currentIndex() {
-            return this.invoiceItems.length;
+            return this.selected_items.length;
         },
     },
 

From 37eff2d98099599b50fc031edecaa0c1bf8f1657 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Wed, 25 Aug 2021 14:55:01 +0300
Subject: [PATCH 10/26] Disable form submission on every keydown event

---
 resources/assets/js/views/common/documents.js               | 2 +-
 resources/views/components/documents/form/buttons.blade.php | 2 +-
 resources/views/partials/form/save_buttons.blade.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 767f631ec..4059f9fdd 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -49,7 +49,6 @@ const app = new Vue({
             tax: false,
             discounts: [],
             tax_id: [],
-
             items: [],
             taxes: [],
             page_loaded: false,
@@ -310,6 +309,7 @@ const app = new Vue({
             let item_taxes = [];
 
             setPromiseTimeout(200).then(() => this.$refs['name-input'][index].focus()); //add focus to new item name input 
+            
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {
                     if (this.taxes.includes(tax_id)) {
diff --git a/resources/views/components/documents/form/buttons.blade.php b/resources/views/components/documents/form/buttons.blade.php
index 56da609e3..6171e993a 100644
--- a/resources/views/components/documents/form/buttons.blade.php
+++ b/resources/views/components/documents/form/buttons.blade.php
@@ -1,7 +1,7 @@
 
     <div class="card">
         <div class="card-footer">
-            <div class="row save-buttons">
+            <div class="row save-buttons" @click="onSubmit">
                 {{ Form::saveButtons($routeCancel) }}
             </div>
         </div>
diff --git a/resources/views/partials/form/save_buttons.blade.php b/resources/views/partials/form/save_buttons.blade.php
index c90988b8f..06a0ada41 100644
--- a/resources/views/partials/form/save_buttons.blade.php
+++ b/resources/views/partials/form/save_buttons.blade.php
@@ -12,7 +12,7 @@
 
         {!! Form::button(
         '<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
-        [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success']) !!}
+        [':disabled' => 'form.loading', 'class' => 'btn btn-icon btn-success']) !!}
     </div>
 
 @stack('save_buttons_end')

From b6f3cc7c8fcecd894250b81a5416d2a7595bc29c Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Wed, 25 Aug 2021 19:51:38 +0300
Subject: [PATCH 11/26] Focus on next input when pressed enter

---
 .../assets/js/components/AkauntingItemButton.vue |  8 ++++----
 resources/assets/js/views/common/documents.js    | 16 +++++++++++++---
 .../documents/form/line-item.blade.php           | 16 ++++++++++------
 .../views/partials/form/money_group.blade.php    |  5 +++++
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index fec7ddd20..7ed6378e6 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -345,13 +345,13 @@ export default {
         onItemSelected(item) {
             const indexeditem = { ...item, index: this.currentIndex };
 
-            this.addItem(indexeditem);
+            this.addItem(indexeditem, 'oldItem');
         },
 
-        addItem(item) {
+        addItem(item, itemType) {
             this.selected_items.push(item);
 
-            this.$emit('item', item);
+            this.$emit('item',  { item, itemType } );
             this.$emit('items', this.selected_items);
 
             this.show.item_selected = false;
@@ -380,7 +380,7 @@ export default {
                 ? item = this.item_list[0] 
                 : this.newItems.push(item)
 
-            this.addItem(item);
+            this.addItem(item, 'newItem');
         },
 
         onSubmit(event) {
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 4059f9fdd..c39dc05c4 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -97,6 +97,14 @@ const app = new Vue({
     },
 
     methods: {
+        onRefFocus(ref, index) {
+            ref
+                ?  ref === 'price' 
+                    ?  setPromiseTimeout(100).then(() => this.$refs[ref][0].$children[0].$el.focus())
+                    :  setPromiseTimeout(100).then(() => this.$refs[ref][index].focus())
+                : {}
+        },
+
         onCalculateTotal() {
             let global_discount = parseFloat(this.form.discount);
             let discount_total = 0;
@@ -303,12 +311,14 @@ const app = new Vue({
         },
 
         // addItem to list
-        onAddItem(item) {
+        onAddItem(payload) {
+            let { item, itemType } = payload
             let { index } = item;
+            let inputRef = `${itemType === 'newItem' ? 'name' : 'description'}`; // indication for which input to focus first
             let total = 1 * item.price;
             let item_taxes = [];
-
-            setPromiseTimeout(200).then(() => this.$refs['name-input'][index].focus()); //add focus to new item name input 
+            
+            this.onRefFocus(inputRef, index); // trigger initial focus event on input
             
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index e93ff799c..762569005 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -34,7 +34,7 @@
                                                 @stack('name_input_start')
                                                 <input 
                                                     type="text"
-                                                    ref="name-input"
+                                                    ref="name"
                                                     class="form-control"
                                                     :name="'items.' + index + '.name'"
                                                     autocomplete="off"
@@ -42,8 +42,8 @@
                                                     data-item="name"
                                                     v-model="row.name"
                                                     @input="onBindingItemField(index, 'name')"
-                                                    @change="form.errors.clear('items.' + index + '.name')">
-
+                                                    @change="form.errors.clear('items.' + index + '.name')"
+                                                    @keydown.enter="onRefFocus('description', index)">
                                                 <div class="invalid-feedback d-block"
                                                     v-if="form.errors.has('items.' + index + '.name')"
                                                     v-html="form.errors.get('items.' + index + '.name')">
@@ -59,6 +59,7 @@
                                         @if (!$hideDescription)
                                             <textarea
                                                 class="form-control"
+                                                ref="description"
                                                 placeholder="{{ trans('items.enter_item_description') }}"
                                                 style="height: 46px; overflow: hidden;"
                                                 :name="'items.' + index + '.description'"
@@ -66,6 +67,8 @@
                                                 data-item="description"
                                                 resize="none"
                                                 @input="onBindingItemField(index, 'description')"
+                                                @keydown.enter.exact.prevent
+                                                @keydown.enter.exact="onRefFocus('quantity', index)"
                                             ></textarea>
                                         @endif
                                     </td>
@@ -81,6 +84,7 @@
                                         <input
                                             type="number"
                                             min="0"
+                                            ref="quantity"
                                             class="form-control text-center p-0 input-number-disabled"
                                             :name="'items.' + index + '.quantity'"
                                             autocomplete="off"
@@ -88,8 +92,8 @@
                                             data-item="quantity"
                                             v-model="row.quantity"
                                             @input="onCalculateTotal"
-                                            @change="form.errors.clear('items.' + index + '.quantity')">
-
+                                            @change="form.errors.clear('items.' + index + '.quantity')"
+                                            @keydown.enter="onRefFocus('price', index)">
                                         <div class="invalid-feedback d-block"
                                             v-if="form.errors.has('items.' + index + '.quantity')"
                                             v-html="form.errors.get('items.' + index + '.quantity')">
@@ -105,7 +109,7 @@
                                 @if (!$hidePrice)
                                     <div>
                                         @stack('price_input_start')
-                                            {{ Form::moneyGroup('price', '', '', ['required' => 'required', 'row-input' => 'true', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price p-0') }}
+                                            {{ Form::moneyGroup('price', '', '', ['required' => 'required', 'inputRef' => 'price', 'row-input' => 'true', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price p-0') }}
                                         @stack('price_input_end')
                                     </div>
                                 @endif
diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php
index fca3dfa66..e67f17818 100644
--- a/resources/views/partials/form/money_group.blade.php
+++ b/resources/views/partials/form/money_group.blade.php
@@ -27,6 +27,10 @@
         v-if="{{ $attributes['show'] }}"
         @endif
 
+        @if (isset($attributes['inputRef']))
+        ref="{{ $attributes['inputRef'] }}"
+        @endif
+
         @if (isset($attributes['masked']))
         :masked="{{ ($attributes['masked']) ? 'true' : 'false' }}"
         @endif
@@ -74,6 +78,7 @@
         @if (isset($attributes['row-input']))
         :row-input="{{ $attributes['row-input'] }}"
         @endif
+
     ></akaunting-money>
 
 @stack($name . '_input_end')

From 54442bd8ea213a88dc7b6a871b6980695db172fe Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 26 Aug 2021 09:24:03 +0300
Subject: [PATCH 12/26] Fix data type for default period

---
 resources/assets/js/components/AkauntingDate.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue
index 5976d5a49..4a7b5ac39 100644
--- a/resources/assets/js/components/AkauntingDate.vue
+++ b/resources/assets/js/components/AkauntingDate.vue
@@ -66,7 +66,7 @@ export default {
 
         period: {
             type: [Number, String],
-            default: 0,
+            default: "0",
             description: "Payment period"
         },
 
@@ -145,7 +145,6 @@ export default {
         if (this.model) {
             this.real_model = this.model;
         }
-
         this.$emit('interface', this.real_model);
     },
 

From ef1f6c785ea9d7f59c9f70f4a1bf5eea77bdc2a2 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 26 Aug 2021 11:15:22 +0300
Subject: [PATCH 13/26] Required style for add new contact box

---
 public/css/akaunting-color.css                          | 2 +-
 resources/assets/js/components/AkauntingContactCard.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css
index 6b157e40d..3787d0138 100644
--- a/public/css/akaunting-color.css
+++ b/public/css/akaunting-color.css
@@ -2124,7 +2124,7 @@ button.bg-red:focus
 
 /*--------Form Error Color--------*/
 /*--Required Sign Color--*/
-div.required > .form-control-label:not(span):after, td.required:after
+div.required > .form-control-label:not(span):after, td.required:after, button.document-contact-without-contact-box-btn > span.text-add-contact::after
 {
     content: ' *';
     color: #ef3232;
diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue
index dfb7b989b..0a16184b3 100644
--- a/resources/assets/js/components/AkauntingContactCard.vue
+++ b/resources/assets/js/components/AkauntingContactCard.vue
@@ -9,7 +9,7 @@
                                 <div class="aka-box-content">
                                     <div class="document-contact-without-contact-box">
                                         <button type="button" class="btn-aka-link aka-btn--fluid document-contact-without-contact-box-btn" @click="onContactList">
-                                            <i class="far fa-user fa-2x"></i> &nbsp; {{ addContactText }}
+                                           <i class="far fa-user fa-2x"></i> &nbsp; <span class="text-add-contact"> {{ addContactText }} </span>
                                         </button>
                                     </div>
                                 </div>
@@ -198,7 +198,6 @@ export default {
             default: () => [],
             description: 'List of Contacts'
         },
-
         addNew: {
             type: Object,
             default: function () {

From d6f285211dac99e62adb0d5f027eb481991f2482 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 26 Aug 2021 14:50:27 +0300
Subject: [PATCH 14/26] Inputs active

---
 resources/assets/js/components/AkauntingItemButton.vue | 7 ++++++-
 resources/assets/js/views/common/documents.js          | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 7ed6378e6..39383f0b8 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -10,7 +10,7 @@
             <div class="aka-select-menu" v-if="show.item_list">
                 <div class="aka-select-search-container">
                     <span class="aka-prefixed-input aka-prefixed-input--fluid">
-                        <div class="input-group input-group-merge focused">
+                        <div class="input-group input-group-merge">
                             <div class="input-group-prepend">
                                 <span class="input-group-text">
                                     <i class="fa fa-search"></i>
@@ -26,6 +26,7 @@
                                 :placeholder="placeholder"
                                 v-model="search"
                                 @input="onInput"
+                                :ref="'input-item-field-' + _uid"
                                 @keydown.enter="onItemCreate"
                             />
                         </div>
@@ -291,6 +292,10 @@ export default {
 
         showItems() {
             this.show.item_list = true;
+
+            setTimeout(function() {
+                this.$refs['input-item-field-' + this._uid].focus();
+            }.bind(this), 100);
         },
 
         onInput() {
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index c39dc05c4..b8aa12562 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -92,8 +92,7 @@ const app = new Vue({
            }
 
            this.currency_symbol.symbol = default_currency_symbol;
-        }
-
+        };
     },
 
     methods: {

From 714fd00971c502601f2ae39d7f76b30ca0de8071 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Fri, 27 Aug 2021 15:29:43 +0300
Subject: [PATCH 15/26] Refactor

---
 .../js/components/AkauntingItemButton.vue       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 39383f0b8..4b9faaf53 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -27,7 +27,7 @@
                                 v-model="search"
                                 @input="onInput"
                                 :ref="'input-item-field-' + _uid"
-                                @keydown.enter="onItemCreate"
+                                @keydown.enter="inputEnterEvent"
                             />
                         </div>
                     </span>
@@ -324,6 +324,12 @@ export default {
             this.$emit('input', this.search);
         },
 
+        inputEnterEvent(event) {
+            this.isItemMatched 
+                ? this.onItemSelected()
+                : this.onItemCreate()
+        },
+
         async fetchMatchedItems() {
             await window.axios.get(url + '/common/items?search="' + this.search + '" limit:10')
                 .then(response => {
@@ -347,7 +353,8 @@ export default {
                 .catch(error => {});
         },
 
-        onItemSelected(item) {
+        onItemSelected() {
+            const item = this.item_list[0] 
             const indexeditem = { ...item, index: this.currentIndex };
 
             this.addItem(indexeditem, 'oldItem');
@@ -380,10 +387,8 @@ export default {
                 price: 0,
                 tax_ids: [],
             };
-
-            this.item_list.length === 1 
-                ? item = this.item_list[0] 
-                : this.newItems.push(item)
+            
+            this.newItems.push(item)
 
             this.addItem(item, 'newItem');
         },

From 5633689c176505fec2f0e7767583cff6fcc14199 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Fri, 27 Aug 2021 15:33:11 +0300
Subject: [PATCH 16/26] Change input enter event handler to use DOM

---
 resources/assets/js/views/common/documents.js         | 11 +++++++++--
 .../views/components/documents/form/buttons.blade.php |  1 -
 resources/views/partials/form/save_buttons.blade.php  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index b8aa12562..12f3db6e7 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -97,13 +97,20 @@ const app = new Vue({
 
     methods: {
         onRefFocus(ref, index) {
+            this.disableFormSubmission();
+
             ref
                 ?  ref === 'price' 
-                    ?  setPromiseTimeout(100).then(() => this.$refs[ref][0].$children[0].$el.focus())
+                    ?  setPromiseTimeout(100).then(() => this.$refs[ref][index].$children[0].$el.focus())
                     :  setPromiseTimeout(100).then(() => this.$refs[ref][index].focus())
                 : {}
         },
 
+        disableFormSubmission() {
+            const saveButtonEl = document.getElementsByClassName("btn btn-icon btn-success")[0];
+            saveButtonEl.setAttribute("type", "button");
+        },
+
         onCalculateTotal() {
             let global_discount = parseFloat(this.form.discount);
             let discount_total = 0;
@@ -316,7 +323,7 @@ const app = new Vue({
             let inputRef = `${itemType === 'newItem' ? 'name' : 'description'}`; // indication for which input to focus first
             let total = 1 * item.price;
             let item_taxes = [];
-            
+
             this.onRefFocus(inputRef, index); // trigger initial focus event on input
             
             if (item.tax_ids) {
diff --git a/resources/views/components/documents/form/buttons.blade.php b/resources/views/components/documents/form/buttons.blade.php
index 6171e993a..299d50f2f 100644
--- a/resources/views/components/documents/form/buttons.blade.php
+++ b/resources/views/components/documents/form/buttons.blade.php
@@ -1,4 +1,3 @@
-
     <div class="card">
         <div class="card-footer">
             <div class="row save-buttons" @click="onSubmit">
diff --git a/resources/views/partials/form/save_buttons.blade.php b/resources/views/partials/form/save_buttons.blade.php
index 06a0ada41..c90988b8f 100644
--- a/resources/views/partials/form/save_buttons.blade.php
+++ b/resources/views/partials/form/save_buttons.blade.php
@@ -12,7 +12,7 @@
 
         {!! Form::button(
         '<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
-        [':disabled' => 'form.loading', 'class' => 'btn btn-icon btn-success']) !!}
+        [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success']) !!}
     </div>
 
 @stack('save_buttons_end')

From bfcfad2694644d842d82d56b4471c85e98e9051d Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Fri, 27 Aug 2021 15:44:18 +0300
Subject: [PATCH 17/26] Upload correct view for accidentally pushed file

---
 resources/views/layouts/install.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index 9f49d9012..e3fc92f79 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -1,7 +1,6 @@
 <html>
     @include('partials.install.head')
 
-    @stack('body_start')
     <body class="installation-page">
 
         <div class="main-content">
@@ -66,4 +65,5 @@
         @include('partials.install.scripts')
 
     </body>
+
 </html>

From ae16753da947f89b4e1011a5fa46fca5a4af05c6 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Fri, 27 Aug 2021 15:54:08 +0300
Subject: [PATCH 18/26] Specift the input cleared style condition

---
 resources/assets/js/components/AkauntingItemButton.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index 4b9faaf53..b4d8b2a74 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -299,10 +299,9 @@ export default {
         },
 
         onInput() {
-            this.isItemMatched = false; //to remove the style from first item on input change (option)
-
             //to optimize performance we kept the condition that checks for if search exists or not
             if (!this.search) {
+                this.isItemMatched = false; //to remove the style from matched item on input is cleared (option)
                 return;
             }
 

From ccaa724a3fa6359f91f24a71e59d676c7524bbe2 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Tue, 31 Aug 2021 16:10:07 +0300
Subject: [PATCH 19/26] Remove unrelated event

---
 resources/views/components/documents/form/buttons.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/documents/form/buttons.blade.php b/resources/views/components/documents/form/buttons.blade.php
index 299d50f2f..8cc000789 100644
--- a/resources/views/components/documents/form/buttons.blade.php
+++ b/resources/views/components/documents/form/buttons.blade.php
@@ -1,6 +1,6 @@
     <div class="card">
         <div class="card-footer">
-            <div class="row save-buttons" @click="onSubmit">
+            <div class="row save-buttons">
                 {{ Form::saveButtons($routeCancel) }}
             </div>
         </div>

From f0b37c3bc9cdb154c04104f2ddf678d696313b80 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 10:54:36 +0300
Subject: [PATCH 20/26] Remove keydown.enter events that disable the submission
 for line items

---
 resources/assets/js/views/common/documents.js       | 13 +------------
 .../components/documents/form/line-item.blade.php   |  7 ++-----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 12f3db6e7..bb53fd334 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -97,18 +97,7 @@ const app = new Vue({
 
     methods: {
         onRefFocus(ref, index) {
-            this.disableFormSubmission();
-
-            ref
-                ?  ref === 'price' 
-                    ?  setPromiseTimeout(100).then(() => this.$refs[ref][index].$children[0].$el.focus())
-                    :  setPromiseTimeout(100).then(() => this.$refs[ref][index].focus())
-                : {}
-        },
-
-        disableFormSubmission() {
-            const saveButtonEl = document.getElementsByClassName("btn btn-icon btn-success")[0];
-            saveButtonEl.setAttribute("type", "button");
+            setPromiseTimeout(100).then(() => this.$refs[ref][index].focus());
         },
 
         onCalculateTotal() {
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 762569005..66449c21f 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -42,8 +42,7 @@
                                                     data-item="name"
                                                     v-model="row.name"
                                                     @input="onBindingItemField(index, 'name')"
-                                                    @change="form.errors.clear('items.' + index + '.name')"
-                                                    @keydown.enter="onRefFocus('description', index)">
+                                                    @change="form.errors.clear('items.' + index + '.name')"/>
                                                 <div class="invalid-feedback d-block"
                                                     v-if="form.errors.has('items.' + index + '.name')"
                                                     v-html="form.errors.get('items.' + index + '.name')">
@@ -68,7 +67,6 @@
                                                 resize="none"
                                                 @input="onBindingItemField(index, 'description')"
                                                 @keydown.enter.exact.prevent
-                                                @keydown.enter.exact="onRefFocus('quantity', index)"
                                             ></textarea>
                                         @endif
                                     </td>
@@ -92,8 +90,7 @@
                                             data-item="quantity"
                                             v-model="row.quantity"
                                             @input="onCalculateTotal"
-                                            @change="form.errors.clear('items.' + index + '.quantity')"
-                                            @keydown.enter="onRefFocus('price', index)">
+                                            @change="form.errors.clear('items.' + index + '.quantity')">
                                         <div class="invalid-feedback d-block"
                                             v-if="form.errors.has('items.' + index + '.quantity')"
                                             v-html="form.errors.get('items.' + index + '.quantity')">

From 5051d04e3e602f475e6d9e4e1415f703c5232666 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 12:00:19 +0300
Subject: [PATCH 21/26] Prevent possible bugs on create item functionality

---
 .../js/components/AkauntingItemButton.vue     | 23 ++++++++++++-------
 resources/assets/js/views/common/documents.js |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index b4d8b2a74..ae50fe46e 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -254,6 +254,8 @@ export default {
         setItemList(items) {
             this.item_list = [];
 
+            this.search.length === 0 ? this.isItemMatched = false : {}
+
             // Option set sort_option data
             if (!Array.isArray(items)) {
                 let index = 0;
@@ -299,6 +301,7 @@ export default {
         },
 
         onInput() {
+            this.isItemMatched = false;
             //to optimize performance we kept the condition that checks for if search exists or not
             if (!this.search) {
                 this.isItemMatched = false; //to remove the style from matched item on input is cleared (option)
@@ -314,16 +317,14 @@ export default {
                 return;
             }
 
-            this.fetchMatchedItems();
-
-            this.item_list.length > 0
-                ? this.isItemMatched = true
-                : {}
+            this.fetchMatchedItems().then(() => this.item_list.length > 0 ? this.isItemMatched = true : this.isItemMatched = false );
 
             this.$emit('input', this.search);
+
+            this.isItemMatched === true && this.search.length > 0  ? this.isItemMatched = true : this.isItemMatched = true;
         },
 
-        inputEnterEvent(event) {
+        inputEnterEvent() {
             this.isItemMatched 
                 ? this.onItemSelected()
                 : this.onItemCreate()
@@ -352,8 +353,14 @@ export default {
                 .catch(error => {});
         },
 
-        onItemSelected() {
-            const item = this.item_list[0] 
+        onItemSelected(clickSelectedItem) {
+            let item; 
+            const firstMatchedItem = this.item_list[0];
+            
+            const isClickSelectedItem = clickSelectedItem ? true : false;
+            
+            isClickSelectedItem ? item = clickSelectedItem  : item = firstMatchedItem;
+            
             const indexeditem = { ...item, index: this.currentIndex };
 
             this.addItem(indexeditem, 'oldItem');
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index bb53fd334..ebb22d41b 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -313,7 +313,7 @@ const app = new Vue({
             let total = 1 * item.price;
             let item_taxes = [];
 
-            this.onRefFocus(inputRef, index); // trigger initial focus event on input
+            this.onRefFocus(inputRef, index); // trigger initial focus event on input or description based on type of item added to the list
             
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {

From dfa4b9f0695c029f35c7038968152b849bffdc79 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 12:05:54 +0300
Subject: [PATCH 22/26] Remove unnecessary variables from blade

---
 resources/views/partials/form/money_group.blade.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php
index e67f17818..28e05e590 100644
--- a/resources/views/partials/form/money_group.blade.php
+++ b/resources/views/partials/form/money_group.blade.php
@@ -27,10 +27,6 @@
         v-if="{{ $attributes['show'] }}"
         @endif
 
-        @if (isset($attributes['inputRef']))
-        ref="{{ $attributes['inputRef'] }}"
-        @endif
-
         @if (isset($attributes['masked']))
         :masked="{{ ($attributes['masked']) ? 'true' : 'false' }}"
         @endif

From cda279475013d49e42389ad4d56961d8bc0566a8 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 12:08:19 +0300
Subject: [PATCH 23/26] Remove unnecessary variables from blade

---
 resources/views/components/documents/form/line-item.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 66449c21f..6607fa3d3 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -106,7 +106,7 @@
                                 @if (!$hidePrice)
                                     <div>
                                         @stack('price_input_start')
-                                            {{ Form::moneyGroup('price', '', '', ['required' => 'required', 'inputRef' => 'price', 'row-input' => 'true', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price p-0') }}
+                                            {{ Form::moneyGroup('price', '', '', ['required' => 'required', 'row-input' => 'true', 'v-model' => 'row.price', 'v-error' => 'form.errors.get(\'items.\' + index + \'.price\')', 'v-error-message' => 'form.errors.get(\'items.\' + index + \'.price\')' , 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; form.errors.clear(\'items.\' + index + \'.price\'); onCalculateTotal'], 0.00, 'text-right input-price p-0') }}
                                         @stack('price_input_end')
                                     </div>
                                 @endif

From a05763f99df0d79b023f82da11b374f507c69785 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 14:31:09 +0300
Subject: [PATCH 24/26] Remove preventing event from textarea

---
 resources/views/components/documents/form/line-item.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 6607fa3d3..37cbacfa5 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -66,7 +66,6 @@
                                                 data-item="description"
                                                 resize="none"
                                                 @input="onBindingItemField(index, 'description')"
-                                                @keydown.enter.exact.prevent
                                             ></textarea>
                                         @endif
                                     </td>

From 808306a8a2f38c25862a9217659b4308e4fcfa54 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 17:14:03 +0300
Subject: [PATCH 25/26] Add unique ref for focus events

---
 .../js/components/AkauntingItemButton.vue     |  9 +++-----
 resources/assets/js/views/common/documents.js | 22 ++++++++++++++-----
 .../documents/form/line-item.blade.php        |  6 ++---
 .../components/select-item-button.blade.php   |  2 +-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue
index ae50fe46e..4ca0af393 100644
--- a/resources/assets/js/components/AkauntingItemButton.vue
+++ b/resources/assets/js/components/AkauntingItemButton.vue
@@ -356,11 +356,8 @@ export default {
         onItemSelected(clickSelectedItem) {
             let item; 
             const firstMatchedItem = this.item_list[0];
-            
             const isClickSelectedItem = clickSelectedItem ? true : false;
-            
             isClickSelectedItem ? item = clickSelectedItem  : item = firstMatchedItem;
-            
             const indexeditem = { ...item, index: this.currentIndex };
 
             this.addItem(indexeditem, 'oldItem');
@@ -383,7 +380,7 @@ export default {
 
         onItemCreate() {
             let item = {
-                index: this.newItems.length,
+                index: this.currentIndex,
                 key: 0,
                 value: this.search,
                 type: this.type,
@@ -394,7 +391,7 @@ export default {
                 tax_ids: [],
             };
             
-            this.newItems.push(item)
+            this.newItems.push(item);
 
             this.addItem(item, 'newItem');
         },
@@ -528,7 +525,7 @@ export default {
             return this.sortItems();
         },
         currentIndex() {
-            return this.selected_items.length;
+            return this.$root.form.items.length;
         },
     },
 
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index ebb22d41b..640ada90d 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -50,6 +50,7 @@ const app = new Vue({
             discounts: [],
             tax_id: [],
             items: [],
+            selected_items:[],
             taxes: [],
             page_loaded: false,
             currencies: [],
@@ -96,8 +97,10 @@ const app = new Vue({
     },
 
     methods: {
-        onRefFocus(ref, index) {
-            setPromiseTimeout(100).then(() => this.$refs[ref][index].focus());
+        onRefFocus(ref) {
+            let index = this.form.items.length - 1;  
+
+            this.$refs['items-' + index + '-'  + ref][0].focus();
         },
 
         onCalculateTotal() {
@@ -305,15 +308,16 @@ const app = new Vue({
             return totals_taxes;
         },
 
+        onSelectedItem(item){
+            this.onAddItem(item);
+        },
+
         // addItem to list
         onAddItem(payload) {
-            let { item, itemType } = payload
-            let { index } = item;
+            let { item, itemType } = payload;
             let inputRef = `${itemType === 'newItem' ? 'name' : 'description'}`; // indication for which input to focus first
             let total = 1 * item.price;
             let item_taxes = [];
-
-            this.onRefFocus(inputRef, index); // trigger initial focus event on input or description based on type of item added to the list
             
             if (item.tax_ids) {
                 item.tax_ids.forEach(function (tax_id, index) {
@@ -359,8 +363,14 @@ const app = new Vue({
                 // invoice_item_checkbox_sample: [],
             });
 
+            setTimeout(function() {
+                this.onRefFocus(inputRef);
+            }.bind(this), 100);
+
             setTimeout(function() {
                 this.onCalculateTotal();
+
+                this.onRefFocus(inputRef);
             }.bind(this), 800);
         },
 
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 37cbacfa5..5001fb3de 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -34,7 +34,7 @@
                                                 @stack('name_input_start')
                                                 <input 
                                                     type="text"
-                                                    ref="name"
+                                                    :ref="'items-' + index + '-name'"
                                                     class="form-control"
                                                     :name="'items.' + index + '.name'"
                                                     autocomplete="off"
@@ -58,7 +58,7 @@
                                         @if (!$hideDescription)
                                             <textarea
                                                 class="form-control"
-                                                ref="description"
+                                                :ref="'items-' + index + '-description'"
                                                 placeholder="{{ trans('items.enter_item_description') }}"
                                                 style="height: 46px; overflow: hidden;"
                                                 :name="'items.' + index + '.description'"
@@ -81,7 +81,7 @@
                                         <input
                                             type="number"
                                             min="0"
-                                            ref="quantity"
+                                            :ref="'items-' + index + '-quantity'"
                                             class="form-control text-center p-0 input-number-disabled"
                                             :name="'items.' + index + '.quantity'"
                                             autocomplete="off"
diff --git a/resources/views/components/select-item-button.blade.php b/resources/views/components/select-item-button.blade.php
index 61a34b49b..f4855e6d3 100644
--- a/resources/views/components/select-item-button.blade.php
+++ b/resources/views/components/select-item-button.blade.php
@@ -7,7 +7,7 @@
     :dynamic-currency="currency"
     :items="{{ json_encode($items) }}"
     :search-char-limit="{{ $searchCharLimit }}"
-    @item="onAddItem($event)"
+    @item="onSelectedItem($event)"
     add-item-text="{{ trans('general.form.add_an', ['field' => trans_choice('general.items', 1)]) }}"
     create-new-item-text="{{ trans('general.title.create', ['type' =>  trans_choice('general.items', 1)]) }}"
 ></akaunting-item-button>

From fe3a481596dbd18cdf4f23cc9c7a327622ba4213 Mon Sep 17 00:00:00 2001
From: "benguozakinci@gmail.com"
 <akaunting-002@Akaunting-002s-MacBook-Pro.local>
Date: Thu, 2 Sep 2021 17:30:59 +0300
Subject: [PATCH 26/26] Remove repeating functions

---
 resources/assets/js/views/common/documents.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 640ada90d..c3587307a 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -369,8 +369,6 @@ const app = new Vue({
 
             setTimeout(function() {
                 this.onCalculateTotal();
-
-                this.onRefFocus(inputRef);
             }.bind(this), 800);
         },