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

Merge branch 'refactor-mail-config' into 'master'

Browse Source 
change validation message

See merge request mohit.panjvani/crater-web!52
This commit is contained in:
Mohit Panjwani
2019-11-19 08:47:10 +00:00
parent 88ca05a588 163a76cd37
commit 8f55b30b0d
9 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/js/views/settings/mailDriver/Basic.vue
View File

@ -50,6 +50,9 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.email_incorrect') }}
</span>
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">

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

@ -88,8 +88,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>

4
resources/assets/js/views/settings/mailDriver/Ses.vue
View File

@ -88,8 +88,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>

4
resources/assets/js/views/settings/mailDriver/Smtp.vue
View File

@ -123,8 +123,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>

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

@ -59,7 +59,7 @@ export default {
async next (mailConfigData) { async next (mailConfigData) {
this.loading = true this.loading = true
try { try {
let response = await window.axios.post('/api/settings/environment/mail', mailConfigData) let response = await window.axios.post('/api/admin/onboarding/environment/mail', mailConfigData)
if (response.data.success) { if (response.data.success) {
this.$emit('next') this.$emit('next')
window.toastr['success'](this.$t('wizard.success.' + response.data.success)) window.toastr['success'](this.$t('wizard.success.' + response.data.success))

3
resources/assets/js/views/wizard/mailDriver/Basic.vue
View File

@ -50,6 +50,9 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.email_incorrect') }}
</span>
</div> </div>
</div> </div>
<div class="col-md-6 my-2"> <div class="col-md-6 my-2">

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

@ -88,8 +88,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>

4
resources/assets/js/views/wizard/mailDriver/Ses.vue
View File

@ -88,8 +88,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>

4
resources/assets/js/views/wizard/mailDriver/Smtp.vue
View File

@ -123,8 +123,8 @@
<span v-if="!$v.mailConfigData.from_mail.required" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
{{ $tc('validation.required') }} {{ $tc('validation.required') }}
</span> </span>
<span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger"> <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
{{ $tc('validation.numbers_only') }} {{ $tc('validation.email_incorrect') }}
</span> </span>
</div> </div>
</div> </div>