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

Invoice item add new item changes..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-03-07 17:18:29 +03:00
parent c300dd9402
commit b243b3f750
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,7 +381,7 @@
<span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
<select :name="name" v-model="real_model" class="d-none">
<option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
<option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
</select>
</base-input>
</template>

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

@@ -305,8 +305,8 @@
<component v-bind:is="add_new_html" @submit="onSubmit"></component>
<select :name="name" class="d-none" v-model="real_model">
<option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
<select :name="name" v-model="real_model" class="d-none">
<option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
</select>
<span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
@@ -370,8 +370,8 @@
:key="option.id"
:label="option.name"
:value="option.id">
<span class="float-left">{{ label }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span
<span class="float-left">{{ option.name }}</span>
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.id]">{{ new_text }}</span>
</el-option>
<el-option-group
@@ -669,12 +669,16 @@ export default {
})
.then(response => {
if (response.data.success) {
this.selectOptions[response.data.data.id] = response.data.data['name'];
this.new_options[response.data.data.id] = response.data.data['name'];
this.real_model = response.data.data.id;
/*
this.selectOptions = [];
this.selectOptions.push(response.data.data);
this.new_options[response.data.data.id] = response.data.data.id;
this.real_model = response.data.data.id;
*/
this.change();
if (this.title) {
@@ -788,7 +792,7 @@ export default {
if (response.data.success) {
this.selectOptions[response.data.data.id] = response.data.data['name'];
this.new_options[response.data.data.id] = response.data.data['name'];
this.real_model = response.data.data.id.toString();
this.real_model = response.data.data.id;
this.change();
@@ -821,7 +825,15 @@ export default {
watch: {
options: function (options) {
// update options
//this.selectOptions = options;
this.selectOptions = options;
if (Object.keys(this.new_options).length) {
for (let [key, value] of Object.entries(this.new_options)) {
if (!this.selectOptions[key]) {
this.selectOptions[key] = value;
}
}
}
},
value: function (value) {

1
resources/views/sales/invoices/item.blade.php
View File

@@ -30,6 +30,7 @@
'path' => route('modals.items.store'),
'type' => 'inline',
'field' => 'name',
'new_text' => trans('modules.new'),
])}}"
@interface="row.item_id = $event"
@label="row.name = $event"