Merge branch 'master'

.env.example

@@ -27,6 +27,9 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=
 
+MAIL_FROM_ADDRESS=
+MAIL_FROM_NAME=
+
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=

app/Http/Controllers/EnvironmentController.php

@@ -81,10 +81,8 @@ class EnvironmentController extends Controller
             'mail_mailgun_endpoint' => config('services.mailgun.endpoint'),
             'mail_mailgun_domain' => config('services.mailgun.domain'),
             'mail_mailgun_secret' => config('services.mailgun.secret'),
-            'mail_sparkpost_secret' => config('services.sparkpost.secret'),
             'mail_ses_key' => config('services.ses.key'),
             'mail_ses_secret' => config('services.ses.secret'),
-            'mail_mandrill_secret' => config('services.mandrill.secret'),
         ];
 
 
@@ -102,9 +100,7 @@ class EnvironmentController extends Controller
             'mail',
             'sendmail',
             'mailgun',
-            'mandrill',
+            'ses'
-            'ses',
-            'sparkpost'
         ];
 
         return response()->json($drivers);

app/Http/Controllers/EstimatesController.php

@@ -13,6 +13,7 @@ use Crater\User;
 use Crater\Item;
 use Validator;
 use Crater\CompanySetting;
+use Crater\Company;
 use Crater\Mail\EstimatePdf;
 use Crater\TaxType;
 use Crater\Tax;
@@ -147,6 +148,7 @@ class EstimatesController extends Controller
             $data['estimate'] = $estimate->toArray();
             $userId = $data['estimate']['user_id'];
             $data['user'] = User::find($userId)->toArray();
