TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'logo-upload' into 'master'

Browse Source 
fix cropper Logo upload

See merge request mohit.panjvani/crater-web!43
This commit is contained in:
Mohit Panjwani
2019-11-17 06:06:11 +00:00
parent 948abd9fac eebec45ce1
commit 858ef44919
4 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
resources/assets/js/views/settings/CompanyInfo.vue
View File

@ -27,6 +27,7 @@
:upload-handler="cropperHandler"
trigger="#pick-avatar"
@changed="setFileObject"
@error="hadleUploadError"
/>
</div>
<div class="row">
@ -177,14 +178,14 @@ export default {
},
isFetchingData: false,
formData: {
name: '',
logo: null,
name: null,
logo: '',
email: '',
phone: null,
zip: null,
address_street_1: null,
address_street_2: null,
website: null,
phone: '',
zip: '',
address_street_1: '',
address_street_2: '',
website: '',
country_id: null,
state_id: '',
city_id: ''
@ -286,6 +287,9 @@ export default {
setFileObject (file) {
this.fileObject = file
},
hadleUploadError (message, type, xhr) {
window.toastr['error']('Oops! Something went wrong...')
},
async setInitialData () {
let response = await this.loadData()
this.isFetchingData = true
@ -314,15 +318,23 @@ export default {
data.append('country_id', this.formData.country_id)
data.append('zip', this.formData.zip)
data.append('phone', this.formData.phone)
if (this.fileObject) {
data.append('logo', this.fileObject)
}
let response = await this.editCompany(data)
if (response.data.success) {
this.isLoading = false
if (this.fileObject && this.previewLogo) {
let logoData = new FormData()
logoData.append('company_logo', JSON.stringify({
name: this.fileObject.name,
data: this.previewLogo
}))
await axios.post('/api/settings/company/upload-logo', logoData)
}
this.isLoading = false
window.toastr['success'](this.$t('settings.company_info.updated_message'))
return true
}
this.isLoading = false
window.toastr['error'](response.data.error)
return true
},

36
resources/assets/js/views/wizard/CompanyInfo.vue
View File

@ -22,6 +22,7 @@
:upload-handler="cropperHandler"
trigger="#pick-avatar"
@changed="setFileObject"
@error="hadleUploadError"
/>
</div>
<div class="row">
@ -256,30 +257,33 @@ export default {
setFileObject (file) {
this.fileObject = file
},
hadleUploadError (message, type, xhr) {
window.toastr['error']('Oops! Something went wrong...')
},
async next () {
this.$v.companyData.$touch()
if (this.$v.companyData.$invalid) {
return true
}
this.loading = true
let data = new FormData()
data.append('logo', this.fileObject)
data.append('name', this.companyData.name)
data.append('address_street_1', this.companyData.address_street_1)
data.append('address_street_2', this.companyData.address_street_2)
data.append('city_id', this.companyData.city_id)
data.append('state_id', this.companyData.state_id)
data.append('country_id', this.companyData.country_id)
data.append('zip', this.companyData.zip)
data.append('phone', this.companyData.phone)
let response = await window.axios.post('/api/admin/onboarding/company', data, {
headers: {
'Content-Type': 'multipart/form-data'
}
})
let response = await window.axios.post('/api/admin/onboarding/company', this.companyData)
if (response.data) {
if (this.fileObject && this.previewLogo) {
let logoData = new FormData()
logoData.append('company_logo', JSON.stringify({
name: this.fileObject.name,
data: this.previewLogo
}))
await axios.post('/api/admin/onboarding/company/upload-logo', logoData, {
headers: {
'Content-Type': 'multipart/form-data',
'company': response.data.user.company.id
}
})
}
this.$emit('next')
this.loading = false
}