From 1e98f0a8dc64c2407af1cf5838453f261a51d981 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Tue, 19 Nov 2019 13:41:56 +0530
Subject: [PATCH 1/2] change validation message

---
 resources/assets/js/views/settings/mailDriver/Basic.vue   | 3 +++
 resources/assets/js/views/settings/mailDriver/Mailgun.vue | 4 ++--
 resources/assets/js/views/settings/mailDriver/Ses.vue     | 4 ++--
 resources/assets/js/views/settings/mailDriver/Smtp.vue    | 4 ++--
 resources/assets/js/views/wizard/mailDriver/Basic.vue     | 3 +++
 resources/assets/js/views/wizard/mailDriver/Mailgun.vue   | 4 ++--
 resources/assets/js/views/wizard/mailDriver/Ses.vue       | 4 ++--
 resources/assets/js/views/wizard/mailDriver/Smtp.vue      | 4 ++--
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/views/settings/mailDriver/Basic.vue b/resources/assets/js/views/settings/mailDriver/Basic.vue
index bb265378..e6d35b9e 100644
--- a/resources/assets/js/views/settings/mailDriver/Basic.vue
+++ b/resources/assets/js/views/settings/mailDriver/Basic.vue
@@ -50,6 +50,9 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
+          </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
diff --git a/resources/assets/js/views/settings/mailDriver/Mailgun.vue b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
index db4c1dac..ab2338a7 100644
--- a/resources/assets/js/views/settings/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
@@ -88,8 +88,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
diff --git a/resources/assets/js/views/settings/mailDriver/Ses.vue b/resources/assets/js/views/settings/mailDriver/Ses.vue
index c5486887..ce12d151 100644
--- a/resources/assets/js/views/settings/mailDriver/Ses.vue
+++ b/resources/assets/js/views/settings/mailDriver/Ses.vue
@@ -88,8 +88,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
diff --git a/resources/assets/js/views/settings/mailDriver/Smtp.vue b/resources/assets/js/views/settings/mailDriver/Smtp.vue
index 29bbb12e..6bc25e94 100644
--- a/resources/assets/js/views/settings/mailDriver/Smtp.vue
+++ b/resources/assets/js/views/settings/mailDriver/Smtp.vue
@@ -123,8 +123,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
diff --git a/resources/assets/js/views/wizard/mailDriver/Basic.vue b/resources/assets/js/views/wizard/mailDriver/Basic.vue
index 2d4f4b84..3f16bccf 100644
--- a/resources/assets/js/views/wizard/mailDriver/Basic.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Basic.vue
@@ -50,6 +50,9 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
+          </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
index 72e38565..b3d10d5e 100644
--- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
@@ -88,8 +88,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
diff --git a/resources/assets/js/views/wizard/mailDriver/Ses.vue b/resources/assets/js/views/wizard/mailDriver/Ses.vue
index ae8a2618..8f41897e 100644
--- a/resources/assets/js/views/wizard/mailDriver/Ses.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Ses.vue
@@ -88,8 +88,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
diff --git a/resources/assets/js/views/wizard/mailDriver/Smtp.vue b/resources/assets/js/views/wizard/mailDriver/Smtp.vue
index 994db778..0031e14b 100644
--- a/resources/assets/js/views/wizard/mailDriver/Smtp.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Smtp.vue
@@ -123,8 +123,8 @@
           <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>

From 163a76cd377b585a9077d2f92c35918a36edc68c Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Tue, 19 Nov 2019 14:11:52 +0530
Subject: [PATCH 2/2] change url of onboarding

---
 resources/assets/js/views/wizard/EmailConfiguration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index 17dc917b..a273ace5 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -59,7 +59,7 @@ export default {
     async next (mailConfigData) {
       this.loading = true
       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) {
           this.$emit('next')
           window.toastr['success'](this.$t('wizard.success.' + response.data.success))