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

Merge branch 'fix-user-issue' into 'master'

Browse Source 
fix isLoading issue

See merge request mohit.panjvani/crater-web!646
This commit is contained in:
Mohit Panjwani
2020-12-22 06:43:23 +00:00
parent fe93d5236c c12e27dbfe
commit d07b63c365
1 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
resources/assets/js/views/settings/UserProfileSetting.vue
View File

@ -313,59 +313,53 @@ export default {
name: this.formData.name,
email: this.formData.email,
}
if (
this.formData.password != null &&
this.formData.password !== undefined &&
this.formData.password !== ''
) {
data = { ...data, password: this.formData.password }
}
let response = await this.updateCurrentUser(data)
let languageData = {
settings: {
language: this.language.code,
},
}
let languageRes = await this.updateUserSettings(languageData)
// if(languageRes) {
// window.i18n.locale = this.language.code
// }
if (response.data.success) {
this.isLoading = false
if (this.fileObject && this.previewAvatar) {
let avatarData = new FormData()
avatarData.append(
'admin_avatar',
JSON.stringify({
name: this.fileObject.name,
data: this.previewAvatar,
})
)
this.uploadAvatar(avatarData)
try {
if (
this.formData.password != null &&
this.formData.password !== undefined &&
this.formData.password !== ''
) {
data = { ...data, password: this.formData.password }
}
window.toastr['success'](
this.$t('settings.account_settings.updated_message')
)
let response = await this.updateCurrentUser(data)
this.formData.password = ''
this.formData.confirm_password = ''
let languageData = {
settings: {
language: this.language.code,
},
}
let languageRes = await this.updateUserSettings(languageData)
if (response.data.success) {
this.isLoading = false
if (this.fileObject && this.previewAvatar) {
let avatarData = new FormData()
avatarData.append(
'admin_avatar',
JSON.stringify({
name: this.fileObject.name,
data: this.previewAvatar,
})
)
this.uploadAvatar(avatarData)
}
window.toastr['success'](
this.$t('settings.account_settings.updated_message')
)
this.formData.password = ''
this.formData.confirm_password = ''
}
} catch (error) {
this.isLoading = false
return true
}
window.toastr['error'](response.data.error)
this.isLoading = false
return true
},
},
}