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

location brought from model

Browse Source
This commit is contained in:
Cihan Şentürk
2021-09-03 12:53:35 +03:00
parent 414e405168
commit 6154ff31fd
10 changed files with 65 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
resources/assets/js/components/AkauntingCompanyEdit.vue
View File

@@ -13,9 +13,9 @@
{{ company.address }}
</th>
</tr>
<tr v-if="company_data.locations">
<tr v-if="company.location">
<th class="text-right p-0">
{{ company_data.locations }}
{{ company.location }}
</th>
</tr>
<tr v-if="company.tax_number">
@@ -60,18 +60,18 @@ import Form from './../plugins/form';
export default {
name: 'akaunting-company-edit',
components: {
[Select.name]: Select,
[Option.name]: Option,
[OptionGroup.name]: OptionGroup,
[ColorPicker.name]: ColorPicker,
AkauntingModalAddNew,
AkauntingModal,
AkauntingMoney,
AkauntingRadioGroup,
AkauntingSelect,
AkauntingDate,
},
components: {
[Select.name]: Select,
[Option.name]: Option,
[OptionGroup.name]: OptionGroup,
[ColorPicker.name]: ColorPicker,
AkauntingModalAddNew,
AkauntingModal,
AkauntingMoney,
AkauntingRadioGroup,
AkauntingSelect,
AkauntingDate,
},
props: {
buttonText: {
@@ -94,9 +94,6 @@ export default {
default: {},
description: 'Company object'
},
countryText: {
type: [Array, Object],
},
companyForm: {
type: Object,
default: function () {
@@ -120,7 +117,6 @@ export default {
buttons: this.companyForm.buttons,
},
company_html: '',
company_data: this.company,
};
},
@@ -247,27 +243,5 @@ export default {
documentClasses.remove("modal-open");
},
},
created() {
let locations = [];
if (this.company.city) {
locations.push(this.company.city);
}
if (this.company.zip_code) {
locations.push(this.company.zip_code);
}
if (this.company.state) {
locations.push(this.company.state);
}
if (this.company.country) {
locations.push(this.countryText[this.company.country])
}
this.company.locations = locations.join(', ');
},
};
</script>

60
resources/assets/js/components/AkauntingContactCard.vue
View File

@@ -88,9 +88,9 @@
{{ contact.address }}
</th>
</tr>
<tr v-if="contact.locations">
<tr v-if="contact.location">
<th class="p-0" style="text-align:left; white-space: normal;">
{{ contact.locations }}
{{ contact.location }}
</th>
</tr>
<tr v-if="contact.tax_number">
@@ -197,7 +197,7 @@ export default {
zip_code:'',
state:'',
country:'',
country_name:'',
location:'',
reference: ''
};
},
@@ -241,10 +241,6 @@ export default {
default: 'Bill to',
description: ""
},
countryText: {
type: [Array, Object],
default: () => [],
},
taxNumberText: {
type: String,
default: 'Tax number',
@@ -284,7 +280,6 @@ export default {
buttons: this.addNew.buttons,
},
add_new_html: '',
country_text_data: this.countryText,
};
},
@@ -315,7 +310,7 @@ export default {
zip_code: '',
state: '',
country: '',
countryname: '',
location: '',
reference: ''
});
},
@@ -345,7 +340,7 @@ export default {
zip_code: (contact.zip_code) ? contact.zip_code : '',
state: (contact.state) ? contact.state : '',
country: (contact.country) ? contact.country : '',
country_name: (contact.country_name) ? contact.country_name : '',
location: (contact.location) ? contact.location : '',
reference: (contact.reference) ? contact.reference : ''
});
}, this);
@@ -361,26 +356,6 @@ export default {
this.contact_list.forEach(function (contact, index) {
if (contact_id == contact.id) {
this.contact = contact;
let locations = [];
if (this.contact.city) {
locations.push(this.contact.city);
}
if (this.contact.zip_code) {
locations.push(this.contact.zip_code);
}
if (this.contact.state) {
locations.push(this.contact.state);
}
if (this.contact.country) {
locations.push(this.country_text_data[this.contact.country]);
}
this.contact.locations = locations.join(', ');
}
}, this);
@@ -616,7 +591,7 @@ export default {
zip_code: '',
state: '',
country: '',
country_name: '',
location: '',
reference: ''
});
@@ -641,30 +616,9 @@ export default {
zip_code: (contact.zip_code) ? contact.zip_code : '',
state: (contact.state) ? contact.state : '',
country: (contact.country) ? contact.country : '',
country_name: (contact.country_name) ? contact.country_name : '',
location: (contact.location) ? contact.location : '',
reference: (contact.reference) ? contact.reference : ''
});
let locations = [];
if (contact.city) {
locations.push(contact.city);
}
if (contact.zip_code) {
locations.push(contact.zip_code);
}
if (contact.state) {
locations.push(contact.state);
}
if (contact.country) {
locations.push(this.country_text_data[contact.country])
}
this.contact.locations = locations.join(', ');
}, this);
}