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

mail refactor

Browse Source
This commit is contained in:
Jay_Makwana
2019-11-19 20:36:06 +05:30
parent 4ef5a3efb2
commit 3a5fa43ef4
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Space/EnvironmentManager.php
View File

@ -142,7 +142,7 @@ class EnvironmentManager
if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) { if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) {
$mailFromCredential = $mailFromCredential =
'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n". 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
'MAIL_FROM_NAME='.config('mail.from.name')."\n\n"; 'MAIL_FROM_NAME="'.config('mail.from.name')."\"\n\n";
} }
switch ($request->mail_driver) { switch ($request->mail_driver) {
@ -165,7 +165,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.$request->mail_password."\n". 'MAIL_PASSWORD='.$request->mail_password."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
@ -187,7 +187,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
$extraMailData= $extraMailData=
'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n". 'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
@ -221,7 +221,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n". 'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
$extraMailData= $extraMailData=
'SES_KEY='.$request->mail_ses_key."\n". 'SES_KEY='.$request->mail_ses_key."\n".
@ -253,7 +253,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n". 'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
@ -275,7 +275,7 @@ class EnvironmentManager
'MAIL_PASSWORD='.config('mail.password')."\n". 'MAIL_PASSWORD='.config('mail.password')."\n".
'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n". 'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
'MAIL_FROM_ADDRESS='.$request->from_mail."\n". 'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
'MAIL_FROM_NAME='.$request->from_name."\n\n"; 'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
break; break;
} }

4
resources/assets/js/views/wizard/EmailConfiguration.vue
View File

@ -35,9 +35,9 @@ export default {
data () { data () {
return { return {
mailConfigData: { mailConfigData: {
mail_driver: 'smtp' mail_driver: 'mail'
}, },
mail_driver: 'smtp', mail_driver: 'mail',
loading: false, loading: false,
mail_drivers: [] mail_drivers: []
} }

5
resources/assets/js/views/wizard/Settings.vue
View File

@ -101,6 +101,7 @@
import MultiSelect from 'vue-multiselect' import MultiSelect from 'vue-multiselect'
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import Ls from '../../services/ls' import Ls from '../../services/ls'
import { mapActions } from 'vuex'
const { required, minLength, email } = require('vuelidate/lib/validators') const { required, minLength, email } = require('vuelidate/lib/validators')
export default { export default {
@ -149,6 +150,9 @@ export default {
this.getOnboardingData() this.getOnboardingData()
}, },
methods: { methods: {
...mapActions('auth', [
'loginOnBoardingUser'
]),
async getOnboardingData () { async getOnboardingData () {
let response = await window.axios.get('/api/admin/onboarding') let response = await window.axios.get('/api/admin/onboarding')
if (response.data) { if (response.data) {
@ -201,6 +205,7 @@ export default {
// this.$emit('next') // this.$emit('next')
this.loading = false this.loading = false
Ls.set('auth.token', response.data.token) Ls.set('auth.token', response.data.token)
this.loginOnBoardingUser(response.data.token)
this.$router.push('/admin/dashboard') this.$router.push('/admin/dashboard')
} }
} }