+            $data['company'] = Company::find($estimate->company_id);
             $email = $data['user']['email'];
             $notificationEmail = CompanySetting::getSetting(
                 'notification_email',
@@ -310,6 +312,8 @@ class EstimatesController extends Controller
         $data['estimate'] = $estimate->toArray();
         $userId = $data['estimate']['user_id'];
         $data['user'] = User::find($userId)->toArray();
+        $data['company'] = Company::find($estimate->company_id);
+
         $email = $data['user']['email'];
         $notificationEmail = CompanySetting::getSetting(
             'notification_email',

app/Http/Controllers/InvoicesController.php

@@ -3,6 +3,7 @@ namespace Crater\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Crater\CompanySetting;
+use Crater\Company;
 use Illuminate\Support\Collection;
 use Crater\Currency;
 use Crater\InvoiceTemplate;
@@ -148,6 +149,7 @@ class InvoicesController extends Controller
         if ($request->has('invoiceSend')) {
             $data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
             $data['user'] = User::find($request->user_id)->toArray();
+            $data['company'] = Company::find($invoice->company_id);
 
             $notificationEmail = CompanySetting::getSetting(
                 'notification_email',
@@ -374,6 +376,7 @@ class InvoicesController extends Controller
         $data['invoice'] = $invoice->toArray();
         $userId = $data['invoice']['user_id'];
         $data['user'] = User::find($userId)->toArray();
+        $data['company'] = Company::find($invoice->company_id);
         $email = $data['user']['email'];
         $notificationEmail = CompanySetting::getSetting(
             'notification_email',

app/Http/Requests/MailEnvironmentRequest.php

@@ -29,8 +29,8 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_username'         => 'required|string|max:50',
+                    'mail_username'         => 'required|string',
-                    'mail_password'         => 'required|string|max:50',
+                    'mail_password'         => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -42,21 +42,9 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_mailgun_domain'   => 'required|string|max:50',
+                    'mail_mailgun_domain'   => 'required|string',
-                    'mail_mailgun_secret'   => 'required|string|max:50',
+                    'mail_mailgun_secret'   => 'required|string',
-                    'mail_mailgun_endpoint' => 'required|string|max:50',
+                    'mail_mailgun_endpoint' => 'required|string',
-                    'mail_encryption'       => 'required|string|max:50',
-                    'from_name'             => 'required|string|max:50',
-                    'from_mail'             => 'required|string|max:50',
-                ];
-                break;
-
-            case 'sparkpost':
-                return [
-                    'mail_driver'           => 'required|string|max:50',
-                    'mail_host'             => 'required|string|max:50',
-                    'mail_port'             => 'required|max:50',
-                    'mail_sparkpost_secret' => 'required|string|max:50',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -68,8 +56,8 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_ses_key'          => 'required|string|max:50',
+                    'mail_ses_key'          => 'required|string',
-                    'mail_ses_secret'       => 'required|string|max:50',
+                    'mail_ses_secret'       => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -89,19 +77,6 @@ class MailEnvironmentRequest extends FormRequest
                     'from_mail'             => 'required|string|max:50',
                 ];
                 break;
-
-            case 'mandrill':
-                return [
-                    'mail_driver'           => 'required|string|max:50',
-                    'mail_host'             => 'required|string|max:50',
-                    'mail_port'             => 'required|max:50',
-                    'mail_mandrill_secret'  => 'required|string|max:50',
-                    'mail_encryption'       => 'required|string|max:50',
-                    'from_name'             => 'required|string|max:50',
-                    'from_mail'             => 'required|string|max:50',
-                ];
-                break;
         }
-
     }
 }

app/Space/EnvironmentManager.php

@@ -33,20 +33,20 @@ class EnvironmentManager
     public function saveDatabaseVariables(DatabaseEnvironmentRequest $request)
     {
         $oldDatabaseData =
-        'DB_CONNECTION='.config('database.default')."\n".
+            'DB_CONNECTION='.config('database.default')."\n".
-        'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
+            'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
-        'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
+            'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
-        'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
+            'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
-        'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
+            'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
-        'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
+            'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
 
         $newDatabaseData =
-        'DB_CONNECTION='.$request->database_connection."\n".
+            'DB_CONNECTION='.$request->database_connection."\n".
-        'DB_HOST='.$request->database_hostname."\n".
+            'DB_HOST='.$request->database_hostname."\n".
-        'DB_PORT='.$request->database_port."\n".
+            'DB_PORT='.$request->database_port."\n".
-        'DB_DATABASE='.$request->database_name."\n".
+            'DB_DATABASE='.$request->database_name."\n".
-        'DB_USERNAME='.$request->database_username."\n".
+            'DB_USERNAME='.$request->database_username."\n".
-        'DB_PASSWORD='.$request->database_password."\n\n";
+            'DB_PASSWORD='.$request->database_password."\n\n";
 
         if (! $this->checkDatabaseConnection($request)) {
 
@@ -94,9 +94,8 @@ class EnvironmentManager
      */
     public function saveMailVariables(MailEnvironmentRequest $request)
     {
-
         $mailData = $this->getMailData($request);
-        dd($mailData);
+
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -105,6 +104,22 @@ class EnvironmentManager
                 file_get_contents($this->envPath)
             ));
 
+            if($mailData['extra_old_mail_data']) {
+                file_put_contents($this->envPath, str_replace(
+                    $mailData['extra_old_mail_data'],
+                    $mailData['extra_mail_data'],
+                    file_get_contents($this->envPath)
+                ));
+            } else {
+                file_put_contents(
+                    $this->envPath,
+                    "\n".$mailData['extra_mail_data'],
+                    FILE_APPEND
+                );
+            }
+
+
+
         } catch (Exception $e) {
             return [
                 'error' => 'mail_variables_save_error'
@@ -118,126 +133,158 @@ class EnvironmentManager
 
     private function getMailData($request)
     {
-        $mailCredential = "";
+        $mailFromCredential = "";
-        $otherCredential = "";
+        $extraMailData = "";
-        $oldMailOtherCredential = "";
+        $extraOldMailData = "";
+        $oldMailData = "";
+        $newMailData = "";
 
-        if(env('MAIL_FROM_ADDRESS') && env('MAIL_FROM_NAME')) {
+        if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) {
-            $oldMailOtherCredential =
+            $mailFromCredential =
                 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
                 'MAIL_FROM_NAME='.config('mail.from.name')."\n\n";
         }
 
-        $oldMailCredential =
-            'MAIL_USERNAME='.config('mail.username')."\n".
-            'MAIL_PASSWORD='.config('mail.password')."\n";
-
-        $resetCredential =
-            'MAIL_USERNAME='."\n".
-            'MAIL_PASSWORD='."\n";
-
         switch ($request->mail_driver) {
             case 'smtp':
-                $mailCredential=
+
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.$request->mail_username."\n".
-                    'MAIL_PASSWORD='.$request->mail_password."\n";
+                    'MAIL_PASSWORD='.$request->mail_password."\n".
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
                 break;
 
             case 'mailgun':
-                $mailCredential = $resetCredential;
+                $oldMailData =
-                $otherCredential=
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
                     'MAILGUN_SECRET='.$request->mail_mailgun_secret."\n".
-                    'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n\n";
+                    'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n";
 
-                if(env('MAILGUN_DOMAIN') && env('MAILGUN_SECRET') && env('MAILGUN_ENDPOINT')) {
+                if(env('MAILGUN_DOMAIN') !== NULL && env('MAILGUN_SECRET') !== NULL && env('MAILGUN_ENDPOINT') !== NULL) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'MAILGUN_DOMAIN='.config('services.mailgun.domain')."\n".
                         'MAILGUN_SECRET='.config('services.mailgun.secret')."\n".
-                        'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n\n";
+                        'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n";
                 }
 
                 break;
 
-            case 'sparkpost':
-                $mailCredential = $resetCredential;
-                $otherCredential=
-                    'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n\n";
-
-                if(env('SPARKPOST_SECRET')) {
-                    $oldMailOtherCredential =
-                        'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
-                }
-                break;
-
             case 'ses':
-                $mailCredential = $resetCredential;
+                $oldMailData =
-                $otherCredential=
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
-                    'SES_KEY='.$request->mail_ses_key."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
-                    'SES_SECRET='.$request->mail_ses_secret."\n\n";
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
 
-                if(env('SES_KEY') && env('SES_SECRET')) {
+                $newMailData =
-                    $oldMailOtherCredential =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
+                    'SES_KEY='.$request->mail_ses_key."\n".
+                    'SES_SECRET='.$request->mail_ses_secret."\n";
+
+                if(env('SES_KEY') !== NULL  && env('SES_SECRET') !== NULL ) {
+                    $extraOldMailData =
                         'SES_KEY='.config('services.ses.key')."\n".
-                        'SES_SECRET='.config('services.ses.secret')."\n\n";
+                        'SES_SECRET='.config('services.ses.secret')."\n";
                 }
+
                 break;
 
             case 'mail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
-                    $otherCredential;
+
                 break;
 
             case 'sendmail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
-                    $otherCredential;
-                break;
 
-            case 'mandrill':
-                $mailCredential = $oldMailCredential;
-                $otherCredential=
-                    'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n\n";
-
-                if(env('MANDRILL_API_KEY')) {
-                    $oldMailOtherCredential =
-                        'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n\n";
-                }
                 break;
         }
 
-        $oldMailData =
-            'MAIL_DRIVER='.config('mail.driver')."\n".
-            'MAIL_HOST='.config('mail.host')."\n".
-            'MAIL_PORT='.config('mail.port')."\n".
-            $oldMailCredential.
-            'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
-            $oldMailOtherCredential;
-
-        $newMailData = $existMailData ??
-            'MAIL_DRIVER='.$request->mail_driver."\n".
-            'MAIL_HOST='.$request->mail_host."\n".
-            'MAIL_PORT='.$request->mail_port."\n".
-            $mailCredential.
-            'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
-            'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-            'MAIL_FROM_NAME='.$request->from_name."\n\n".
-            $otherCredential;
-
         return [
             'old_mail_data' => $oldMailData,
-            'new_mail_data' => $newMailData
+            'new_mail_data' => $newMailData,
+            'extra_mail_data' => $extraMailData,
+            'extra_old_mail_data' => $extraOldMailData
         ];
     }
 

config/services.php

@@ -34,10 +34,6 @@ return [
         'api_key' => env('SENDGRID_API_KEY'),
     ],
 
-    'mandrill' => [
-        'secret' => env('MANDRILL_API_KEY'),
-    ],
-
     'stripe' => [
         'model' => Crater\User::class,
         'key' => env('STRIPE_KEY'),

resources/assets/js/plugins/en.js

@@ -569,16 +569,14 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
-      sparkpost_secret: 'Sparkpost Secret',
+      mailgun_secret: 'Mailgun Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',
@@ -747,16 +745,14 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
-      sparkpost_secret: 'Sparkpost Secret',
+      mailgun_secret: 'Mailgun Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',

resources/assets/js/views/settings/MailConfig.vue

@@ -25,21 +25,17 @@ import MultiSelect from 'vue-multiselect'
 import { validationMixin } from 'vuelidate'
 import Smtp from './mailDriver/Smtp'
 import Mailgun from './mailDriver/Mailgun'
-import Sparkpost from './mailDriver/Sparkpost'
 import Ses from './mailDriver/Ses'
 import Basic from './mailDriver/Basic'
-import Mandrill from './mailDriver/Mandrill'
 
 export default {
   components: {
     MultiSelect,
     Smtp,
     Mailgun,
-    Sparkpost,
     Ses,
     sendmail: Basic,
-    mail: Basic,
+    mail: Basic
-    Mandrill
   },
   mixins: [validationMixin],
   data () {

resources/assets/js/views/settings/mailDriver/Basic.vue

@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <!-- <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -50,10 +50,13 @@
           <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">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"

resources/assets/js/views/settings/mailDriver/Mailgun.vue

@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -75,7 +75,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -88,19 +88,19 @@
           <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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
@@ -112,13 +112,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.domain') }}</label>
+        <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="db_name"
+          name="mailgun_domain"
           @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
@@ -128,13 +128,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgin_secret') }}</label>
+        <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="name"
+          name="mailgun_secret"
           show-password
           @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
@@ -147,13 +147,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.endpoint') }}</label>
+        <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="mail_mailgun_endpoint"
+          name="mailgun_endpoint"
           @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">

resources/assets/js/views/settings/mailDriver/Mandrill.vue

@@ -1,230 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.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.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.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.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <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>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.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.mandrill_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mandrill_secret.$error"
-          v-model.trim="mailConfigData.mail_mandrill_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_mandrill_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mandrill_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mandrill_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_mandrill_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_mandrill_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>

resources/assets/js/views/settings/mailDriver/Ses.vue

@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -75,7 +75,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -88,13 +88,13 @@
           <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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
@@ -112,13 +112,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.ses_key') }}</label>
+        <label class="form-label">{{ $t('settings.mail.ses_key') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_ses_key.$error"
           v-model.trim="mailConfigData.mail_ses_key"
           type="text"
-          name="name"
+          name="mail_ses_key"
           @input="$v.mailConfigData.mail_ses_key.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_ses_key.$error">
@@ -128,13 +128,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.ses_secret') }}</label>
+        <label class="form-label">{{ $t('settings.mail.ses_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_ses_secret.$error"
           v-model.trim="mailConfigData.mail_ses_secret"
           type="password"
-          name="name"
+          name="mail_ses_secret"
           show-password
           @input="$v.mailConfigData.mail_ses_secret.$touch()"
         />

resources/assets/js/views/settings/mailDriver/Smtp.vue

@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.username') }}</label>
+        <label class="form-label">{{ $t('settings.mail.username') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_username.$error"
@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.password') }}</label>
+        <label class="form-label">{{ $t('settings.mail.password') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_password.$error"
@@ -72,7 +72,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -91,7 +91,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -110,7 +110,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -123,19 +123,19 @@
           <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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">

resources/assets/js/views/settings/mailDriver/Sparkpost.vue

@@ -1,233 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.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.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.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.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <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>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.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.sparkpost_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_sparkpost_secret.$error"
-          v-model.trim="mailConfigData.mail_sparkpost_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_sparkpost_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_sparkpost_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_sparkpost_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_sparkpost_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_sparkpost_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>

resources/assets/js/views/wizard/EmailConfiguration.vue

@@ -19,21 +19,17 @@ import MultiSelect from 'vue-multiselect'
 import { validationMixin } from 'vuelidate'
 import Smtp from './mailDriver/Smtp'
 import Mailgun from './mailDriver/Mailgun'
-import Sparkpost from './mailDriver/Sparkpost'
 import Ses from './mailDriver/Ses'
 import Basic from './mailDriver/Basic'
-import Mandrill from './mailDriver/Mandrill'
 
 export default {
   components: {
     MultiSelect,
     Smtp,
     Mailgun,
-    Sparkpost,
     Ses,
     sendmail: Basic,
-    mail: Basic,
+    mail: Basic
-    Mandrill
   },
   mixins: [validationMixin],
   data () {
@@ -63,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))

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">

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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
@@ -100,7 +100,7 @@
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
@@ -112,13 +112,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.domain') }}</label>
+        <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="db_name"
+          name="mailgun_domain"
           @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
@@ -128,13 +128,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgin_secret') }}</label>
+        <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="name"
+          name="mailgun_secret"
           show-password
           @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
@@ -147,13 +147,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.endpoint') }}</label>
+        <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="mail_mailgun_endpoint"
+          name="mailgun_endpoint"
           @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">

resources/assets/js/views/wizard/mailDriver/Mandrill.vue

@@ -1,230 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.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.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.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.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <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>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.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.mandrill_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mandrill_secret.$error"
-          v-model.trim="mailConfigData.mail_mandrill_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_mandrill_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mandrill_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mandrill_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_mandrill_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_mandrill_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>

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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
@@ -118,7 +118,7 @@
           :invalid="$v.mailConfigData.mail_ses_key.$error"
           v-model.trim="mailConfigData.mail_ses_key"
           type="text"
-          name="name"
+          name="mail_ses_key"
           @input="$v.mailConfigData.mail_ses_key.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_ses_key.$error">
@@ -134,7 +134,7 @@
           :invalid="$v.mailConfigData.mail_ses_secret.$error"
           v-model.trim="mailConfigData.mail_ses_secret"
           type="password"
-          name="name"
+          name="mail_ses_secret"
           show-password
           @input="$v.mailConfigData.mail_ses_secret.$touch()"
         />

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">
+          <span v-if="!$v.mailConfigData.from_mail.email" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
+            {{ $tc('validation.email_incorrect') }}
           </span>
         </div>
       </div>
@@ -135,7 +135,7 @@
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">

resources/assets/js/views/wizard/mailDriver/Sparkpost.vue

@@ -1,233 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.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.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.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.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <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>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.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.sparkpost_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_sparkpost_secret.$error"
-          v-model.trim="mailConfigData.mail_sparkpost_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_sparkpost_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_sparkpost_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_sparkpost_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_sparkpost_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_sparkpost_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>

resources/views/emails/send/estimate.blade.php

@@ -1,10 +1,32 @@
-@component('mail::message')
+@component('mail::layout')
-Check your estimate.
+    {{-- Header --}}
+    @slot('header')
+        @component('mail::header', ['url' => ''])
+        @if($data['company']['logo'])
+            <img class="header-logo" src="{{asset($data['company']['logo'])}}" alt="{{$data['company']['name']}}">
+        @else
+            {{$data['company']['name']}}
+        @endif
+        @endcomponent
+    @endslot
 
-@component('mail::button', ['url' => url('/customer/estimates/pdf/'.$data['estimate']['unique_hash'])])
+    {{-- Body --}}
-Get your estimate
+    <!-- Body here -->
+
+    {{-- Subcopy --}}
+    @slot('subcopy')
+        @component('mail::subcopy')
+            You have received a new estimate from <span class="company-name">{{$data['company']['name']}}</span>
+            @component('mail::button', ['url' => url('/customer/estimates/pdf/'.$data['estimate']['unique_hash'])])
+                View Estimate
+            @endcomponent
+        @endcomponent
+    @endslot
+     {{-- Footer --}}
+     @slot('footer')
+        @component('mail::footer')
+            Powered by <a class="footer-link" href="https://craterapp.com">Crater</a>
+        @endcomponent
+    @endslot
 @endcomponent
 
-Thanks,<br>
-{{ config('app.name') }}
-@endcomponent

resources/views/emails/send/invoice.blade.php

@@ -1,10 +1,31 @@
-@component('mail::message')
+@component('mail::layout')
-Thanks for buying.
+    {{-- Header --}}
+    @slot('header')
+        @component('mail::header', ['url' => ''])
+        @if($data['company']['logo'])
+            <img class="header-logo" src="{{asset($data['company']['logo'])}}" alt="{{$data['company']['name']}}">
+        @else
+            {{$data['company']['name']}}
+        @endif
+        @endcomponent
+    @endslot
 
-@component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])])
+    {{-- Body --}}
-Get your invoice
+    <!-- Body here -->
-@endcomponent
 
-Thanks,<br>
+    {{-- Subcopy --}}
-{{ config('app.name') }}
+    @slot('subcopy')
+        @component('mail::subcopy')
+            You have received a new invoice from <span class="company-name">{{$data['company']['name']}}</span>
+            @component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])])
+                View Invoice
+            @endcomponent
+        @endcomponent
+    @endslot
+     {{-- Footer --}}
+     @slot('footer')
+        @component('mail::footer')
+            Powered by <a class="footer-link" href="https://craterapp.com">Crater</a>
+        @endcomponent
+    @endslot
 @endcomponent

resources/views/vendor/mail/html/button.blade.php

@@ -0,0 +1,19 @@
+<table class="action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+        <td align="center">
+            <table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
+                <tr>
+                    <td align="center">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation">
+                            <tr>
+                                <td>
+                                    <a href="{{ $url }}" class="button button-{{ $color ?? 'primary' }}" target="_blank">{{ $slot }}</a>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>

resources/views/vendor/mail/html/footer.blade.php

@@ -0,0 +1,11 @@
+<tr>
+    <td>
+        <table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+            <tr>
+                <td class="content-cell" align="center">
+                    {{ Illuminate\Mail\Markdown::parse($slot) }}
+                </td>
+            </tr>
+        </table>
+    </td>
+</tr>

resources/views/vendor/mail/html/header.blade.php

@@ -0,0 +1,7 @@
+<tr>
+    <td class="header">
+        {{-- <a href="#"> --}}
+            {{ $slot }}
+        {{-- </a> --}}
+    </td>
+</tr>

resources/views/vendor/mail/html/layout.blade.php

@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+    <style>
+        @media only screen and (max-width: 600px) {
+            .inner-body {
+                width: 100% !important;
+            }
+
+            .footer {
+                width: 100% !important;
+            }
+        }
+
+        @media only screen and (max-width: 500px) {
+            .button {
+                width: 100% !important;
+            }
+        }
+    </style>
+
+    <table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+        <tr>
+            <td align="center">
+                <table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+                    {{ $header ?? '' }}
+
+                    <!-- Email Body -->
+                    <tr>
+                        <td class="body" width="100%" cellpadding="0" cellspacing="0">
+                            <table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+                                <!-- Body content -->
+                                <tr>
+                                    <td class="content-cell">
+                                        {{ Illuminate\Mail\Markdown::parse($slot) }}
+
+                                        {{ $subcopy ?? '' }}
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+
+                    {{ $footer ?? '' }}
+                </table>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>

resources/views/vendor/mail/html/message.blade.php

@@ -0,0 +1,27 @@
+@component('mail::layout')
+    {{-- Header --}}
+    @slot('header')
+        @component('mail::header', ['url' => config('app.url')])
+            {{ config('app.name') }}
+        @endcomponent
+    @endslot
+
+    {{-- Body --}}
+    {{ $slot }}
+
+    {{-- Subcopy --}}
+    @isset($subcopy)
+        @slot('subcopy')
+            @component('mail::subcopy')
+                {{ $subcopy }}
+            @endcomponent
+        @endslot
+    @endisset
+
+    {{-- Footer --}}
+    @slot('footer')
+        @component('mail::footer')
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+        @endcomponent
+    @endslot
+@endcomponent

resources/views/vendor/mail/html/panel.blade.php

@@ -0,0 +1,13 @@
+<table class="panel" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+        <td class="panel-content">
+            <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
+                <tr>
+                    <td class="panel-item">
+                        {{ Illuminate\Mail\Markdown::parse($slot) }}
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>

resources/views/vendor/mail/html/promotion.blade.php

@@ -0,0 +1,7 @@
+<table class="promotion" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+        <td align="center">
+            {{ Illuminate\Mail\Markdown::parse($slot) }}
+        </td>
+    </tr>
+</table>

resources/views/vendor/mail/html/promotion/button.blade.php

@@ -0,0 +1,13 @@
+<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+        <td align="center">
+            <table border="0" cellpadding="0" cellspacing="0" role="presentation">
+                <tr>
+                    <td>
+                        <a href="{{ $url }}" class="button button-green" target="_blank">{{ $slot }}</a>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>

resources/views/vendor/mail/html/subcopy.blade.php

@@ -0,0 +1,7 @@
+<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+        <td>
+            {{ Illuminate\Mail\Markdown::parse($slot) }}
+        </td>
+    </tr>
+</table>

resources/views/vendor/mail/html/table.blade.php

@@ -0,0 +1,3 @@
+<div class="table">
+{{ Illuminate\Mail\Markdown::parse($slot) }}
+</div>

resources/views/vendor/mail/html/themes/default.css

@@ -0,0 +1,307 @@
+/* Base */
+
+body,
+body *:not(html):not(style):not(br):not(tr):not(code) {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
+        'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+    box-sizing: border-box;
+}
+
+body {
+    background-color: #f8fafc;
+    color: #74787e;
+    height: 100%;
+    hyphens: auto;
+    line-height: 1.4;
+    margin: 0;
+    -moz-hyphens: auto;
+    -ms-word-break: break-all;
+    width: 100% !important;
+    -webkit-hyphens: auto;
+    -webkit-text-size-adjust: none;
+    word-break: break-all;
+    word-break: break-word;
+}
+
+p,
+ul,
+ol,
+blockquote {
+    line-height: 1.4;
+    text-align: left;
+}
+
+a {
+    color: #3869d4;
+}
+
+a img {
+    border: none;
+}
+
+/* Typography */
+
+h1 {
+    color: #3d4852;
+    font-size: 19px;
+    font-weight: bold;
+    margin-top: 0;
+    text-align: left;
+}
+
+h2 {
+    color: #3d4852;
+    font-size: 16px;
+    font-weight: bold;
+    margin-top: 0;
+    text-align: left;
+}
+
+h3 {
+    color: #3d4852;
+    font-size: 14px;
+    font-weight: bold;
+    margin-top: 0;
+    text-align: left;
+}
+
+p {
+    color: #3d4852;
+    font-size: 16px;
+    line-height: 1.5em;
+    margin-top: 0;
+    text-align: left;
+}
+
+p.sub {
+    font-size: 12px;
+}
+
+img {
+    max-width: 100%;
+}
+
+/* Layout */
+
+.wrapper {
+    background-color: #f8fafc;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+
+.content {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+
+/* Header */
+
+.header {
+    padding: 25px 0;
+    text-align: center;
+}
+
+.header {
+    color: #bbbfc3;
+    font-size: 25px;
+    font-weight: 400;
+    text-transform: capitalize;
+    text-decoration: none;
+    text-shadow: 0 1px 0 white;
+}
+
+.header-logo {
+    height: 50px;
+}
+
+/* Body */
+
+.body {
+    background-color: #ffffff;
+    border-bottom: 1px solid #edeff2;
+    border-top: 1px solid #edeff2;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+.company-name {
+    font-weight: 500;
+    margin-left: 4px;
+}
+
+.inner-body {
+    background-color: #ffffff;
+    margin: 0 auto;
+    padding: 0;
+    width: 570px;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 570px;
+}
+
+/* Subcopy */
+
+.subcopy {
+    margin-top: 25px;
+    padding-top: 25px;
+}
+
+.subcopy p {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+    font-size: 20px;
+}
+
+/* Footer */
+
+.footer {
+    margin: 0 auto;
+    padding: 0;
+    text-align: center;
+    width: 570px;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 570px;
+}
+
+.footer p {
+    color: #aeaeae;
+    font-size: 12px;
+    text-align: center;
+}
+
+.footer-link {
+    text-decoration: none;
+    color: #5851D8;
+}
+/* Tables */
+
+.table table {
+    margin: 30px auto;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+
+.table th {
+    border-bottom: 1px solid #edeff2;
+    padding-bottom: 8px;
+    margin: 0;
+}
+
+.table td {
+    color: #74787e;
+    font-size: 15px;
+    line-height: 18px;
+    padding: 10px 0;
+    margin: 0;
+}
+
+.content-cell {
+    padding: 35px;
+}
+
+/* Buttons */
+
+.action {
+    margin: 30px auto;
+    padding: 0;
+    text-align: center;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+
+.button {
+    border-radius: 3px;
+    box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
+    color: #fff;
+    display: inline-block;
+    text-decoration: none;
+    -webkit-text-size-adjust: none;
+}
+
+.button-blue,
+.button-primary {
+    background-color: #5851D8;
+    border-top: 10px solid #5851D8;
+    border-right: 18px solid #5851D8;
+    border-bottom: 10px solid #5851D8;
+    border-left: 18px solid #5851D8;
+}
+
+.button-green,
+.button-success {
+    background-color: #38c172;
+    border-top: 10px solid #38c172;
+    border-right: 18px solid #38c172;
+    border-bottom: 10px solid #38c172;
+    border-left: 18px solid #38c172;
+}
+
+.button-red,
+.button-error {
+    background-color: #e3342f;
+    border-top: 10px solid #e3342f;
+    border-right: 18px solid #e3342f;
+    border-bottom: 10px solid #e3342f;
+    border-left: 18px solid #e3342f;
+}
+
+/* Panels */
+
+.panel {
+    margin: 0 0 21px;
+}
+
+.panel-content {
+    background-color: #f1f5f8;
+    padding: 16px;
+}
+
+.panel-item {
+    padding: 0;
+}
+
+.panel-item p:last-of-type {
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+
+/* Promotions */
+
+.promotion {
+    background-color: #ffffff;
+    border: 2px dashed #9ba2ab;
+    margin: 0;
+    margin-bottom: 25px;
+    margin-top: 25px;
+    padding: 24px;
+    width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    -premailer-width: 100%;
+}
+
+.promotion h1 {
+    text-align: center;
+}
+
+.promotion p {
+    font-size: 15px;
+    text-align: center;
+}

resources/views/vendor/mail/text/button.blade.php

@@ -0,0 +1 @@
+{{ $slot }}: {{ $url }}

resources/views/vendor/mail/text/footer.blade.php

@@ -0,0 +1 @@
+{{ $slot }}

resources/views/vendor/mail/text/header.blade.php

@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})

resources/views/vendor/mail/text/layout.blade.php

@@ -0,0 +1,9 @@
+{!! strip_tags($header) !!}
+
+{!! strip_tags($slot) !!}
+@isset($subcopy)
+
+{!! strip_tags($subcopy) !!}
+@endisset
+
+{!! strip_tags($footer) !!}

resources/views/vendor/mail/text/message.blade.php

@@ -0,0 +1,27 @@
+@component('mail::layout')
+    {{-- Header --}}
+    @slot('header')
+        @component('mail::header', ['url' => config('app.url')])
+            {{ config('app.name') }}
+        @endcomponent
+    @endslot
+
+    {{-- Body --}}
+    {{ $slot }}
+
+    {{-- Subcopy --}}
+    @isset($subcopy)
+        @slot('subcopy')
+            @component('mail::subcopy')
+                {{ $subcopy }}
+            @endcomponent
+        @endslot
+    @endisset
+
+    {{-- Footer --}}
+    @slot('footer')
+        @component('mail::footer')
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+        @endcomponent
+    @endslot
+@endcomponent

resources/views/vendor/mail/text/panel.blade.php

@@ -0,0 +1 @@
+{{ $slot }}

resources/views/vendor/mail/text/promotion.blade.php

@@ -0,0 +1 @@
+{{ $slot }}

resources/views/vendor/mail/text/promotion/button.blade.php

@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})

resources/views/vendor/mail/text/subcopy.blade.php

@@ -0,0 +1 @@
+{{ $slot }}

resources/views/vendor/mail/text/table.blade.php

@@ -0,0 +1 @@
+{{ $slot }}