shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2745 from brkcvn/master

Browse Source 
New badge appear into the tax
This commit is contained in:
Burak Civan 2022-11-16 17:45:06 +03:00 committed by GitHub
commit 39b8dff371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/assets/js/components/AkauntingSelect.vue
View File

@ -73,7 +73,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span> <span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
<el-option-group <el-option-group
@ -88,7 +88,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left">{{ option.value }}</span> <span class="float-left">{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
</el-option-group> </el-option-group>
@ -105,7 +105,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component> <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected]">{{ addNew.new_text }}</span> <span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" class="hidden"> <select :name="name" :id="name" class="hidden">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option> <option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
@ -421,7 +421,8 @@ export default {
values.push({ values.push({
key: key.toString(), key: key.toString(),
value: value, value: value,
level: 0 level: 0,
mark_new: false,
}); });
} }
@ -437,14 +438,16 @@ export default {
index: index, index: index,
key: index.toString(), key: index.toString(),
value: option, value: option,
level: 0 level: 0,
mark_new: false,
}); });
} else { } else {
this.sorted_options.push({ this.sorted_options.push({
index: index, index: index,
key: option.id.toString(), key: option.id.toString(),
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name, value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name,
level: (option.level) ? option.level : 0 level: (option.level) ? option.level : 0,
mark_new: (option.mark_new) ? option.mark_new : false,
}); });
} }
}, this); }, this);
@ -456,7 +459,8 @@ export default {
this.sorted_options.push({ this.sorted_options.push({
key: key.toString(), key: key.toString(),
value: value, value: value,
level: 0 level: 0,
mark_new: false,
}); });
} }
} else { } else {
@ -466,14 +470,16 @@ export default {
index: index, index: index,
key: index.toString(), key: index.toString(),
value: option, value: option,
level: 0 level: 0,
mark_new: false,
}); });
} else { } else {
this.sorted_options.push({ this.sorted_options.push({
index: index, index: index,
key: option.id.toString(), key: option.id.toString(),
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name, value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name,
level: (option.level) ? option.level : 0 level: (option.level) ? option.level : 0,
mark_new: (option.mark_new) ? option.mark_new : false,
}); });
} }
}, this); }, this);

12
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -70,7 +70,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span> <span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
<el-option-group <el-option-group
@ -85,7 +85,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span> <span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
</el-option-group> </el-option-group>
@ -102,7 +102,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component> <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected]">{{ addNew.new_text }}</span> <span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" class="hidden"> <select :name="name" :id="name" class="hidden">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option> <option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
@ -170,7 +170,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span> <span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
<el-option-group <el-option-group
@ -185,7 +185,7 @@
:label="option.value" :label="option.value"
:value="option.key"> :value="option.key">
<span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span> <span class="float-left" :style="'padding-left: ' + (10 * option.level).toString() + 'px;'"><i v-if="option.level != 0" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2">subdirectory_arrow_right</i>{{ option.value }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span> <span class="new-badge absolute right-2 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[option.key] || (option.mark_new)">{{ addNew.new_text }}</span>
</el-option> </el-option>
</el-option-group> </el-option-group>
@ -202,7 +202,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component> <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected]">{{ addNew.new_text }}</span> <span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" v-model="selected" class="d-none"> <select :name="name" :id="name" v-model="selected" class="d-none">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option> <option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>