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

mail configuration issue

Browse Source
This commit is contained in:
bansarishukla
2020-01-07 12:33:03 +05:30
parent 0176a854b8
commit d79692cf3b
3 changed files with 58 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/MailEnvironmentRequest.php
View File

@ -40,12 +40,9 @@ class MailEnvironmentRequest extends FormRequest
case 'mailgun': case 'mailgun':
return [ return [
'mail_driver' => 'required|string', 'mail_driver' => 'required|string',
'mail_host' => 'required|string',
'mail_port' => 'required',
'mail_mailgun_domain' => 'required|string', 'mail_mailgun_domain' => 'required|string',
'mail_mailgun_secret' => 'required|string', 'mail_mailgun_secret' => 'required|string',
'mail_mailgun_endpoint' => 'required|string', 'mail_mailgun_endpoint' => 'required|string',
'mail_encryption' => 'required|string',
'from_name' => 'required|string', 'from_name' => 'required|string',
'from_mail' => 'required|string', 'from_mail' => 'required|string',
]; ];

128
resources/assets/js/views/settings/mailDriver/Mailgun.vue
View File

@ -20,17 +20,17 @@
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.host') }}</label> <label class="form-label">{{ $t('settings.mail.mailgun_domain') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-input <base-input
:invalid="$v.mailConfigData.mail_host.$error" :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
v-model.trim="mailConfigData.mail_host" v-model.trim="mailConfigData.mail_mailgun_domain"
type="text" type="text"
name="mail_host" name="mailgun_domain"
@input="$v.mailConfigData.mail_host.$touch()" @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_host.$error"> <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
<span v-if="!$v.mailConfigData.mail_host.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
</div> </div>
@ -38,39 +38,39 @@
</div> </div>
<div class="row my-2"> <div class="row my-2">
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.port') }}</label> <label class="form-label">{{ $t('settings.mail.mailgun_secret') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-input <base-input
:invalid="$v.mailConfigData.mail_port.$error" :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
v-model.trim="mailConfigData.mail_port" v-model.trim="mailConfigData.mail_mailgun_secret"
type="text" type="password"
name="mail_port" name="mailgun_secret"
@input="$v.mailConfigData.mail_port.$touch()" show-password
@input="$v.mailConfigData.mail_mailgun_secret.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_port.$error"> <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
<span v-if="!$v.mailConfigData.mail_port.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.encryption') }}</label> <label class="form-label">{{ $t('settings.mail.mailgun_endpoint') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-select <base-input
v-model.trim="mailConfigData.mail_encryption" :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
:invalid="$v.mailConfigData.mail_encryption.$error" v-model.trim="mailConfigData.mail_mailgun_endpoint"
:options="encryptions" type="text"
:searchable="true" name="mailgun_endpoint"
:show-labels="false" @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
@input="$v.mailConfigData.mail_encryption.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_encryption.$error"> <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
<span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div> </div>
</div> </div>
</div> </div>
@ -111,62 +111,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row my-2">
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.mailgun_domain') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_domain.$error"
v-model.trim="mailConfigData.mail_mailgun_domain"
type="text"
name="mailgun_domain"
@input="$v.mailConfigData.mail_mailgun_domain.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
</div>
</div>
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.mailgun_secret') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_secret.$error"
v-model.trim="mailConfigData.mail_mailgun_secret"
type="password"
name="mailgun_secret"
show-password
@input="$v.mailConfigData.mail_mailgun_secret.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
</div>
</div>
</div>
<div class="row my-2">
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('settings.mail.mailgun_endpoint') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
v-model.trim="mailConfigData.mail_mailgun_endpoint"
type="text"
name="mailgun_endpoint"
@input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div>
</div>
</div>
<div class="d-flex"> <div class="d-flex">
<base-button <base-button
:loading="loading" :loading="loading"
@ -212,16 +156,12 @@ export default {
return { return {
mailConfigData: { mailConfigData: {
mail_driver: '', mail_driver: '',
mail_host: '',
mail_port: null,
mail_mailgun_domain: '', mail_mailgun_domain: '',
mail_mailgun_secret: '', mail_mailgun_secret: '',
mail_mailgun_endpoint: '', mail_mailgun_endpoint: '',
mail_encryption: 'tls',
from_mail: '', from_mail: '',
from_name: '' from_name: ''
}, }
encryptions: ['tls', 'ssl', 'starttls']
} }
}, },
validations: { validations: {
@ -229,13 +169,6 @@ export default {
mail_driver: { mail_driver: {
required required
}, },
mail_host: {
required
},
mail_port: {
required,
numeric
},
mail_mailgun_domain: { mail_mailgun_domain: {
required required
}, },
@ -245,9 +178,6 @@ export default {
mail_mailgun_secret: { mail_mailgun_secret: {
required required
}, },
mail_encryption: {
required
},
from_mail: { from_mail: {
required, required,
email email

128
resources/assets/js/views/wizard/mailDriver/Mailgun.vue
View File

@ -20,17 +20,17 @@
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.host') }}</label> <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-input <base-input
:invalid="$v.mailConfigData.mail_host.$error" :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
v-model.trim="mailConfigData.mail_host" v-model.trim="mailConfigData.mail_mailgun_domain"
type="text" type="text"
name="mail_host" name="mailgun_domain"
@input="$v.mailConfigData.mail_host.$touch()" @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_host.$error"> <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
<span v-if="!$v.mailConfigData.mail_host.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
</div> </div>
@ -38,39 +38,39 @@
</div> </div>
<div class="row my-2"> <div class="row my-2">
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.port') }}</label> <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-input <base-input
:invalid="$v.mailConfigData.mail_port.$error" :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
v-model.trim="mailConfigData.mail_port" v-model.trim="mailConfigData.mail_mailgun_secret"
type="text" type="password"
name="mail_port" name="mailgun_secret"
@input="$v.mailConfigData.mail_port.$touch()" show-password
@input="$v.mailConfigData.mail_mailgun_secret.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_port.$error"> <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
<span v-if="!$v.mailConfigData.mail_port.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.encryption') }}</label> <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
<span class="text-danger"> *</span> <span class="text-danger"> *</span>
<base-select <base-input
v-model.trim="mailConfigData.mail_encryption" :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
:invalid="$v.mailConfigData.mail_encryption.$error" v-model.trim="mailConfigData.mail_mailgun_endpoint"
:options="encryptions" type="text"
:searchable="true" name="mailgun_endpoint"
:show-labels="false" @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
@input="$v.mailConfigData.mail_encryption.$touch()"
/> />
<div v-if="$v.mailConfigData.mail_encryption.$error"> <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
<span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger"> <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div> </div>
</div> </div>
</div> </div>
@ -111,62 +111,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row my-2">
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_domain.$error"
v-model.trim="mailConfigData.mail_mailgun_domain"
type="text"
name="mailgun_domain"
@input="$v.mailConfigData.mail_mailgun_domain.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
</div>
</div>
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_secret.$error"
v-model.trim="mailConfigData.mail_mailgun_secret"
type="password"
name="mailgun_secret"
show-password
@input="$v.mailConfigData.mail_mailgun_secret.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
</div>
</div>
</div>
<div class="row my-2">
<div class="col-md-6 my-2">
<label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
<span class="text-danger"> *</span>
<base-input
:invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
v-model.trim="mailConfigData.mail_mailgun_endpoint"
type="text"
name="mailgun_endpoint"
@input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
/>
<div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
{{ $tc('validation.required') }}
</span>
<span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
{{ $tc('validation.numbers_only') }}
</span>
</div>
</div>
</div>
<base-button <base-button
:loading="loading" :loading="loading"
class="pull-right mt-4" class="pull-right mt-4"
@ -209,16 +153,12 @@ export default {
return { return {
mailConfigData: { mailConfigData: {
mail_driver: '', mail_driver: '',
mail_host: '',
mail_port: null,
mail_mailgun_domain: '', mail_mailgun_domain: '',
mail_mailgun_secret: '', mail_mailgun_secret: '',
mail_mailgun_endpoint: '', mail_mailgun_endpoint: '',
mail_encryption: 'tls',
from_mail: '', from_mail: '',
from_name: '' from_name: ''
}, }
encryptions: ['tls', 'ssl', 'starttls']
} }
}, },
validations: { validations: {
@ -226,13 +166,6 @@ export default {
mail_driver: { mail_driver: {
required required
}, },
mail_host: {
required
},
mail_port: {
required,
numeric
},
mail_mailgun_domain: { mail_mailgun_domain: {
required required
}, },
@ -242,9 +175,6 @@ export default {
mail_mailgun_secret: { mail_mailgun_secret: {
required required
}, },
mail_encryption: {
required
},
from_mail: { from_mail: {
required, required,
email email