From fa9197c5bc24591158f316ef432a220ed7f65855 Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Sat, 16 Nov 2019 13:25:30 +0530 Subject: [PATCH 1/3] fix cropper logo --- resources/assets/js/views/settings/CompanyInfo.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/views/settings/CompanyInfo.vue b/resources/assets/js/views/settings/CompanyInfo.vue index 9ee883d5..5299d896 100644 --- a/resources/assets/js/views/settings/CompanyInfo.vue +++ b/resources/assets/js/views/settings/CompanyInfo.vue @@ -314,12 +314,16 @@ 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.previewLogo) { + let logoData = new FormData() + logoData.append('company_logo', JSON.stringify({name: 'company', data: this.previewLogo})) + let logoUpload = await axios.post('/api/settings/company/upload-logo', logoData) + console.log(logoUpload.data) + } window.toastr['success'](this.$t('settings.company_info.updated_message')) return true } From 8de610ad6318d2dc890d447a91e72b0003d9c93a Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Sat, 16 Nov 2019 17:50:21 +0530 Subject: [PATCH 2/3] fix logo upload --- .../assets/js/views/settings/CompanyInfo.vue | 20 ++++++++---- .../assets/js/views/wizard/CompanyInfo.vue | 31 +++++++++---------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/resources/assets/js/views/settings/CompanyInfo.vue b/resources/assets/js/views/settings/CompanyInfo.vue index 5299d896..fe976983 100644 --- a/resources/assets/js/views/settings/CompanyInfo.vue +++ b/resources/assets/js/views/settings/CompanyInfo.vue @@ -27,6 +27,7 @@ :upload-handler="cropperHandler" trigger="#pick-avatar" @changed="setFileObject" + @error="hadleUploadError" />
@@ -177,9 +178,9 @@ export default { }, isFetchingData: false, formData: { - name: '', + name: null, logo: null, - email: '', + email: null, phone: null, zip: null, address_street_1: null, @@ -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 @@ -318,15 +322,19 @@ export default { let response = await this.editCompany(data) if (response.data.success) { this.isLoading = false - if (this.previewLogo) { + if (this.fileObject && this.previewLogo) { let logoData = new FormData() - logoData.append('company_logo', JSON.stringify({name: 'company', data: this.previewLogo})) - let logoUpload = await axios.post('/api/settings/company/upload-logo', logoData) - console.log(logoUpload.data) + 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 }, diff --git a/resources/assets/js/views/wizard/CompanyInfo.vue b/resources/assets/js/views/wizard/CompanyInfo.vue index 9c58b36e..c0390ea9 100644 --- a/resources/assets/js/views/wizard/CompanyInfo.vue +++ b/resources/assets/js/views/wizard/CompanyInfo.vue @@ -22,6 +22,7 @@ :upload-handler="cropperHandler" trigger="#pick-avatar" @changed="setFileObject" + @error="hadleUploadError" />
@@ -256,30 +257,28 @@ 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/settings/company/upload-logo', logoData) + } + this.$emit('next') this.loading = false } From eebec45ce1d7e8bbae774d9caba822fccd1a0b93 Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Sat, 16 Nov 2019 18:34:28 +0530 Subject: [PATCH 3/3] fix button color and some route change --- resources/assets/js/views/settings/CompanyInfo.vue | 14 +++++++------- resources/assets/js/views/wizard/CompanyInfo.vue | 7 ++++++- resources/assets/sass/base.scss | 5 +++++ routes/api.php | 5 +++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/views/settings/CompanyInfo.vue b/resources/assets/js/views/settings/CompanyInfo.vue index fe976983..6190c9d0 100644 --- a/resources/assets/js/views/settings/CompanyInfo.vue +++ b/resources/assets/js/views/settings/CompanyInfo.vue @@ -179,13 +179,13 @@ export default { isFetchingData: false, formData: { name: null, - logo: null, - email: null, - phone: null, - zip: null, - address_street_1: null, - address_street_2: null, - website: null, + logo: '', + email: '', + phone: '', + zip: '', + address_street_1: '', + address_street_2: '', + website: '', country_id: null, state_id: '', city_id: '' diff --git a/resources/assets/js/views/wizard/CompanyInfo.vue b/resources/assets/js/views/wizard/CompanyInfo.vue index c0390ea9..0ccc78b4 100644 --- a/resources/assets/js/views/wizard/CompanyInfo.vue +++ b/resources/assets/js/views/wizard/CompanyInfo.vue @@ -276,7 +276,12 @@ export default { data: this.previewLogo })) - await axios.post('/api/settings/company/upload-logo', logoData) + 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') diff --git a/resources/assets/sass/base.scss b/resources/assets/sass/base.scss index 968e4fda..22a99a11 100644 --- a/resources/assets/sass/base.scss +++ b/resources/assets/sass/base.scss @@ -115,3 +115,8 @@ code, .code { .swal-icon--custom { height: 70px !important; } + +.avatar-cropper-btn:hover { + background-color: $ls-color-primary !important; + color: $white; +} diff --git a/routes/api.php b/routes/api.php index fd0f863f..99754925 100644 --- a/routes/api.php +++ b/routes/api.php @@ -101,6 +101,11 @@ Route::group(['middleware' => 'redirect-if-installed'], function () { 'uses' => 'OnboardingController@adminCompany' ]); + Route::post('/admin/onboarding/company/upload-logo', [ + 'as' => 'upload.admin.company.logo', + 'uses' => 'CompanyController@uploadCompanyLogo' + ]); + Route::post('/admin/onboarding/settings', [ 'as' => 'admin.settings', 'uses' => 'OnboardingController@companySettings'