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

Invoice & bill item new style..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-03-11 15:59:24 +03:00
parent 48f3b7c3b6
commit 2f49904b18
5 changed files with 151 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,8 @@
<span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
</base-input>
<el-select v-else
<span v-else>
<el-select
:class="'pl-20 mr-40'"
v-model="real_model"
@input="change"
@ -397,9 +398,10 @@
</span>
</div>
</el-option>
<span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
</el-select>
<span class="badge badge-success badge-resize float-right mr-2" v-if="new_options[real_model]">{{ new_text }}</span>
</span>
</template>
<script>
@ -561,7 +563,7 @@ export default {
show: false,
path: this.addNew.path,
type: this.addNew.type, // modal, inline
field: this.addNew.name,
field: this.addNew.field,
buttons: this.addNew.buttons
},
add_new_text: this.addNew.text,
@ -590,36 +592,32 @@ export default {
if (query !== '') {
this.loading = true;
/*
this.list = [];
this.selectOptions = this.options;
Object.keys(this.selectOptions).forEach(key => {
const item = this.selectOptions[key];
if (item.toLowerCase().indexOf(query.toLowerCase()) > -1) {
this.list.push(this.selectOptions[key]);
}
});
this.selectOptions = this.list;
*/
if (!this.remoteAction) {
this.remoteAction = url + '/common/items/autocomplete';
}
axios.get(this.remoteAction, {
window.axios({
method: 'GET',
url: this.remoteAction,
params: {
type: this.remoteType,
query: query,
currency_code: this.currencyCode,
},
headers: {
'X-CSRF-TOKEN': window.Laravel.csrfToken,
'X-Requested-With': 'XMLHttpRequest',
'Content-Type': 'multipart/form-data'
}
})
.then(response => {
this.loading = false;
if (response.data.data) {
this.selectOptions = response.data.data;
} else {
this.selectOptions = [];
}
})
.catch(e => {
})
@ -632,6 +630,10 @@ export default {
},
change() {
if (typeof(this.real_model) === 'object') {
return false;
}
this.$emit('change', this.real_model);
this.$emit('interface', this.real_model);
@ -640,12 +642,20 @@ export default {
this.$emit('label', item.name);
this.$emit('option', item);
return;
return true;
}
});
},
onAddItem() {
onPressEnter() {
alert('Press Enter');
},
OnPressTab() {
alert('Press Tab');
},
async onAddItem() {
// Get Select Input value
if (this.title) {
var value = this.$children[0].$children[0].$children[0].$refs.input.value;
@ -653,10 +663,14 @@ export default {
var value = this.$children[0].$children[0].$refs.input.value;
}
if (value === '') {
return false;
}
if (this.add_new.type == 'inline') {
this.addInline(value);
await this.addInline(value);
} else {
this.onModal(value);
await this.onModal(value);
}
},
@ -664,21 +678,15 @@ export default {
window.axios.post(this.add_new.path, {
'_token': window.Laravel.csrfToken,
'type': 'inline',
field: this.add_new.field,
field: this.add_new.field.value,
value: value,
})
.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.new_options[response.data.data[this.add_new.field.key]] = response.data.data;
this.real_model = response.data.data[this.add_new.field.key];
this.change();
if (this.title) {
@ -686,10 +694,10 @@ export default {
} else {
this.$children[0].visible = false;
}
//this.add_new.status = false;
}
})
.catch(error => {
console.log(error);
});
},
@ -790,13 +798,15 @@ export default {
this.form.loading = false;
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.push(response.data.data);
//this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
this.real_model = response.data.data[this.add_new.field.key];//.toString();
this.change();
//this.add_new.show = false;
this.add_new.show = false;
this.add_new.html = '';
this.add_new_html = null;
@ -828,11 +838,9 @@ export default {
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;
}
}
Object.values(this.new_options).forEach(item => {
this.selectOptions.push(item);
});
}
},

4
resources/assets/js/views/purchases/bills.js vendored
View File

@ -255,11 +255,13 @@ const app = new Vue({
},
onSelectItem(item, index) {
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;
this.form.items[index].name = item.name;
this.form.items[index].price = (item.purchase_price).toFixed(2);
this.form.items[index].quantity = 1;
this.form.items[index].tax_id = [item.tax_id.toString()];
this.form.items[index].tax_id = tax_id;
this.form.items[index].total = (item.purchase_price).toFixed(2);
},

4
resources/assets/js/views/sales/invoices.js vendored
View File

@ -255,11 +255,13 @@ const app = new Vue({
},
onSelectItem(item, index) {
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;
this.form.items[index].name = item.name;
this.form.items[index].price = (item.sale_price).toFixed(2);
this.form.items[index].quantity = 1;
this.form.items[index].tax_id = [item.tax_id.toString()];
this.form.items[index].tax_id = tax_id;
this.form.items[index].total = (item.sale_price).toFixed(2);
},

6
resources/views/purchases/bills/item.blade.php
View File

@ -29,7 +29,11 @@
'text' => trans('general.add_new'),
'path' => route('modals.items.store'),
'type' => 'inline',
'field' => 'name',
'field' => [
'key' => 'id',
'value' => 'name'
],
'new_text' => trans('modules.new'),
])}}"
@interface="row.item_id = $event"
@label="row.name = $event"

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

@ -29,7 +29,10 @@
'text' => trans('general.add_new'),
'path' => route('modals.items.store'),
'type' => 'inline',
'field' => 'name',
'field' => [
'key' => 'id',
'value' => 'name'
],
'new_text' => trans('modules.new'),
])}}"
@interface="row.item_id = $event"