Merge branch 'master' of https://github.com/brkcvn/akaunting into new-plans
This commit is contained in:
@@ -6,8 +6,8 @@
|
||||
<div class="w-full h-33 bg-white hover:bg-gray-100 rounded-lg border border-light-gray disabled:bg-gray-200 mt-1 text-purple font-medium" :class="[{'border-red': error}]">
|
||||
<div class="text-black h-full">
|
||||
<button type="button" class="w-full h-full flex flex-col items-center justify-center" @click="onContactList">
|
||||
<span class="material-icons-outlined text-7xl text-black-400">person_add</span>
|
||||
<span class="text-add-contact"> {{ addContactText }} </span>
|
||||
<span class="material-icons-outlined text-7xl text-black-400 pointer-events-none">person_add</span>
|
||||
<span class="text-add-contact pointer-events-none"> {{ addContactText }} </span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -26,9 +26,9 @@
|
||||
autocapitalize="default" autocorrect="ON"
|
||||
:placeholder="placeholder"
|
||||
:ref="'input-contact-field-' + _uid"
|
||||
v-model="search"
|
||||
@input="onInput"
|
||||
@keyup.enter="onInput"
|
||||
:value="search"
|
||||
@input="onInput($event)"
|
||||
@keyup.enter="onInput($event)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -304,7 +304,9 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
onInput() {
|
||||
onInput(event) {
|
||||
this.search = event.target.value;
|
||||
|
||||
window.axios.get(this.searchRoute + '?search="' + this.search + '" enabled:1 limit:10')
|
||||
.then(response => {
|
||||
this.contact_list = [];
|
||||
|
@@ -18,8 +18,8 @@
|
||||
autocapitalize="default"
|
||||
autocorrect="ON"
|
||||
:placeholder="placeholder"
|
||||
v-model="search"
|
||||
@input="onInput"
|
||||
:value="search"
|
||||
@input="onInput($event)"
|
||||
:ref="'input-item-field-' + _uid"
|
||||
/>
|
||||
</div>
|
||||
@@ -213,7 +213,9 @@ export default {
|
||||
}.bind(this), 100);
|
||||
},
|
||||
|
||||
onInput() {
|
||||
onInput(event) {
|
||||
this.search = event.target.value;
|
||||
|
||||
//to optimize performance we kept the condition that checks for if search exists or not
|
||||
if (!this.search) {
|
||||
return;
|
||||
|
@@ -16,8 +16,8 @@
|
||||
autocapitalize="default"
|
||||
autocorrect="ON"
|
||||
:placeholder="placeholder"
|
||||
v-model="search"
|
||||
@input="onInput"
|
||||
:value="search"
|
||||
@input="onInput($event)"
|
||||
:ref="'input-item-field-' + _uid"
|
||||
@keydown.enter="inputEnterEvent"
|
||||
/>
|
||||
@@ -282,7 +282,9 @@ export default {
|
||||
}.bind(this), 100);
|
||||
},
|
||||
|
||||
onInput() {
|
||||
onInput(event) {
|
||||
this.search = event.target.value;
|
||||
|
||||
this.isItemMatched = false;
|
||||
//to optimize performance we kept the condition that checks for if search exists or not
|
||||
if (!this.search) {
|
||||
|
2
resources/assets/js/plugins/bulk-action.js
vendored
2
resources/assets/js/plugins/bulk-action.js
vendored
@@ -62,7 +62,7 @@ export default class BulkAction {
|
||||
}
|
||||
|
||||
change(type) {
|
||||
let action = document.getElementById('button-bulk-action-' + type);
|
||||
let action = document.getElementById('index-bulk-actions-' + type);
|
||||
|
||||
this.value = type;
|
||||
|
||||
|
@@ -227,7 +227,7 @@
|
||||
|
||||
<div v-if="currencies.length && ! new_datas" class="w-full border-b hover:bg-gray-100" style="height:53px;">
|
||||
<button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
|
||||
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span>
|
||||
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
|
||||
<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">{{ translations.currencies.new_currency }}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
@@ -101,7 +101,7 @@
|
||||
|
||||
<div v-if="taxes.length" class="w-full border-b hover:bg-gray-100" style="height:53px;">
|
||||
<button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
|
||||
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span>
|
||||
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
|
||||
{{ translations.taxes.new_tax }}
|
||||
</button>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user