upgrade vite

app/Http/Controllers/V1/Admin/MailSender/GetAllMailSendersController.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\MailSender;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\MailSenderResource;
-use Crater\Models\MailSender;
-use Illuminate\Http\Request;
-
-class GetAllMailSendersController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $mailSenders = MailSender::whereCompany()->get();
-
-        return MailSenderResource::collection($mailSenders);
-    }
-}

app/Http/Controllers/V1/Admin/MailSender/MailSenderController.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\MailSender;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\MailSenderRequest;
-use Crater\Http\Resources\MailSenderResource;
-use Crater\Models\MailSender;
-use Illuminate\Http\Request;
-
-class MailSenderController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('viewAny', MailSender::class);
-
-        $limit = $request->has('limit') ? $request->limit : 10;
-
-        $mailSenders = MailSender::whereCompany()
-            ->applyFilters($request->all())
-            ->paginateData($limit);
-
-        return (MailSenderResource::collection($mailSenders))
-            ->additional(['meta' => [
-                'mail_sender_total_count' => MailSender::whereCompany()->count(),
-            ]]);
-    }
-
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(MailSenderRequest $request)
-    {
-        $this->authorize('create', MailSender::class);
-
-        $mailSender = MailSender::createFromRequest($request);
-
-        return new MailSenderResource($mailSender);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \Crater\Models\SenderMail  $senderMail
-     * @return \Illuminate\Http\Response
-     */
-    public function show(MailSender $mailSender)
-    {
-        $this->authorize('view', $mailSender);
-
-        return new MailSenderResource($mailSender);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Crater\Models\SenderMail  $senderMail
-     * @return \Illuminate\Http\Response
-     */
-    public function update(MailSenderRequest $request, MailSender $mailSender)
-    {
-        $this->authorize('update', $mailSender);
-
-        $mailSender->updateFromRequest($request);
-
-        return new MailSenderResource($mailSender);
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \Crater\Models\SenderMail  $senderMail
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(MailSender $mailSender)
-    {
-        $this->authorize('delete', $mailSender);
-
-        if ($mailSender->is_default) {
-           return respondJson('You can\'t remove default mail sender.', 'You can\'t remove default mail sender.');
-        }
-
-        $mailSender->delete();
-
-        return response()->json([
-            'success' => true,
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php

@@ -3,29 +3,80 @@
 namespace Crater\Http\Controllers\V1\Admin\Settings;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\TestMailDriverRequest;
+use Crater\Http\Requests\MailEnvironmentRequest;
 use Crater\Mail\TestMail;
-use Crater\Models\MailSender;
+use Crater\Models\Setting;
+use Crater\Space\EnvironmentManager;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Mail;
 
 class MailConfigurationController extends Controller
 {
-    public function TestMailDriver(TestMailDriverRequest $request)
+    /**
+     * @var EnvironmentManager
+     */
+    protected $environmentManager;
+
+    /**
+     * @param EnvironmentManager $environmentManager
+     */
+    public function __construct(EnvironmentManager $environmentManager)
+    {
+        $this->environmentManager = $environmentManager;
+    }
+
+    /**
+     *
+     * @param MailEnvironmentRequest $request
+     * @return JsonResponse
+     */
+    public function saveMailEnvironment(MailEnvironmentRequest $request)
     {
         $this->authorize('manage email config');
 
-        MailSender::setMailConfiguration($request->mail_sender_id);
+        $setting = Setting::getSetting('profile_complete');
+        $results = $this->environmentManager->saveMailVariables($request);
 
-        Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
+        if ($setting !== 'COMPLETED') {
+            Setting::setSetting('profile_complete', 4);
+        }
 
-        return response()->json([
+        return response()->json($results);
-            'success' => true,
-        ]);
     }
 
-    public function getMailDrivers(Request $request)
+    public function getMailEnvironment()
     {
+        $this->authorize('manage email config');
+
+        $MailData = [
+            'mail_driver' => config('mail.driver'),
+            'mail_host' => config('mail.host'),
+            'mail_port' => config('mail.port'),
+            'mail_username' => config('mail.username'),
+            'mail_password' => config('mail.password'),
+            'mail_encryption' => config('mail.encryption'),
+            'from_name' => config('mail.from.name'),
+            'from_mail' => config('mail.from.address'),
+            'mail_mailgun_endpoint' => config('services.mailgun.endpoint'),
+            'mail_mailgun_domain' => config('services.mailgun.domain'),
+            'mail_mailgun_secret' => config('services.mailgun.secret'),
+            'mail_ses_key' => config('services.ses.key'),
+            'mail_ses_secret' => config('services.ses.secret'),
+        ];
+
+
+        return response()->json($MailData);
+    }
+
+    /**
+     *
+     * @return JsonResponse
+     */
+    public function getMailDrivers()
+    {
+        $this->authorize('manage email config');
+
         $drivers = [
             'smtp',
             'mail',
@@ -36,4 +87,21 @@ class MailConfigurationController extends Controller
 
         return response()->json($drivers);
     }
+
+    public function testEmailConfig(Request $request)
+    {
+        $this->authorize('manage email config');
+
+        $this->validate($request, [
+            'to' => 'required|email',
+            'subject' => 'required',
+            'message' => 'required',
+        ]);
+
+        Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
+
+        return response()->json([
+            'success' => true,
+        ]);
+    }
 }

app/Http/Controllers/V1/Customer/EstimatePdfController.php

@@ -9,7 +9,6 @@ use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
 use Crater\Models\EmailLog;
 use Crater\Models\Estimate;
-use Crater\Models\MailSender;
 use Illuminate\Http\Request;
 
 class EstimatePdfController extends Controller
@@ -28,16 +27,14 @@ class EstimatePdfController extends Controller
                 );
 
                 if ($notifyEstimateViewed == 'YES') {
-                    $notificationEmail = CompanySetting::getSetting('notification_email', $estimate->company_id);
-                    $mailSender = MailSender::where('company_id', $estimate->company_id)->where('is_default', true)->first();
-                    MailSender::setMailConfiguration($mailSender->id);
-
-                    $data['from_address'] = $mailSender->from_address;
-                    $data['from_name'] = $mailSender->from_name;
-                    $data['user'] = Customer::find($estimate->customer_id)->toArray();
                     $data['estimate'] = Estimate::findOrFail($estimate->id)->toArray();
+                    $data['user'] = Customer::find($estimate->customer_id)->toArray();
+                    $notificationEmail = CompanySetting::getSetting(
+                        'notification_email',
+                        $estimate->company_id
+                    );
 
-                    send_mail(new EstimateViewedMail($data), $mailSender, $notificationEmail);
+                    \Mail::to($notificationEmail)->send(new EstimateViewedMail($data));
                 }
             }
 

app/Http/Controllers/V1/Customer/InvoicePdfController.php

@@ -9,7 +9,6 @@ use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
 use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
-use Crater\Models\MailSender;
 use Illuminate\Http\Request;
 
 class InvoicePdfController extends Controller
@@ -29,16 +28,14 @@ class InvoicePdfController extends Controller
                 );
 
                 if ($notifyInvoiceViewed == 'YES') {
-                    $notificationEmail = CompanySetting::getSetting('notification_email', $invoice->company_id);
-                    $mailSender = MailSender::where('company_id', $invoice->company_id)->where('is_default', true)->first();
-                    MailSender::setMailConfiguration($mailSender->id);
-
-                    $data['from_address'] = $mailSender->from_address;
-                    $data['from_name'] = $mailSender->from_name;
                     $data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
                     $data['user'] = Customer::find($invoice->customer_id)->toArray();
+                    $notificationEmail = CompanySetting::getSetting(
+                        'notification_email',
+                        $invoice->company_id
+                    );
 
-                    send_mail(new InvoiceViewedMail($data), $mailSender, $notificationEmail);
+                    \Mail::to($notificationEmail)->send(new InvoiceViewedMail($data));
                 }
             }
 

app/Http/Middleware/ConfigMiddleware.php

@@ -4,7 +4,6 @@ namespace Crater\Http\Middleware;
 
 use Closure;
 use Crater\Models\FileDisk;
-use Crater\Models\MailSender;
 
 class ConfigMiddleware
 {
@@ -29,12 +28,6 @@ class ConfigMiddleware
             }
         }
 
-        $default_mail_sender = MailSender::where('company_id', $request->header('company'))->where('is_default', true)->first();
-
-        if ($default_mail_sender) {
-            $default_mail_sender->setMailConfiguration($default_mail_sender->id);
-        }
-
         return $next($request);
     }
 }

app/Http/Requests/MailSenderRequest.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Validation\Rule;
-use Illuminate\Foundation\Http\FormRequest;
-
-class MailSenderRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        $rules = [
-            'name' => [
-                'required',
-                Rule::unique('mail_senders')
-                ->where('company_id', $this->header('company'))
-            ],
-            'driver' => [
-                'required',
-            ],
-            'is_default' => [
-                'nullable'
-            ],
-            'bcc' => [
-                'nullable'
-            ],
-            'cc' => [
-                'nullable'
-            ],
-            'from_address' => [
-                'nullable'
-            ],
-            'from_name' => [
-                'nullable'
-            ],
-            'settings' => [
-                'nullable'
-            ],
-            'settings.*' => [
-                'nullable'
-            ]
-        ];
-
-        if ($this->isMethod('PUT')) {
-            $rules['name'] = [
-                'nullable',
-                Rule::unique('mail_senders')
-                    ->ignore($this->route('mail_sender')->id)
-                    ->where('company_id', $this->header('company'))
-            ];
-        }
-
-        return $rules;
-    }
-
-    public function getMailSenderPayload()
-    {
-        $data = $this->validated();
-
-        if ($data['settings'] && $data['settings']['encryption'] == 'none') {
-            $data['settings']['encryption'] = '';
-        }
-
-        return collect($data)
-            ->merge([
-                'company_id' => $this->header('company'),
-            ])
-            ->toArray();
-    }
-}

app/Http/Requests/SendEstimatesRequest.php

@@ -30,7 +30,7 @@ class SendEstimatesRequest extends FormRequest
             'body' => [
                 'required',
             ],
-            'mail_sender_id' => [
+            'from' => [
                 'required',
             ],
             'to' => [

app/Http/Requests/SendInvoiceRequest.php

@@ -30,7 +30,7 @@ class SendInvoiceRequest extends FormRequest
             'subject' => [
                 'required',
             ],
-            'mail_sender_id' => [
+            'from' => [
                 'required',
             ],
             'to' => [

app/Http/Requests/SendPaymentRequest.php

@@ -30,7 +30,7 @@ class SendPaymentRequest extends FormRequest
             'body' => [
                 'required',
             ],
-            'mail_sender_id' => [
+            'from' => [
                 'required',
             ],
             'to' => [

app/Http/Requests/TestMailDriverRequest.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class TestMailDriverRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'to' => [
-                'required',
-                'email'
-            ],
-            'subject' => [
-                'required'
-            ],
-            'message' => [
-                'required'
-            ],
-        ];
-    }
-}

app/Http/Resources/MailSenderResource.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class MailSenderResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'driver' => $this->driver,
-            'is_default' => $this->is_default,
-            'bcc' => $this->bcc,
-            'cc' => $this->cc,
-            'from_address' => $this->from_address,
-            'from_name' => $this->from_name,
-            'company_id' => $this->company_id,
-            'settings' => $this->settings
-        ];
-    }
-}

app/Mail/EstimateViewedMail.php

@@ -30,7 +30,7 @@ class EstimateViewedMail extends Mailable
      */
     public function build()
     {
-        return $this->from($this->data['from_address'], $this->data['from_name'])
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->markdown('emails.viewed.estimate', ['data', $this->data]);
     }
 }

app/Mail/InvoiceViewedMail.php

@@ -30,7 +30,7 @@ class InvoiceViewedMail extends Mailable
      */
     public function build()
     {
-        return $this->from($this->data['from_address'], $this->data['from_name'])
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->markdown('emails.viewed.invoice', ['data', $this->data]);
     }
 }

app/Mail/SendEstimateMail.php

@@ -34,7 +34,7 @@ class SendEstimateMail extends Mailable
     public function build()
     {
         $log = EmailLog::create([
-            'from' => $this->data['from_address'],
+            'from' => $this->data['from'],
             'to' => $this->data['to'],
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
@@ -47,10 +47,9 @@ class SendEstimateMail extends Mailable
 
         $this->data['url'] = route('estimate', ['email_log' => $log->token]);
 
-        $mailContent = $this->from($this->data['from_address'], $this->data['from_name'])
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
-            ->subject($this->data['subject'])
+                    ->subject($this->data['subject'])
-            ->markdown("emails.send.estimate", ['data', $this->data]);
+                    ->markdown('emails.send.estimate', ['data', $this->data]);
-
 
         if ($this->data['attach']['data']) {
             $mailContent->attachData(

app/Mail/SendInvoiceMail.php

@@ -34,7 +34,7 @@ class SendInvoiceMail extends Mailable
     public function build()
     {
         $log = EmailLog::create([
-            'from' => $this->data['from_address'],
+            'from' => $this->data['from'],
             'to' => $this->data['to'],
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
@@ -47,9 +47,9 @@ class SendInvoiceMail extends Mailable
 
         $this->data['url'] = route('invoice', ['email_log' => $log->token]);
 
-        $mailContent = $this->from($this->data['from_address'], $this->data['from_name'])
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
             ->subject($this->data['subject'])
-            ->markdown("emails.send.invoice", ['data', $this->data]);
+            ->markdown('emails.send.invoice', ['data', $this->data]);
 
         if ($this->data['attach']['data']) {
             $mailContent->attachData(

app/Mail/SendPaymentMail.php

@@ -34,7 +34,7 @@ class SendPaymentMail extends Mailable
     public function build()
     {
         $log = EmailLog::create([
-            'from' => $this->data['from_address'],
+            'from' => $this->data['from'],
             'to' => $this->data['to'],
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
@@ -47,9 +47,9 @@ class SendPaymentMail extends Mailable
 
         $this->data['url'] = route('payment', ['email_log' => $log->token]);
 
-        $mailContent = $this->from($this->data['from_address'], $this->data['from_name'])
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
-            ->subject($this->data['subject'])
+                    ->subject($this->data['subject'])
-            ->markdown("emails.send.payment", ['data', $this->data]);
+                    ->markdown('emails.send.payment', ['data', $this->data]);
 
         if ($this->data['attach']['data']) {
             $mailContent->attachData(

app/Models/Estimate.php

@@ -5,10 +5,10 @@ namespace Crater\Models;
 use App;
 use Barryvdh\DomPDF\Facade as PDF;
 use Carbon\Carbon;
+use Crater\Mail\SendEstimateMail;
 use Crater\Services\SerialNumberFormatter;
 use Crater\Traits\GeneratesPdfTrait;
 use Crater\Traits\HasCustomFieldsTrait;
-use Crater\Traits\MailTrait;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
@@ -20,7 +20,6 @@ use Vinkla\Hashids\Facades\Hashids;
 class Estimate extends Model implements HasMedia
 {
     use HasFactory;
-    use MailTrait;
     use InteractsWithMedia;
     use GeneratesPdfTrait;
     use HasCustomFieldsTrait;
@@ -364,7 +363,7 @@ class Estimate extends Model implements HasMedia
             $this->save();
         }
 
-        $this->setMail('estimate', $data);
+        \Mail::to($data['to'])->send(new SendEstimateMail($data));
 
         return [
             'success' => true,

app/Models/Invoice.php

@@ -9,7 +9,6 @@ use Crater\Mail\SendInvoiceMail;
 use Crater\Services\SerialNumberFormatter;
 use Crater\Traits\GeneratesPdfTrait;
 use Crater\Traits\HasCustomFieldsTrait;
-use Crater\Traits\MailTrait;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
@@ -22,7 +21,6 @@ use Vinkla\Hashids\Facades\Hashids;
 class Invoice extends Model implements HasMedia
 {
     use HasFactory;
-    use MailTrait;
     use InteractsWithMedia;
     use GeneratesPdfTrait;
     use HasCustomFieldsTrait;
@@ -466,7 +464,7 @@ class Invoice extends Model implements HasMedia
     {
         $data = $this->sendInvoiceData($data);
 
-        $this->setMail('invoice', $data);
+        \Mail::to($data['to'])->send(new SendInvoiceMail($data));
 
         if ($this->status == Invoice::STATUS_DRAFT) {
             $this->status = Invoice::STATUS_SENT;

app/Models/MailSender.php

@@ -1,111 +0,0 @@
-<?php
-
-namespace Crater\Models;
-
-use Crater\Http\Requests\MailSenderRequest;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Config;
-
-class MailSender extends Model
-{
-    use HasFactory;
-
-    protected $guarded = [
-        'id'
-    ];
-
-    protected $casts = [
-        'settings' => 'array',
-        'is_default' => 'boolean'
-    ];
-
-    public function company()
-    {
-        return $this->belongsTo(Company::class);
-    }
-
-    public function scopeWhereOrder($query, $orderByField, $orderBy)
-    {
-        $query->orderBy($orderByField, $orderBy);
-    }
-
-    public function scopeApplyFilters($query, array $filters)
-    {
-        $filters = collect($filters);
-
-        if ($filters->get('orderByField') || $filters->get('orderBy')) {
-            $field = $filters->get('orderByField') ? $filters->get('orderByField') : 'name';
-            $orderBy = $filters->get('orderBy') ? $filters->get('orderBy') : 'desc';
-            $query->whereOrder($field, $orderBy);
-        }
-    }
-
-    public function scopePaginateData($query, $limit)
-    {
-        if ($limit == 'all') {
-            return $query->get();
-        }
-
-        return $query->paginate($limit);
-    }
-
-    public function scopeWhereCompany($query)
-    {
-        $query->where('mail_senders.company_id', request()->header('company'));
-    }
-
-    public static function createFromRequest(MailSenderRequest $request)
-    {
-        $senderMail = self::create($request->getMailSenderPayload());
-
-        if ($request->is_default) {
-            $senderMail->removeOtherDefaultMailSenders($request);
-        }
-
-        return $senderMail;
-    }
-
-    public function updateFromRequest(MailSenderRequest $request)
-    {
-        $data = $request->getMailSenderPayload();
-
-        $this->update($data);
-
-        if ($request->is_default) {
-            $this->removeOtherDefaultMailSenders($request);
-        }
-
-        return $this;
-    }
-
-    public static function setMailConfiguration($id, $check = null)
-    {
-        $mailSender = MailSender::find($id);
-
-        $settings = $mailSender->settings;
-        $settings['driver'] = $mailSender->driver;
-        $settings['from'] = [
-            'address' => $mailSender->from_address,
-            'name' => $mailSender->from_name
-        ];
-        $settings['sendmail'] = config('mail.sendmail');
-        $settings['markdown'] = config('mail.markdown');
-        $settings['log_channel'] = config('mail.log_channel');
-
-        Config::set('mail', $settings);
-
-        if ($check) {
-            return $mailSender;
-        }
-
-        return true;
-    }
-
-    public function removeOtherDefaultMailSenders($request) {
-        MailSender::where('company_id', $request->header('company'))
-            ->where('is_default', true)
-            ->where('id', '<>', $this->id)
-            ->update(['is_default' => false]);
-    }
-}

app/Models/Payment.php

@@ -5,10 +5,10 @@ namespace Crater\Models;
 use Barryvdh\DomPDF\Facade as PDF;
 use Carbon\Carbon;
 use Crater\Jobs\GeneratePaymentPdfJob;
+use Crater\Mail\SendPaymentMail;
 use Crater\Services\SerialNumberFormatter;
 use Crater\Traits\GeneratesPdfTrait;
 use Crater\Traits\HasCustomFieldsTrait;
-use Crater\Traits\MailTrait;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\MediaLibrary\HasMedia;
@@ -18,7 +18,6 @@ use Vinkla\Hashids\Facades\Hashids;
 class Payment extends Model implements HasMedia
 {
     use HasFactory;
-    use MailTrait;
     use InteractsWithMedia;
     use GeneratesPdfTrait;
     use HasCustomFieldsTrait;
@@ -136,7 +135,7 @@ class Payment extends Model implements HasMedia
     {
         $data = $this->sendPaymentData($data);
 
-        $this->setMail('payment', $data);
+        \Mail::to($data['to'])->send(new SendPaymentMail($data));
 
         return [
             'success' => true,

app/Policies/MailSenderPolicy.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace Crater\Policies;
-
-use Crater\Models\MailSender;
-use Crater\Models\User;
-use Illuminate\Auth\Access\HandlesAuthorization;
-use Silber\Bouncer\BouncerFacade;
-
-class MailSenderPolicy
-{
-    use HandlesAuthorization;
-
-    /**
-     * Determine whether the user can view any models.
-     *
-     * @param  \Crater\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function viewAny(User $user)
-    {
-        if (BouncerFacade::can('view-mail-sender', MailSender::class)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     *
-     * @param  \Crater\Models\User  $user
-     * @param  \Crater\Models\MailSender  $mailSender
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function view(User $user, MailSender $mailSender)
-    {
-        if (BouncerFacade::can('view-mail-sender', $mailSender) && $user->hasCompany($mailSender->company_id)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can create models.
-     *
-     * @param  \Crater\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function create(User $user)
-    {
-        if (BouncerFacade::can('create-mail-sender', MailSender::class)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     *
-     * @param  \Crater\Models\User  $user
-     * @param  \Crater\Models\MailSender  $mailSender
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function update(User $user, MailSender $mailSender)
-    {
-        if (BouncerFacade::can('edit-mail-sender', $mailSender) && $user->hasCompany($mailSender->company_id)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     *
-     * @param  \Crater\Models\User  $user
-     * @param  \Crater\Models\MailSender  $mailSender
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function delete(User $user, MailSender $mailSender)
-    {
-        if (BouncerFacade::can('delete-mail-sender', $mailSender) && $user->hasCompany($mailSender->company_id)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     *
-     * @param  \Crater\Models\User  $user
-     * @param  \Crater\Models\MailSender  $mailSender
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function restore(User $user, MailSender $mailSender)
-    {
-        if (BouncerFacade::can('delete-mail-sender', $mailSender) && $user->hasCompany($mailSender->company_id)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     *
-     * @param  \Crater\Models\User  $user
-     * @param  \Crater\Models\MailSender  $mailSender
-     * @return \Illuminate\Auth\Access\Response|bool
-     */
-    public function forceDelete(User $user, MailSender $mailSender)
-    {
-        if (BouncerFacade::can('delete-mail-sender', $mailSender) && $user->hasCompany($mailSender->company_id)) {
-            return true;
-        }
-
-        return false;
-    }
-}

app/Providers/AuthServiceProvider.php

@@ -39,7 +39,6 @@ class AuthServiceProvider extends ServiceProvider
         \Crater\Models\CustomField::class => \Crater\Policies\CustomFieldPolicy::class,
         \Crater\Models\User::class => \Crater\Policies\UserPolicy::class,
         \Crater\Models\Item::class => \Crater\Policies\ItemPolicy::class,
-        \Crater\Models\MailSender::class => \Crater\Policies\MailSenderPolicy::class,
         \Silber\Bouncer\Database\Role::class => \Crater\Policies\RolePolicy::class,
         \Crater\Models\Unit::class => \Crater\Policies\UnitPolicy::class,
         \Crater\Models\RecurringInvoice::class => \Crater\Policies\RecurringInvoicePolicy::class,

app/Space/EnvironmentManager.php

@@ -223,6 +223,204 @@ class EnvironmentManager
         return false;
     }
 
+    /**
+    * Save the mail content to the .env file.
+    *
+    * @param Request $request
+    * @return array
+    */
+    public function saveMailVariables(MailEnvironmentRequest $request)
+    {
+        $mailData = $this->getMailData($request);
+
+        try {
+            file_put_contents($this->envPath, str_replace(
+                $mailData['old_mail_data'],
+                $mailData['new_mail_data'],
+                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',
+            ];
+        }
+
+        return [
+            'success' => 'mail_variables_save_successfully',
+        ];
+    }
+
+    private function getMailData($request)
+    {
+        $mailFromCredential = "";
+        $extraMailData = "";
+        $extraOldMailData = "";
+        $oldMailData = "";
+        $newMailData = "";
+
+        if (env('MAIL_FROM_ADDRESS') !== null && env('MAIL_FROM_NAME') !== null) {
+            $mailFromCredential =
+                'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
+                'MAIL_FROM_NAME="'.config('mail.from.name')."\"\n\n";
+        }
+
+        switch ($request->mail_driver) {
+            case 'smtp':
+
+                $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_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
+
+                break;
+
+            case 'mailgun':
+                $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='.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";
+
+                if (env('MAILGUN_DOMAIN') !== null && env('MAILGUN_SECRET') !== null && env('MAILGUN_ENDPOINT') !== null) {
+                    $extraOldMailData =
+                        'MAILGUN_DOMAIN='.config('services.mailgun.domain')."\n".
+                        'MAILGUN_SECRET='.config('services.mailgun.secret')."\n".
+                        'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n";
+                }
+
+                break;
+
+            case 'ses':
+                $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='.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";
+                }
+
+                break;
+
+            case 'mail':
+                $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='.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";
+
+                break;
+
+            case 'sendmail':
+                $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='.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";
+
+                break;
+        }
+
+        return [
+            'old_mail_data' => $oldMailData,
+            'new_mail_data' => $newMailData,
+            'extra_mail_data' => $extraMailData,
+            'extra_old_mail_data' => $extraOldMailData,
+        ];
+    }
+
     /**
      * Save the disk content to the .env file.
      *

app/Space/helpers.php

@@ -5,7 +5,6 @@ use Crater\Models\Currency;
 use Crater\Models\CustomField;
 use Crater\Models\Setting;
 use Illuminate\Support\Str;
-use Illuminate\Mail\Mailable;
 
 /**
  * Get company setting
@@ -71,42 +70,6 @@ function set_active($path, $active = 'active')
     return call_user_func_array('Request::is', (array)$path) ? $active : '';
 }
 
-/**
- * Send Mail
- *
- * @param Mailable $mailable
- * @param object $mailSender
- * @return string $to
- */
-function send_mail(Mailable $mailable, object $mailSender = null, string $to)
-{
-    if ($mailSender->bcc && $mailSender->cc) {
-        \Mail::to($to)
-                ->bcc(explode(',', $mailSender->bcc))
-                ->cc(explode(',', $mailSender->cc))
-                ->send($mailable);
-    }
-
-    if ($mailSender->bcc && $mailSender->cc == null) {
-        \Mail::to($to)
-            ->bcc(explode(',', $mailSender->bcc))
-            ->send($mailable);
-    }
-
-    if ($mailSender->bcc == null && $mailSender->cc) {
-        \Mail::to($to)
-            ->cc(explode(',', $mailSender->cc))
-            ->send($mailable);
-    }
-
-    if ($mailSender->bcc == null && $mailSender->cc == null) {
-        \Mail::to($to)
-            ->send($mailable);
-    }
-
-    return true;
-}
-
 /**
  * @param $path
  * @return mixed

app/Traits/MailTrait.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Crater\Traits;
-
-use Crater\Mail\EstimateViewedMail;
-use Crater\Mail\InvoiceViewedMail;
-use Crater\Mail\SendEstimateMail;
-use Crater\Mail\SendInvoiceMail;
-use Crater\Mail\SendPaymentMail;
-use Crater\Models\MailSender;
-
-trait MailTrait
-{
-    public function setMail($model, $data)
-    {
-        $mailSender = MailSender::setMailConfiguration($data['mail_sender_id'], true);
-
-        $data['from_address'] = $mailSender->from_address;
-        $data['from_name'] = $mailSender->from_name;
-
-        switch ($model) {
-            case 'invoice':
-               send_mail(new SendInvoiceMail($data), $mailSender, $data['to']);
-
-                break;
-
-            case 'estimate':
-               send_mail(new SendEstimateMail($data), $mailSender, $data['to']);
-
-                break;
-
-            case 'payment':
-               send_mail(new SendPaymentMail($data), $mailSender, $data['to']);
-
-                break;
-        }
-
-        return true;
-    }
-}

composer.json

@@ -17,7 +17,6 @@
     "fideloper/proxy": "^4.0",
     "fruitcake/laravel-cors": "^1.0",
     "guzzlehttp/guzzle": "^7.0.1",
-    "innocenzi/laravel-vite": "^0.1.1",
     "intervention/image": "^2.3",
     "jasonmccreary/laravel-test-assertions": "^2.0",
     "laravel/framework": "^8.0",

config/abilities.php

@@ -7,7 +7,6 @@ use Crater\Models\ExchangeRateProvider;
 use Crater\Models\Expense;
 use Crater\Models\Invoice;
 use Crater\Models\Item;
-use Crater\Models\MailSender;
 use Crater\Models\Note;
 use Crater\Models\Payment;
 use Crater\Models\RecurringInvoice;
@@ -398,41 +397,6 @@ return [
             ]
         ],
 
-        // Mail Sender
-        [
-            "name" => "view mail sender",
-            "ability" => "view-mail-sender",
-            "model" => MailSender::class,
-            'owner_only' => false,
-        ],
-        [
-            "name" => "create mail sender",
-            "ability" => "create-mail-sender",
-            "model" => MailSender::class,
-            'owner_only' => false,
-            "depends_on" => [
-                'view-mail-sender',
-            ]
-        ],
-        [
-            "name" => "edit mail sender",
-            "ability" => "edit-mail-sender",
-            "model" => MailSender::class,
-            'owner_only' => false,
-            "depends_on" => [
-                'view-mail-sender',
-            ]
-        ],
-        [
-            "name" => "delete mail sender",
-            "ability" => "delete-mail-sender",
-            "model" => MailSender::class,
-            'owner_only' => false,
-            "depends_on" => [
-                'view-mail-sender',
-            ]
-        ],
-
         // Settings
         [
             "name" => "view company dashboard",

config/crater.php

@@ -7,7 +7,6 @@ use Crater\Models\ExchangeRateProvider;
 use Crater\Models\Expense;
 use Crater\Models\Invoice;
 use Crater\Models\Item;
-use Crater\Models\MailSender;
 use Crater\Models\Note;
 use Crater\Models\Payment;
 use Crater\Models\RecurringInvoice;
@@ -226,17 +225,6 @@ return [
             'ability' => 'view-all-notes',
             'model' => Note::class
         ],
-        [
-            'title' => 'settings.menu_title.mail_sender',
-            'group' => '',
-            'name' => 'Mail Sender',
-            'link' => '/admin/settings/mail-sender',
-            'icon' => 'MailIcon',
-            'owner_only' => false,
-            'ability' => 'view-mail-sender',
-            'model' => MailSender::class
-        ],
-
         [
             'title' => 'settings.menu_title.expense_category',
             'group' => '',
@@ -247,6 +235,16 @@ return [
             'ability' => 'view-expense',
             'model' => Expense::class
         ],
+        [
+            'title' => 'settings.mail.mail_config',
+            'group' => '',
+            'name' => 'Mail Configuration',
+            'link' => '/admin/settings/mail-configuration',
+            'icon' => 'MailIcon',
+            'owner_only' => true,
+            'ability' => '',
+            'model' => ''
+        ],
         [
             'title' => 'settings.menu_title.file_disk',
             'group' => '',
@@ -277,7 +275,6 @@ return [
             'ability' => '',
             'model' => ''
         ],
-
     ],
 
     /*

config/vite.php

@@ -1,67 +0,0 @@
-<?php
-
-return [
-    /*
-    |--------------------------------------------------------------------------
-    | Entrypoints
-    |--------------------------------------------------------------------------
-    | The files in the configured directories will be considered
-    | entry points and will not be required in the configuration file.
-    | To disable the feature, set to false.
-    */
-    'entrypoints' => [
-        'resources/scripts/main.js',
-    ],
-    'ignore_patterns' => ["/\.d\.ts$/"],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Aliases
-    |--------------------------------------------------------------------------
-    | These aliases will be added to the Vite configuration and used
-    | to generate a proper tsconfig.json file.
-    */
-    'aliases' => [
-        '@' => 'resources',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Static assets path
-    |--------------------------------------------------------------------------
-    | This option defines the directory that Vite considers as the
-    | public directory. Its content will be copied to the build directory
-    | at build-time.
-    | https://vitejs.dev/config/#publicdir
-    */
-    'public_directory' => resource_path('static'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Ping timeout
-    |--------------------------------------------------------------------------
-    | The maximum duration, in seconds, that the ping to the development
-    | server should take while trying to determine whether to use the
-    | manifest or the server in a local environment.
-    */
-    'ping_timeout' => .1,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Build path
-    |--------------------------------------------------------------------------
-    | The directory, relative to /public, in which Vite will build
-    | the production files. This should match "build.outDir" in the Vite
-    | configuration file.
-    */
-    'build_path' => 'build',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Development URL
-    |--------------------------------------------------------------------------
-    | The URL at which the Vite development server runs.
-    | This is used to generate the script tags when developing.
-    */
-    'dev_url' => 'http://localhost:3000',
-];

database/migrations/2023_03_10_125202_create_mail_senders_table.php

@@ -1,106 +0,0 @@
-<?php
-
-use Crater\Models\Company;
-use Crater\Models\MailSender;
-use Crater\Models\User;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-use Silber\Bouncer\BouncerFacade;
-
-class CreateMailSendersTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('mail_senders', function (Blueprint $table) {
-            $table->id();
-            $table->string('name');
-            $table->string('driver');
-            $table->boolean('is_default')->default(false);
-            $table->string('bcc')->nullable();
-            $table->string('cc')->nullable();
-            $table->string('from_address')->nullable();
-            $table->string('from_name')->nullable();
-            $table->json('settings')->nullable();
-            $table->integer('company_id')->unsigned()->nullable();
-            $table->foreign('company_id')->references('id')->on('companies');
-            $table->timestamps();
-        });
-
-        $users = User::where('role', 'super admin')->get();
-
-        foreach ($users as $user) {
-            BouncerFacade::allow($user)->toManage(MailSender::class);
-        }
-
-        $companies = Company::all();
-
-        $companies->map(function ($company) {
-            if (env('MAIL_DRIVER') == 'smtp') {
-                $settings = [
-                    'MAIL_HOST' => env('MAIL_HOST'),
-                    'MAIL_PORT' => env('MAIL_PORT'),
-                    'MAIL_USERNAME' => env('MAIL_USERNAME'),
-                    'MAIL_PASSWORD' => env('MAIL_PASSWORD'),
-                    'MAIL_ENCRYPTION' => env('MAIL_ENCRYPTION')
-                ];
-                $this->createSender($settings, $company->id);
-            }
-
-            if (env('MAIL_DRIVER') == 'mail' || env('MAIL_DRIVER') == 'sendmail') {
-                $this->createSender(null, $company->id);
-            }
-
-            if (env('MAIL_DRIVER') == 'mailgun') {
-                $settings = [
-                    'MAILGUN_DOMAIN' => env('MAILGUN_DOMAIN'),
-                    'MAILGUN_SECRET' => env('MAILGUN_SECRET'),
-                    'MAILGUN_ENDPOINT' => env('MAILGUN_ENDPOINT'),
-                ];
-                $this->createSender($settings, $company->id);
-            }
-
-            if (env('MAIL_DRIVER') == 'ses') {
-                $settings = [
-                    'MAIL_HOST' => env('MAIL_HOST'),
-                    'MAIL_PORT' => env('MAIL_PORT'),
-                    'MAIL_ENCRYPTION' => env('MAIL_ENCRYPTION'),
-                    'MAILGUN_DOMAIN' => env('MAILGUN_DOMAIN'),
-                    'SES_KEY' => env('SES_KEY'),
-                    'SES_SECRET' => env('SES_SECRET'),
-                ];
-                $this->createSender($settings, $company->id);
-            }
-        });
-    }
-
-    public function createSender($settings, $company_id)
-    {
-        $data = [
-            'name' => env('MAIL_DRIVER'),
-            'driver' => env('MAIL_DRIVER'),
-            'is_default' => true,
-            'from_address' => env('MAIL_FROM_ADDRESS'),
-            'from_name' => env('MAIL_FROM_NAME'),
-            'settings' => $settings ?? null,
-            'company_id' => $company_id
-        ];
-
-        MailSender::create($data);
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('mail_senders');
-    }
-}

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --port=3000",
     "build": "vite build",
     "serve": "vite preview",
     "test": "eslint ./resources/scripts --ext .js,.vue"
@@ -18,13 +18,12 @@
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-vue": "^7.0.0-beta.4",
-    "laravel-vite": "^0.0.7",
     "postcss": "^8.4.5",
     "prettier": "^2.3.0",
     "sass": "^1.32.12",
     "tailwind-scrollbar": "^1.3.1",
     "tailwindcss": "^3.0.6",
-    "vite": "^2.6.1"
+    "vite": "^4.0.0"
   },
   "dependencies": {
     "@headlessui/vue": "^1.4.0",
@@ -32,10 +31,11 @@
     "@popperjs/core": "^2.9.2",
     "@stripe/stripe-js": "^1.21.2",
     "@tailwindcss/line-clamp": "^0.3.0",
-    "@tiptap/core": "^2.0.0-beta.85",
+    "@tiptap/core": "^2.0.3",
-    "@tiptap/extension-text-align": "^2.0.0-beta.29",
+    "@tiptap/extension-text-align": "^2.0.3",
-    "@tiptap/starter-kit": "^2.0.0-beta.81",
+    "@tiptap/pm": "^2.0.3",
-    "@tiptap/vue-3": "^2.0.0-beta.38",
+    "@tiptap/starter-kit": "^2.0.3",
+    "@tiptap/vue-3": "^2.0.3",
     "@vuelidate/components": "^1.1.12",
     "@vuelidate/core": "^2.0.0-alpha.32",
     "@vuelidate/validators": "^2.0.0-alpha.25",
@@ -43,6 +43,7 @@
     "axios": "^0.19",
     "chart.js": "^2.7.3",
     "guid": "0.0.12",
+    "laravel-vite-plugin": "^0.7.4",
     "lodash": "^4.17.13",
     "maska": "^1.4.6",
     "mini-svg-data-uri": "^1.3.3",

resources/scripts/admin/admin-router.js

@@ -47,6 +47,8 @@ const ExpenseCategory = () =>
   import('@/scripts/admin/views/settings/ExpenseCategorySetting.vue')
 const ExchangeRateSetting = () =>
   import('@/scripts/admin/views/settings/ExchangeRateProviderSetting.vue')
+const MailConfig = () =>
+  import('@/scripts/admin/views/settings/MailConfigSetting.vue')
 const FileDisk = () =>
   import('@/scripts/admin/views/settings/FileDiskSetting.vue')
 const Backup = () => import('@/scripts/admin/views/settings/BackupSetting.vue')
@@ -54,8 +56,6 @@ const UpdateApp = () =>
   import('@/scripts/admin/views/settings/UpdateAppSetting.vue')
 const RolesSettings = () =>
   import('@/scripts/admin/views/settings/RolesSettings.vue')
-const MailSender = () =>
-  import('@/scripts/admin/views/settings/mail-sender/Index.vue')
 
 // Items
 const ItemsIndex = () => import('@/scripts/admin/views/items/Index.vue')
@@ -302,6 +302,13 @@ export default [
             meta: { ability: abilities.VIEW_EXPENSE },
             component: ExpenseCategory,
           },
+
+          {
+            path: 'mail-configuration',
+            name: 'mailconfig',
+            meta: { isOwner: true },
+            component: MailConfig,
+          },
           {
             path: 'file-disk',
             name: 'file-disk',
@@ -320,13 +327,6 @@ export default [
             meta: { isOwner: true },
             component: UpdateApp,
           },
-          {
-            path: 'mail-sender',
-            name: 'mailsender',
-            meta: { ability: abilities.VIEW_MAIL_SENDER },
-            component: MailSender,
-          },
-
         ],
       },
 

resources/scripts/admin/components/FeedbackAlert.vue

@@ -1,123 +0,0 @@
-<template>
-  <!-- warning alert -->
-  <div
-    v-if="type == 'warning'"
-    class="rounded-md p-4 m-5"
-    :class="{
-      'bg-yellow-50': type == 'warning',
-      'bg-blue-50': type == 'info',
-      'bg-red-50': type == 'error',
-      'bg-green-50': type == 'success',
-    }"
-  >
-    <div class="flex">
-      <div class="flex-shrink-0">
-        <!-- Heroicon name: solid/exclamation -->
-        <svg
-          v-if="type == 'warning'"
-          class="h-5 w-5 text-yellow-400"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor"
-          aria-hidden="true"
-        >
-          <path
-            fill-rule="evenodd"
-            d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
-            clip-rule="evenodd"
-          />
-        </svg>
-        <!-- Heroicon name: solid/information-circle -->
-        <svg
-          v-else-if="type == 'info'"
-          class="h-5 w-5 text-blue-400"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor"
-          aria-hidden="true"
-        >
-          <path
-            fill-rule="evenodd"
-            d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
-            clip-rule="evenodd"
-          />
-        </svg>
-        <!-- Heroicon name: solid/x-circle -->
-        <svg
-          v-else-if="type == 'error'"
-          class="h-5 w-5 text-red-400"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor"
-          aria-hidden="true"
-        >
-          <path
-            fill-rule="evenodd"
-            d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
-            clip-rule="evenodd"
-          />
-        </svg>
-        <!-- Heroicon name: solid/check-circle -->
-        <svg
-          v-else
-          class="h-5 w-5 text-green-400"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor"
-          aria-hidden="true"
-        >
-          <path
-            fill-rule="evenodd"
-            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
-            clip-rule="evenodd"
-          />
-        </svg>
-      </div>
-      <div class="ml-3">
-        <h3
-          class="text-sm font-medium"
-          :class="{
-            'text-yellow-800': type == 'warning',
-            'text-blue-800': type == 'info',
-            'text-red-800': type == 'error',
-            'text-green-800': type == 'success',
-          }"
-        >
-          {{ title }}
-        </h3>
-        <div
-          class="text-sm"
-          :class="{
-            'text-yellow-700': type == 'warning',
-            'text-blue-700': type == 'info',
-            'text-red-700': type == 'error',
-            'text-green-700': type == 'success',
-          }"
-        >
-          <p>{{ description }}</p>
-        </div>
-        <slot name="action"></slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-const props = defineProps({
-  title: {
-    type: String,
-    default: null,
-    required: false,
-  },
-  description: {
-    type: String,
-    default: null,
-    required: false,
-  },
-  type: {
-    type: String,
-    default: 'success',
-    required: true,
-  },
-})
-</script>

resources/scripts/admin/components/dropdowns/MailSenderIndexDropdown.vue

@@ -1,111 +0,0 @@
-<template>
-  <BaseDropdown>
-    <template #activator>
-      <BaseButton v-if="route.name === 'mailsender.view'" variant="primary">
-        <BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
-      </BaseButton>
-      <BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
-    </template>
-
-    <!-- edit mail-sender  -->
-    <BaseDropdownItem @click="editMailSender(row.id)">
-      <BaseIcon
-        name="PencilIcon"
-        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
-      />
-      {{ $t('general.edit') }}
-    </BaseDropdownItem>
-
-    <!-- send test mail-sender  -->
-    <BaseDropdownItem @click="openMailSenderTestModal(row.id)">
-      <BaseIcon
-        name="PaperAirplaneIcon"
-        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
-      />
-      {{ $t('general.send_test_mail') }}
-    </BaseDropdownItem>
-
-    <!-- delete mail-sender  -->
-    <BaseDropdownItem v-if="!row.is_default" @click="removeMailSender(row.id)">
-      <BaseIcon
-        name="TrashIcon"
-        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
-      />
-      {{ $t('general.delete') }}
-    </BaseDropdownItem>
-  </BaseDropdown>
-</template>
-
-<script setup>
-import { useDialogStore } from '@/scripts/stores/dialog'
-import { useI18n } from 'vue-i18n'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
-import { useRoute, useRouter } from 'vue-router'
-import { inject } from 'vue'
-import { useModalStore } from '@/scripts/stores/modal'
-
-const props = defineProps({
-  row: {
-    type: Object,
-    default: null,
-  },
-  table: {
-    type: Object,
-    default: null,
-  },
-  loadData: {
-    type: Function,
-    default: null,
-  },
-})
-
-const pre_t = 'settings.mail_sender'
-const dialogStore = useDialogStore()
-const { t } = useI18n()
-const mailSenderStore = useMailSenderStore()
-const route = useRoute()
-const modalStore = useModalStore()
-
-async function editMailSender(id) {
-  await mailSenderStore.fetchMailSender(id)
-  modalStore.openModal({
-    title: t(`${pre_t}.edit_mail_sender`),
-    componentName: 'MailSenderModal',
-    size: 'md',
-    refreshData: props.loadData && props.loadData,
-  })
-}
-
-function removeMailSender(id) {
-  dialogStore
-    .openDialog({
-      title: t('general.are_you_sure'),
-      message: t(`${pre_t}.confirm_delete`),
-      yesLabel: t('general.ok'),
-      noLabel: t('general.cancel'),
-      variant: 'danger',
-      hideNoButton: false,
-      size: 'lg',
-    })
-    .then(async (res) => {
-      if (res) {
-        let response = await mailSenderStore.deleteMailSender(id)
-        if (response.data.success) {
-          props.loadData && props.loadData()
-          return true
-        }
-        props.loadData && props.loadData()
-      }
-    })
-}
-
-async function openMailSenderTestModal(id) {
-  modalStore.openModal({
-    title: t(`general.send_test_mail`),
-    componentName: 'MailSenderTestModal',
-    size: 'md',
-    id: id,
-    refreshData: props.loadData && props.loadData,
-  })
-}
-</script>

resources/scripts/admin/components/modal-components/CustomerModal.vue

@@ -453,7 +453,7 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 
@@ -549,6 +549,7 @@ const rules = computed(() => {
     website: {
       url: helpers.withMessage(t('validation.invalid_url'), url),
     },
+
     billing: {
       address_street_1: {
         maxLength: helpers.withMessage(

resources/scripts/admin/components/modal-components/MailSenderModal.vue

@@ -1,287 +0,0 @@
-<template>
-  <BaseModal
-    :show="modalStore.active && modalStore.componentName === 'MailSenderModal'"
-  >
-    <template #header>
-      <div class="flex justify-between w-full">
-        {{ modalStore.title }}
-        <BaseIcon
-          name="XIcon"
-          class="h-6 w-6 text-gray-500 cursor-pointer"
-          @click="closeMailSenderModal"
-        />
-      </div>
-    </template>
-    <form action="" @submit.prevent="submitMailSenderData">
-      <div class="p-4 sm:p-6 my-2">
-        <!-- Name -->
-        <BaseInputGrid>
-          <BaseInputGroup
-            :label="$t(`${pre_t}.name`)"
-            :error="v$.name.$error && v$.name.$errors[0].$message"
-            :help-text="$t(`${pre_t}.name_help`)"
-            required
-          >
-            <BaseInput
-              v-model.trim="mailSenderStore.currentMailSender.name"
-              :invalid="v$.name.$error"
-              type="text"
-              @input="v$.name.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- From Name -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.from_name`)"
-            :error="v$.from_name.$error && v$.from_name.$errors[0].$message"
-            required
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.from_name"
-              :invalid="v$.from_name.$error"
-              type="text"
-              @input="v$.from_name.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- From Address -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.from_address`)"
-            :error="
-              v$.from_address.$error && v$.from_address.$errors[0].$message
-            "
-            required
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.from_address"
-              :invalid="v$.from_address.$error"
-              type="text"
-              @input="v$.from_address.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- CC -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.cc`)"
-            :error="v$.cc.$error && v$.cc.$errors[0].$message"
-            :help-text="$t(`${pre_t}.email_list`)"
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.cc"
-              :invalid="v$.cc.$error"
-              type="text"
-              @input="v$.cc.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- BCC -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.bcc`)"
-            :error="v$.bcc.$error && v$.bcc.$errors[0].$message"
-            :help-text="$t(`${pre_t}.email_list`)"
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.bcc"
-              :invalid="v$.bcc.$error"
-              type="text"
-              @input="v$.bcc.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- Mail Driver -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.driver`)"
-            :error="v$.driver.$error && v$.driver.$errors[0].$message"
-            required
-          >
-            <BaseMultiselect
-              v-model="mailSenderStore.currentMailSender.driver"
-              :options="mailSenderStore.mail_drivers"
-              :can-deselect="false"
-              :invalid="v$.driver.$error"
-            />
-          </BaseInputGroup>
-
-          <component
-            :is="loadMailDriver"
-            :mail-sender-store="mailSenderStore"
-          />
-        </BaseInputGrid>
-
-        <BaseDivider class="mt-4 mb-0" />
-
-        <!-- Is Default? -->
-        <BaseSwitchSection
-          v-if="!mailSenderStore.isDisable"
-          v-model="mailSenderStore.currentMailSender.is_default"
-          :title="$t(`${pre_t}.is_default`)"
-          :description="$t(`${pre_t}.is_default_description`)"
-        />
-      </div>
-
-      <div
-        class="z-0 flex justify-end p-4 border-t border-solid border--200 border-modal-bg"
-      >
-        <BaseButton
-          class="mr-3 text-sm"
-          variant="primary-outline"
-          type="button"
-          @click="closeMailSenderModal"
-        >
-          {{ $t('general.cancel') }}
-        </BaseButton>
-        <BaseButton
-          :loading="isSaving"
-          :disabled="isSaving"
-          variant="primary"
-          type="submit"
-        >
-          <template #left="slotProps">
-            <BaseIcon
-              v-if="!isSaving"
-              name="SaveIcon"
-              :class="slotProps.class"
-            />
-          </template>
-          {{
-            mailSenderStore.isEdit ? $t('general.update') : $t('general.save')
-          }}
-        </BaseButton>
-      </div>
-    </form>
-  </BaseModal>
-</template>
-
-<script setup>
-import { computed, onMounted, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { required, email, minLength, helpers } from '@vuelidate/validators'
-import { useVuelidate } from '@vuelidate/core'
-import { useModalStore } from '@/scripts/stores/modal'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
-import SmtpDriver from '@/scripts/admin/views/settings/mail-sender/SmtpDriver.vue'
-import MailgunDriver from '@/scripts/admin/views/settings/mail-sender/MailgunDriver.vue'
-import SesDriver from '@/scripts/admin/views/settings/mail-sender/SesDriver.vue'
-
-const pre_t = 'settings.mail_sender'
-const modalStore = useModalStore()
-const mailSenderStore = useMailSenderStore()
-const { t } = useI18n()
-let isSaving = ref(false)
-
-const loadMailDriver = computed(() => {
-  switch (mailSenderStore.currentMailSender.driver) {
-    case 'smtp':
-      return SmtpDriver
-    case 'mail':
-      return false
-    case 'sendmail':
-      return false
-    case 'mailgun':
-      return MailgunDriver
-    case 'ses':
-      return SesDriver
-    default:
-      return false
-  }
-})
-
-// This is multiple email custom validation
-const multiEmail = (value) => {
-  if (value == '' || value === null) return true
-  const emailRegex =
-    /^(?:[A-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[A-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9]{2,}(?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i
-
-  const emailArr = value.split(',')
-  let isValid = emailArr.every((v) => {
-    return emailRegex.test(v)
-  })
-  return isValid
-}
-
-const rules = computed(() => {
-  return {
-    name: {
-      required: helpers.withMessage(t('validation.required'), required),
-      minLength: helpers.withMessage(
-        t('validation.name_min_length', { count: 3 }),
-        minLength(3)
-      ),
-    },
-    from_name: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    from_address: {
-      required: helpers.withMessage(t('validation.required'), required),
-      email: helpers.withMessage(t('validation.email_incorrect'), email),
-    },
-    cc: {
-      multiEmail: helpers.withMessage(
-        t('validation.email_incorrect'),
-        multiEmail
-      ),
-    },
-    bcc: {
-      multiEmail: helpers.withMessage(
-        t('validation.email_incorrect'),
-        multiEmail
-      ),
-    },
-    driver: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-  }
-})
-
-const v$ = useVuelidate(
-  rules,
-  computed(() => mailSenderStore.currentMailSender)
-)
-
-async function submitMailSenderData() {
-  v$.value.$touch()
-  if (v$.value.$invalid) {
-    return true
-  }
-  try {
-    const action = mailSenderStore.isEdit
-      ? mailSenderStore.updateMailSender
-      : mailSenderStore.addMailSender
-    isSaving.value = true
-
-    var mailDriverConfig = null
-    switch (mailSenderStore.currentMailSender.driver) {
-      case 'smtp':
-        mailDriverConfig = mailSenderStore.smtpConfig
-        break
-      case 'mailgun':
-        mailDriverConfig = mailSenderStore.mailgunConfig
-        break
-      case 'ses':
-        mailDriverConfig = mailSenderStore.sesConfig
-        break
-    }
-    mailSenderStore.currentMailSender.settings = mailDriverConfig
-
-    let res = await action(mailSenderStore.currentMailSender)
-    isSaving.value = false
-    modalStore.refreshData ? modalStore.refreshData(res.data.data) : ''
-    closeMailSenderModal()
-  } catch (err) {
-    isSaving.value = false
-    return true
-  }
-}
-
-function closeMailSenderModal() {
-  modalStore.closeModal()
-  setTimeout(() => {
-    mailSenderStore.resetCurrentMailSender()
-    v$.value.$reset()
-  }, 300)
-}
-
-onMounted(async () => {
-  await mailSenderStore.fetchMailDrivers()
-})
-</script>

resources/scripts/admin/components/modal-components/MailSenderTestModal.vue

@@ -1,208 +0,0 @@
-<template>
-  <BaseModal :show="modalActive" @open="setInitialData">
-    <template #header>
-      <div class="flex justify-between w-full">
-        {{ modalStore.title }}
-        <BaseIcon
-          name="XIcon"
-          class="w-6 h-6 text-gray-500 cursor-pointer"
-          @click="closeTestModal"
-        />
-      </div>
-    </template>
-    <form action="" @submit.prevent="onTestMailSend">
-      <div class="p-4 md:p-8">
-        <BaseInputGrid layout="one-column">
-          <BaseInputGroup
-            :label="$t(`${pre_t}.title`)"
-            variant="horizontal"
-            :content-loading="isFetchingInitialData"
-            :error="
-              v$.mail_sender_id.$error && v$.mail_sender_id.$errors[0].$message
-            "
-          >
-            <BaseMultiselect
-              v-model="formData.mail_sender_id"
-              :invalid="v$.mail_sender_id.$error"
-              label="name"
-              :options="mailSenderStore.mailSenders"
-              value-prop="id"
-              :can-deselect="false"
-              :can-clear="false"
-              :placeholder="$t(`${pre_t}.select_mail_sender`)"
-              searchable
-              track-by="name"
-              :content-loading="isFetchingInitialData"
-            />
-          </BaseInputGroup>
-
-          <BaseInputGroup
-            :label="$t('general.to')"
-            :error="v$.to.$error && v$.to.$errors[0].$message"
-            variant="horizontal"
-            required
-            :content-loading="isFetchingInitialData"
-          >
-            <BaseInput
-              v-model="formData.to"
-              type="text"
-              :invalid="v$.to.$error"
-              :content-loading="isFetchingInitialData"
-              @input="v$.to.$touch()"
-            />
-          </BaseInputGroup>
-          <BaseInputGroup
-            :label="$t('general.subject')"
-            :error="v$.subject.$error && v$.subject.$errors[0].$message"
-            variant="horizontal"
-            required
-            :content-loading="isFetchingInitialData"
-          >
-            <BaseInput
-              v-model="formData.subject"
-              type="text"
-              :invalid="v$.subject.$error"
-              :content-loading="isFetchingInitialData"
-              @input="v$.subject.$touch()"
-            />
-          </BaseInputGroup>
-          <BaseInputGroup
-            :label="$t('general.message')"
-            :error="v$.message.$error && v$.message.$errors[0].$message"
-            variant="horizontal"
-            required
-            :content-loading="isFetchingInitialData"
-          >
-            <BaseTextarea
-              v-model="formData.message"
-              rows="4"
-              cols="50"
-              :invalid="v$.message.$error"
-              :content-loading="isFetchingInitialData"
-              @input="v$.message.$touch()"
-            />
-          </BaseInputGroup>
-        </BaseInputGrid>
-      </div>
-      <div
-        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
-      >
-        <BaseButton
-          variant="primary-outline"
-          type="button"
-          class="mr-3"
-          :content-loading="isFetchingInitialData"
-          @click="closeTestModal()"
-        >
-          {{ $t('general.cancel') }}
-        </BaseButton>
-
-        <BaseButton
-          :loading="isSaving"
-          variant="primary"
-          type="submit"
-          :content-loading="isFetchingInitialData"
-        >
-          <template #left="slotProps">
-            <BaseIcon
-              v-if="!isSaving"
-              name="PaperAirplaneIcon"
-              :class="slotProps.class"
-            />
-          </template>
-          {{ $t('general.send') }}
-        </BaseButton>
-      </div>
-    </form>
-  </BaseModal>
-</template>
-
-<script setup>
-import { reactive, ref, computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { required, email, maxLength, helpers } from '@vuelidate/validators'
-import useVuelidate from '@vuelidate/core'
-import { useModalStore } from '@/scripts/stores/modal'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
-
-const pre_t = 'settings.mail_sender'
-const modalStore = useModalStore()
-const mailSenderStore = useMailSenderStore()
-const { t } = useI18n()
-let isSaving = ref(false)
-let formData = reactive({
-  mail_sender_id: '',
-  to: '',
-  subject: '',
-  message: '',
-})
-const isFetchingInitialData = ref(false)
-
-const modalActive = computed(() => {
-  return modalStore.active && modalStore.componentName === 'MailSenderTestModal'
-})
-
-function setInitialData() {
-  isFetchingInitialData.value = true
-  formData.mail_sender_id = modalStore.id
-  setTimeout(() => {
-    isFetchingInitialData.value = false
-  }, 100)
-}
-
-const rules = {
-  mail_sender_id: {
-    required: helpers.withMessage(t('validation.required'), required),
-  },
-  to: {
-    required: helpers.withMessage(t('validation.required'), required),
-    email: helpers.withMessage(t('validation.email_incorrect'), email),
-  },
-  subject: {
-    required: helpers.withMessage(t('validation.required'), required),
-    maxLength: helpers.withMessage(
-      t('validation.subject_maxlength'),
-      maxLength(100)
-    ),
-  },
-  message: {
-    required: helpers.withMessage(t('validation.required'), required),
-    maxLength: helpers.withMessage(
-      t('validation.message_maxlength'),
-      maxLength(255)
-    ),
-  },
-}
-
-const v$ = useVuelidate(rules, formData)
-
-function resetFormData() {
-  formData.mail_sender_id = ''
-  formData.to = ''
-  formData.subject = ''
-  formData.message = ''
-
-  v$.value.$reset()
-}
-
-async function onTestMailSend() {
-  v$.value.$touch()
-  if (v$.value.$invalid) {
-    return true
-  }
-
-  isSaving.value = true
-  let response = await mailSenderStore.sendTestMail(formData)
-  if (response.data) {
-    closeTestModal()
-  }
-}
-function closeTestModal() {
-  modalStore.closeModal()
-  setTimeout(() => {
-    isSaving.value = false
-    modalStore.resetModalData()
-    resetFormData()
-  }, 300)
-}
-</script>

resources/scripts/admin/components/modal-components/SendEstimateModal.vue

@@ -16,28 +16,18 @@
     </template>
 
     <form v-if="!isPreview" action="">
-      <!-- v-if -->
+      <div class="px-8 py-8 sm:p-6">
-      <div v-if="isMailSenderExist" class="px-8 py-8 sm:p-6">
         <BaseInputGrid layout="one-column">
           <BaseInputGroup
-            :label="$tc('settings.mail_sender.title', 1)"
+            :label="$t('general.from')"
             required
-            :error="
+            :error="v$.from.$error && v$.from.$errors[0].$message"
-              v$.mail_sender_id.$error && v$.mail_sender_id.$errors[0].$message
-            "
           >
-            <BaseMultiselect
+            <BaseInput
-              v-model="estimateMailForm.mail_sender_id"
+              v-model="estimateMailForm.from"
-              :invalid="v$.mail_sender_id.$error"
+              type="text"
-              label="name"
+              :invalid="v$.from.$error"
-              :options="mailSenders"
+              @input="v$.from.$touch()"
-              value-prop="id"
-              :can-deselect="false"
-              :can-clear="false"
-              :placeholder="$t(`settings.mail_sender.select_mail_sender`)"
-              searchable
-              track-by="name"
-              :content-loading="isFetchingInitialData"
             />
           </BaseInputGroup>
           <BaseInputGroup
@@ -72,45 +62,6 @@
           </BaseInputGroup>
         </BaseInputGrid>
       </div>
-      <!-- v-else -->
-      <div v-else-if="!isMailSenderExist && !isFetchingInitialData">
-        <FeedbackAlert
-          :title="$t('settings.mail_sender.no_mail_sender_found')"
-          :description="
-            $t('settings.mail_sender.no_mail_sender_found_description')
-          "
-          type="warning"
-        >
-          <template #action>
-            <div class="mt-4">
-              <div class="-mx-2 -my-1.5 flex">
-                <button
-                  type="button"
-                  class="
-                    bg-yellow-50
-                    px-2
-                    py-1.5
-                    rounded-md
-                    text-sm
-                    font-medium
-                    text-yellow-800
-                    hover:bg-yellow-100
-                    focus:outline-none
-                    focus:ring-2
-                    focus:ring-offset-2
-                    focus:ring-offset-yellow-50
-                    focus:ring-yellow-600
-                  "
-                  @click="gotoMailSender"
-                >
-                  {{ $t('settings.mail_sender.manage_mail_sender') }}
-                </button>
-              </div>
-            </div>
-          </template>
-        </FeedbackAlert>
-      </div>
-      <!-- end v-if-else -->
       <div
         class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
       >
@@ -124,7 +75,6 @@
         </BaseButton>
 
         <BaseButton
-          v-if="isMailSenderExist"
           :loading="isLoading"
           :disabled="isLoading"
           variant="primary"
@@ -191,24 +141,18 @@ import { useModalStore } from '@/scripts/stores/modal'
 import { useEstimateStore } from '@/scripts/admin/stores/estimate'
 import { useNotificationStore } from '@/scripts/stores/notification'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
-import FeedbackAlert from '@/scripts/admin/components/FeedbackAlert.vue'
-import { useRouter } from 'vue-router'
 
 const modalStore = useModalStore()
 const estimateStore = useEstimateStore()
 const notificationStore = useNotificationStore()
 const companyStore = useCompanyStore()
-const mailSenderStore = useMailSenderStore()
+const mailDriverStore = useMailDriverStore()
-const router = useRouter()
 
 const { t } = useI18n()
 const isLoading = ref(false)
 const templateUrl = ref('')
 const isPreview = ref(false)
-const mailSenders = ref(null)
-const isFetchingInitialData = ref(false)
-const emailTemplates = ref(null)
 
 const estimateMailFields = ref([
   'customer',
@@ -220,7 +164,7 @@ const estimateMailFields = ref([
 
 let estimateMailForm = reactive({
   id: null,
-  mail_sender_id: null,
+  from: null,
   to: null,
   subject: 'New Estimate',
   body: null,
@@ -237,8 +181,9 @@ const modalData = computed(() => {
 })
 
 const rules = {
-  mail_sender_id: {
+  from: {
     required: helpers.withMessage(t('validation.required'), required),
+    email: helpers.withMessage(t('validation.email_incorrect'), email),
   },
   to: {
     required: helpers.withMessage(t('validation.required'), required),
@@ -262,26 +207,20 @@ function cancelPreview() {
 }
 
 async function setInitialData() {
+  let admin = await companyStore.fetchBasicMailConfig()
+
   estimateMailForm.id = modalStore.id
+
+  if (admin.data) {
+    estimateMailForm.from = admin.data.from_mail
+  }
+
   if (modalData.value) {
     estimateMailForm.to = modalData.value.customer.email
   }
 
   estimateMailForm.body =
     companyStore.selectedCompanySettings.estimate_mail_body
-
-  isFetchingInitialData.value = true
-  let mailSenderData = await mailSenderStore.fetchMailSenders({ limit: 'all' })
-  if (mailSenderData.data) {
-    mailSenders.value = mailSenderData.data.data
-    let defaultMailSender = mailSenderData.data.data.find(
-      (mailSender) => mailSender.is_default == true
-    )
-    estimateMailForm.mail_sender_id = defaultMailSender
-      ? defaultMailSender.id
-      : null
-    isFetchingInitialData.value = false
-  }
 }
 
 async function submitForm() {
@@ -335,18 +274,4 @@ function closeSendEstimateModal() {
     templateUrl.value = null
   }, 300)
 }
-
-function getTickImage() {
-  const imgUrl = new URL('/img/tick.png', import.meta.url)
-  return imgUrl
-}
-
-const isMailSenderExist = computed(() => {
-  return mailSenders.value && mailSenders.value.length
-})
-
-function gotoMailSender() {
-  closeSendEstimateModal()
-  router.push('/admin/settings/mail-sender')
-}
 </script>

resources/scripts/admin/components/modal-components/SendInvoiceModal.vue

@@ -15,28 +15,18 @@
       </div>
     </template>
     <form v-if="!isPreview" action="">
-      <!-- v-if -->
+      <div class="px-8 py-8 sm:p-6">
-      <div v-if="isMailSenderExist" class="px-8 py-8 sm:p-6">
         <BaseInputGrid layout="one-column" class="col-span-7">
           <BaseInputGroup
-            :label="$tc('settings.mail_sender.title', 1)"
+            :label="$t('general.from')"
             required
-            :error="
+            :error="v$.from.$error && v$.from.$errors[0].$message"
-              v$.mail_sender_id.$error && v$.mail_sender_id.$errors[0].$message
-            "
           >
-            <BaseMultiselect
+            <BaseInput
-              v-model="invoiceMailForm.mail_sender_id"
+              v-model="invoiceMailForm.from"
-              :invalid="v$.mail_sender_id.$error"
+              type="text"
-              label="name"
+              :invalid="v$.from.$error"
-              :options="mailSenders"
+              @input="v$.from.$touch()"
-              value-prop="id"
-              :can-deselect="false"
-              :can-clear="false"
-              :placeholder="$t(`settings.mail_sender.select_mail_sender`)"
-              searchable
-              track-by="name"
-              :content-loading="isFetchingInitialData"
             />
           </BaseInputGroup>
           <BaseInputGroup
@@ -75,45 +65,6 @@
           </BaseInputGroup>
         </BaseInputGrid>
       </div>
-      <!-- v-else -->
-      <div v-else-if="!isMailSenderExist && !isFetchingInitialData">
-        <FeedbackAlert
-          :title="$t('settings.mail_sender.no_mail_sender_found')"
-          :description="
-            $t('settings.mail_sender.no_mail_sender_found_description')
-          "
-          type="warning"
-        >
-          <template #action>
-            <div class="mt-4">
-              <div class="-mx-2 -my-1.5 flex">
-                <button
-                  type="button"
-                  class="
-                    bg-yellow-50
-                    px-2
-                    py-1.5
-                    rounded-md
-                    text-sm
-                    font-medium
-                    text-yellow-800
-                    hover:bg-yellow-100
-                    focus:outline-none
-                    focus:ring-2
-                    focus:ring-offset-2
-                    focus:ring-offset-yellow-50
-                    focus:ring-yellow-600
-                  "
-                  @click="gotoMailSender"
-                >
-                  {{ $t('settings.mail_sender.manage_mail_sender') }}
-                </button>
-              </div>
-            </div>
-          </template>
-        </FeedbackAlert>
-      </div>
-      <!-- end v-if-else -->
       <div
         class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
       >
@@ -126,7 +77,6 @@
           {{ $t('general.cancel') }}
         </BaseButton>
         <BaseButton
-          v-if="isMailSenderExist"
           :loading="isLoading"
           :disabled="isLoading"
           variant="primary"
@@ -204,24 +154,18 @@ import { useI18n } from 'vue-i18n'
 import { useInvoiceStore } from '@/scripts/admin/stores/invoice'
 import { useVuelidate } from '@vuelidate/core'
 import { required, email, helpers } from '@vuelidate/validators'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
-import FeedbackAlert from '@/scripts/admin/components/FeedbackAlert.vue'
-import { useRouter } from 'vue-router'
 
 const modalStore = useModalStore()
 const companyStore = useCompanyStore()
 const notificationStore = useNotificationStore()
 const invoiceStore = useInvoiceStore()
-const mailSenderStore = useMailSenderStore()
+const mailDriverStore = useMailDriverStore()
-const router = useRouter()
 
 const { t } = useI18n()
 let isLoading = ref(false)
 const templateUrl = ref('')
 const isPreview = ref(false)
-const mailSenders = ref(null)
-const isFetchingInitialData = ref(false)
-const emailTemplates = ref(null)
 
 const emit = defineEmits(['update'])
 
@@ -235,7 +179,7 @@ const invoiceMailFields = ref([
 
 const invoiceMailForm = reactive({
   id: null,
-  mail_sender_id: null,
+  from: null,
   to: null,
   subject: 'New Invoice',
   body: null,
@@ -254,8 +198,9 @@ const modalData = computed(() => {
 })
 
 const rules = {
-  mail_sender_id: {
+  from: {
     required: helpers.withMessage(t('validation.required'), required),
+    email: helpers.withMessage(t('validation.email_incorrect'), email),
   },
   to: {
     required: helpers.withMessage(t('validation.required'), required),
@@ -279,25 +224,19 @@ function cancelPreview() {
 }
 
 async function setInitialData() {
+  let admin = await companyStore.fetchBasicMailConfig()
+
   invoiceMailForm.id = modalStore.id
+
+  if (admin.data) {
+    invoiceMailForm.from = admin.data.from_mail
+  }
+
   if (modalData.value) {
     invoiceMailForm.to = modalData.value.customer.email
   }
 
   invoiceMailForm.body = companyStore.selectedCompanySettings.invoice_mail_body
-
-  isFetchingInitialData.value = true
-  let mailSenderData = await mailSenderStore.fetchMailSenders({ limit: 'all' })
-  if (mailSenderData.data) {
-    mailSenders.value = mailSenderData.data.data
-    let defaultMailSender = mailSenderData.data.data.find(
-      (mailSender) => mailSender.is_default == true
-    )
-    invoiceMailForm.mail_sender_id = defaultMailSender
-      ? defaultMailSender.id
-      : null
-    isFetchingInitialData.value = false
-  }
 }
 
 async function submitForm() {
@@ -348,18 +287,4 @@ function closeSendInvoiceModal() {
     templateUrl.value = null
   }, 300)
 }
-
-function getTickImage() {
-  const imgUrl = new URL('/img/tick.png', import.meta.url)
-  return imgUrl
-}
-
-const isMailSenderExist = computed(() => {
-  return mailSenders.value && mailSenders.value.length
-})
-
-function gotoMailSender() {
-  closeSendInvoiceModal()
-  router.push('/admin/settings/mail-sender')
-}
 </script>

resources/scripts/admin/components/modal-components/SendPaymentModal.vue

@@ -15,28 +15,18 @@
       </div>
     </template>
     <form v-if="!isPreview" action="">
-      <!-- v-if -->
+      <div class="px-8 py-8 sm:p-6">
-      <div v-if="isMailSenderExist" class="px-8 py-8 sm:p-6">
         <BaseInputGrid layout="one-column" class="col-span-7">
           <BaseInputGroup
-            :label="$tc('settings.mail_sender.title', 1)"
+            :label="$t('general.from')"
             required
-            :error="
+            :error="v$.from.$error && v$.from.$errors[0].$message"
-              v$.mail_sender_id.$error && v$.mail_sender_id.$errors[0].$message
-            "
           >
-            <BaseMultiselect
+            <BaseInput
-              v-model="paymentMailForm.mail_sender_id"
+              v-model="paymentMailForm.from"
-              :invalid="v$.mail_sender_id.$error"
+              type="text"
-              label="name"
+              :invalid="v$.from.$error"
-              :options="mailSenders"
+              @input="v$.from.$touch()"
-              value-prop="id"
-              :can-deselect="false"
-              :can-clear="false"
-              :placeholder="$t(`settings.mail_sender.select_mail_sender`)"
-              searchable
-              track-by="name"
-              :content-loading="isFetchingInitialData"
             />
           </BaseInputGroup>
           <BaseInputGroup
@@ -75,45 +65,6 @@
           </BaseInputGroup>
         </BaseInputGrid>
       </div>
-      <!-- v-else -->
-      <div v-else-if="!isMailSenderExist && !isFetchingInitialData">
-        <FeedbackAlert
-          :title="$t('settings.mail_sender.no_mail_sender_found')"
-          :description="
-            $t('settings.mail_sender.no_mail_sender_found_description')
-          "
-          type="warning"
-        >
-          <template #action>
-            <div class="mt-4">
-              <div class="-mx-2 -my-1.5 flex">
-                <button
-                  type="button"
-                  class="
-                    bg-yellow-50
-                    px-2
-                    py-1.5
-                    rounded-md
-                    text-sm
-                    font-medium
-                    text-yellow-800
-                    hover:bg-yellow-100
-                    focus:outline-none
-                    focus:ring-2
-                    focus:ring-offset-2
-                    focus:ring-offset-yellow-50
-                    focus:ring-yellow-600
-                  "
-                  @click="gotoMailSender"
-                >
-                  {{ $t('settings.mail_sender.manage_mail_sender') }}
-                </button>
-              </div>
-            </div>
-          </template>
-        </FeedbackAlert>
-      </div>
-      <!-- end v-if-else -->
       <div
         class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
       >
@@ -126,7 +77,6 @@
           {{ $t('general.cancel') }}
         </BaseButton>
         <BaseButton
-          v-if="isMailSenderExist"
           :loading="isLoading"
           :disabled="isLoading"
           variant="primary"
@@ -204,26 +154,20 @@ import { usePaymentStore } from '@/scripts/admin/stores/payment'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
 import { useNotificationStore } from '@/scripts/stores/notification'
 import { useModalStore } from '@/scripts/stores/modal'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
 import { useDialogStore } from '@/scripts/stores/dialog'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
-import FeedbackAlert from '@/scripts/admin/components/FeedbackAlert.vue'
-import { useRouter } from 'vue-router'
 
 const paymentStore = usePaymentStore()
 const companyStore = useCompanyStore()
 const modalStore = useModalStore()
 const notificationStore = useNotificationStore()
+const mailDriversStore = useMailDriverStore()
 const dialogStore = useDialogStore()
-const mailSenderStore = useMailSenderStore()
-const router = useRouter()
 
 const { t } = useI18n()
 let isLoading = ref(false)
 const templateUrl = ref('')
 const isPreview = ref(false)
-const mailSenders = ref(null)
-const isFetchingInitialData = ref(false)
-const emailTemplates = ref(null)
 
 const paymentMailFields = ref([
   'customer',
@@ -235,7 +179,7 @@ const paymentMailFields = ref([
 
 const paymentMailForm = reactive({
   id: null,
-  mail_sender_id: null,
+  from: null,
   to: null,
   subject: 'New Payment',
   body: null,
@@ -254,8 +198,9 @@ const modalData = computed(() => {
 })
 
 const rules = {
-  mail_sender_id: {
+  from: {
     required: helpers.withMessage(t('validation.required'), required),
+    email: helpers.withMessage(t('validation.email_incorrect'), email),
   },
   to: {
     required: helpers.withMessage(t('validation.required'), required),
@@ -276,25 +221,18 @@ function cancelPreview() {
 }
 
 async function setInitialData() {
+  let admin = await companyStore.fetchBasicMailConfig()
   paymentMailForm.id = modalStore.id
+
+  if (admin.data) {
+    paymentMailForm.from = admin.data.from_mail
+  }
+
   if (modalData.value) {
     paymentMailForm.to = modalData.value.customer.email
   }
 
   paymentMailForm.body = companyStore.selectedCompanySettings.payment_mail_body
-
-  isFetchingInitialData.value = true
-  let mailSenderData = await mailSenderStore.fetchMailSenders({ limit: 'all' })
-  if (mailSenderData.data) {
-    mailSenders.value = mailSenderData.data.data
-    let defaultMailSender = mailSenderData.data.data.find(
-      (mailSender) => mailSender.is_default == true
-    )
-    paymentMailForm.mail_sender_id = defaultMailSender
-      ? defaultMailSender.id
-      : null
-    isFetchingInitialData.value = false
-  }
 }
 
 async function sendPaymentData() {
@@ -342,18 +280,4 @@ function closeSendPaymentModal() {
     modalStore.resetModalData()
   }, 300)
 }
-
-function getTickImage() {
-  const imgUrl = new URL('/img/tick.png', import.meta.url)
-  return imgUrl
-}
-
-const isMailSenderExist = computed(() => {
-  return mailSenders.value && mailSenders.value.length
-})
-
-function gotoMailSender() {
-  closeSendPaymentModal()
-  router.push('/admin/settings/mail-sender')
-}
 </script>

resources/scripts/admin/stores/mail-driver.js

@@ -0,0 +1,146 @@
+import axios from 'axios'
+import { defineStore } from 'pinia'
+import { useNotificationStore } from '@/scripts/stores/notification'
+import { handleError } from '@/scripts/helpers/error-handling'
+
+export const useMailDriverStore = (useWindow = false) => {
+  const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
+  const { global } = window.i18n
+
+  return defineStoreFunc({
+    id: 'mail-driver',
+
+    state: () => ({
+      mailConfigData: null,
+      mail_driver: 'smtp',
+      mail_drivers: [],
+
+      basicMailConfig: {
+        mail_driver: '',
+        mail_host: '',
+        from_mail: '',
+        from_name: '',
+      },
+
+      mailgunConfig: {
+        mail_driver: '',
+        mail_mailgun_domain: '',
+        mail_mailgun_secret: '',
+        mail_mailgun_endpoint: '',
+        from_mail: '',
+        from_name: '',
+      },
+
+      sesConfig: {
+        mail_driver: '',
+        mail_host: '',
+        mail_port: null,
+        mail_ses_key: '',
+        mail_ses_secret: '',
+        mail_encryption: 'tls',
+        from_mail: '',
+        from_name: '',
+      },
+
+      smtpConfig: {
+        mail_driver: '',
+        mail_host: '',
+        mail_port: null,
+        mail_username: '',
+        mail_password: '',
+        mail_encryption: 'tls',
+        from_mail: '',
+        from_name: '',
+      },
+    }),
+
+    actions: {
+      fetchMailDrivers() {
+        return new Promise((resolve, reject) => {
+          axios
+            .get('/api/v1/mail/drivers')
+            .then((response) => {
+              if (response.data) {
+                this.mail_drivers = response.data
+              }
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
+
+      fetchMailConfig() {
+        return new Promise((resolve, reject) => {
+          axios
+            .get('/api/v1/mail/config')
+            .then((response) => {
+              if (response.data) {
+                this.mailConfigData = response.data
+                this.mail_driver = response.data.mail_driver
+              }
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
+
+      updateMailConfig(data) {
+        return new Promise((resolve, reject) => {
+          axios
+            .post('/api/v1/mail/config', data)
+            .then((response) => {
+              const notificationStore = useNotificationStore()
+              if (response.data.success) {
+                notificationStore.showNotification({
+                  type: 'success',
+                  message: global.t('wizard.success.' + response.data.success),
+                })
+              } else {
+                notificationStore.showNotification({
+                  type: 'error',
+                  message: global.t('wizard.errors.' + response.data.error),
+                })
+              }
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
+
+      sendTestMail(data) {
+        return new Promise((resolve, reject) => {
+          axios
+            .post('/api/v1/mail/test', data)
+            .then((response) => {
+              const notificationStore = useNotificationStore()
+              if (response.data.success) {
+                notificationStore.showNotification({
+                  type: 'success',
+                  message: global.t('general.send_mail_successfully'),
+                })
+              } else {
+                notificationStore.showNotification({
+                  type: 'error',
+                  message: global.t('validation.something_went_wrong'),
+                })
+              }
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
+    },
+  })()
+}

resources/scripts/admin/stores/mail-sender.js

@@ -1,202 +0,0 @@
-import axios from 'axios'
-import { defineStore } from 'pinia'
-import { useNotificationStore } from '@/scripts/stores/notification'
-import { handleError } from '@/scripts/helpers/error-handling'
-import mailSenderStub from '@/scripts/admin/stub/mail-sender.js'
-
-export const useMailSenderStore = (useWindow = false) => {
-  const pre_t = 'settings.mail_sender'
-  const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
-  const { global } = window.i18n
-
-  return defineStoreFunc({
-    id: 'mailSender',
-
-    state: () => ({
-      mailSenders: [],
-      mail_drivers: [], // list of mail drivers
-      currentMailSender: { ...mailSenderStub.basicConfig },
-      smtpConfig: { ...mailSenderStub.smtpConfig },
-      mailgunConfig: { ...mailSenderStub.mailgunConfig },
-      sesConfig: { ...mailSenderStub.sesConfig },
-      mail_encryptions: ['none', 'tls', 'ssl', 'starttls'],
-      isDisable: false
-    }),
-
-    getters: {
-      isEdit: (state) => (state.currentMailSender.id ? true : false),
-    },
-
-    actions: {
-      resetCurrentMailSender() {
-        this.currentMailSender = { ...mailSenderStub.basicConfig }
-        this.smtpConfig = { ...mailSenderStub.smtpConfig }
-        this.mailgunConfig = { ...mailSenderStub.mailgunConfig }
-        this.sesConfig = { ...mailSenderStub.sesConfig }
-        this.isDisable = false
-      },
-
-      fetchMailDrivers() {
-        return new Promise((resolve, reject) => {
-          axios
-            .get('/api/v1/mail-drivers')
-            .then((response) => {
-              if (response.data) {
-                this.mail_drivers = response.data
-              }
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-
-      fetchMailSenders(params) {
-        return new Promise((resolve, reject) => {
-          axios
-            .get(`/api/v1/mail-senders`, { params })
-            .then((response) => {
-              this.mailSenders = response.data.data
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-      fetchMailSender(id) {
-        return new Promise((resolve, reject) => {
-          axios
-            .get(`/api/v1/mail-senders/${id}`)
-            .then((response) => {
-              this.currentMailSender = response.data.data
-              this.isDisable = response.data.data.is_default
-              if (response.data.data.settings) {
-                var settings = response.data.data.settings
-                const encryptionNone = settings.encryption == '' || settings.encryption == undefined
-                switch (response.data.data.driver) {
-                  case 'smtp':
-                    this.smtpConfig = settings
-                    encryptionNone ? this.smtpConfig.encryption = 'none' : ''
-                    break
-                  case 'mailgun':
-                    this.mailgunConfig = settings
-                    break
-                  case 'ses':
-                    this.sesConfig = settings
-                    encryptionNone ? this.sesConfig.encryption = 'none' : ''
-                    break
-                }
-              }
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-      addMailSender(data) {
-        const notificationStore = useNotificationStore()
-        return new Promise((resolve, reject) => {
-          axios
-            .post('/api/v1/mail-senders', data)
-            .then((response) => {
-              this.mailSenders.push(response.data.data)
-              notificationStore.showNotification({
-                type: 'success',
-                message: global.t(`${pre_t}.created_message`),
-              })
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-      updateMailSender(data) {
-        const notificationStore = useNotificationStore()
-        return new Promise((resolve, reject) => {
-          axios
-            .put(`/api/v1/mail-senders/${data.id}`, data)
-            .then((response) => {
-              if (response.data) {
-                let pos = this.mailSenders.findIndex(
-                  (mailSender) => mailSender.id === response.data.data.id
-                )
-                this.mailSenders[pos] = data
-                notificationStore.showNotification({
-                  type: 'success',
-                  message: global.t(`${pre_t}.updated_message`),
-                })
-              }
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-      deleteMailSender(id) {
-        return new Promise((resolve, reject) => {
-          axios
-            .delete(`/api/v1/mail-senders/${id}`)
-            .then((response) => {
-              if (response.data.success) {
-                let index = this.mailSenders.findIndex(
-                  (mailSender) => mailSender.id === id
-                )
-                this.mailSenders.splice(index, 1)
-                const notificationStore = useNotificationStore()
-                notificationStore.showNotification({
-                  type: 'success',
-                  message: global.t(`${pre_t}.deleted_message`),
-                })
-              }
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-
-      sendTestMail(data) {
-        return new Promise((resolve, reject) => {
-          axios
-            .post('/api/v1/mail-test', data)
-            .then((response) => {
-              const notificationStore = useNotificationStore()
-              if (response.data.success) {
-                notificationStore.showNotification({
-                  type: 'success',
-                  message: global.t('general.send_mail_successfully'),
-                })
-              } else {
-                notificationStore.showNotification({
-                  type: 'error',
-                  message: global.t('validation.something_went_wrong'),
-                })
-              }
-              resolve(response)
-            })
-            .catch((err) => {
-              handleError(err)
-              reject(err)
-            })
-        })
-      },
-    },
-  })()
-}

resources/scripts/admin/stores/users.js

@@ -25,7 +25,6 @@ export const useUsersStore = (useWindow = false) => {
         password: null,
         phone: null,
         companies: [],
-        sender_id: null,
       },
     }),
 

resources/scripts/admin/stub/abilities.js

@@ -64,13 +64,6 @@ export default {
   EDIT_ROLE: 'edit-role',
   VIEW_ROLE: 'view-role',
 
-  // Mail Sender
-  CREATE_MAIL_SENDER: 'view-mail-sender',
-  DELETE_MAIL_SENDER: 'delete-mail-sender',
-  EDIT_MAIL_SENDER: 'edit-mail-sender',
-  VIEW_MAIL_SENDER: 'view-mail-sender',
-
-
   // exchange rates
   VIEW_EXCHANGE_RATE: 'view-exchange-rate-provider',
   CREATE_EXCHANGE_RATE: 'create-exchange-rate-provider',

resources/scripts/admin/stub/customer.js

@@ -15,6 +15,5 @@ export default function () {
     customFields: [],
     fields: [],
     enable_portal: false,
-    mail_sender_id: null,
   }
 }

resources/scripts/admin/stub/mail-sender.js

@@ -1,31 +0,0 @@
-export default {
-  basicConfig: {
-    name: '',
-    from_name: '',
-    from_address: '',
-    cc: '',
-    bcc: '',
-    is_default: false,
-    driver: 'smtp', // 'smtp', 'mail', 'sendmail', 'mailgun', 'ses'
-    settings: '',
-  },
-  smtpConfig: {
-    host: '',
-    port: null,
-    username: '',
-    password: '',
-    encryption: 'tls', // 'tls', 'ssl', 'starttls'
-  },
-  mailgunConfig: {
-    domain: '',
-    secret: '',
-    endpoint: '',
-  },
-  sesConfig: {
-    host: '',
-    port: null,
-    encryption: 'tls', // 'tls', 'ssl', 'starttls'
-    ses_key: '',
-    ses_secret: '',
-  },
-}

resources/scripts/admin/views/customers/Create.vue

@@ -256,7 +256,6 @@
                   /> </template
               ></BaseInput>
             </BaseInputGroup>
-            <!-- && setPasswordMethod !== 'manual' -->
           </BaseInputGrid>
         </div>
 
@@ -651,7 +650,10 @@ const rules = computed(() => {
       },
 
       email: {
-        required: helpers.withMessage(t('validation.required'), required),
+        required: helpers.withMessage(
+          t('validation.required'),
+          requiredIf(customerStore.currentCustomer.enable_portal == true)
+        ),
         email: helpers.withMessage(t('validation.email_incorrect'), email),
       },
       password: {

resources/scripts/admin/views/installation/Step5EmailConfig.vue

@@ -3,238 +3,75 @@
     :title="$t('wizard.mail.mail_config')"
     :description="$t('wizard.mail.mail_config_desc')"
   >
-    <form action="" @submit.prevent="submitMailSenderData">
+    <form action="" @submit.prevent="next">
-      <div class="p-4 sm:p-6 my-2">
+      <component
-        <!-- Name -->
+        :is="mailDriverStore.mail_driver"
-        <BaseInputGrid>
+        :config-data="mailDriverStore.mailConfigData"
-          <BaseInputGroup
+        :is-saving="isSaving"
-            :label="$t(`${pre_t}.name`)"
+        :is-fetching-initial-data="isFetchingInitialData"
-            :error="v$.name.$error && v$.name.$errors[0].$message"
+        @on-change-driver="(val) => changeDriver(val)"
-            :help-text="$t(`${pre_t}.name_help`)"
+        @submit-data="next"
-            required
+      />
-          >
-            <BaseInput
-              v-model.trim="mailSenderStore.currentMailSender.name"
-              :invalid="v$.name.$error"
-              type="text"
-              @input="v$.name.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- From Name -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.from_name`)"
-            :error="v$.from_name.$error && v$.from_name.$errors[0].$message"
-            required
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.from_name"
-              :invalid="v$.from_name.$error"
-              type="text"
-              @input="v$.from_name.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- From Address -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.from_address`)"
-            :error="
-              v$.from_address.$error && v$.from_address.$errors[0].$message
-            "
-            required
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.from_address"
-              :invalid="v$.from_address.$error"
-              type="text"
-              @input="v$.from_address.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- CC -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.cc`)"
-            :error="v$.cc.$error && v$.cc.$errors[0].$message"
-            :help-text="$t(`${pre_t}.email_list`)"
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.cc"
-              :invalid="v$.cc.$error"
-              type="text"
-              @input="v$.cc.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- BCC -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.bcc`)"
-            :error="v$.bcc.$error && v$.bcc.$errors[0].$message"
-            :help-text="$t(`${pre_t}.email_list`)"
-          >
-            <BaseInput
-              v-model="mailSenderStore.currentMailSender.bcc"
-              :invalid="v$.bcc.$error"
-              type="text"
-              @input="v$.bcc.$touch()"
-            />
-          </BaseInputGroup>
-
-          <!-- Mail Driver -->
-          <BaseInputGroup
-            :label="$t(`${pre_t}.driver`)"
-            :error="v$.driver.$error && v$.driver.$errors[0].$message"
-            required
-          >
-            <BaseMultiselect
-              v-model="mailSenderStore.currentMailSender.driver"
-              :options="mailSenderStore.mail_drivers"
-              :can-deselect="false"
-              :invalid="v$.driver.$error"
-            />
-          </BaseInputGroup>
-
-          <component
-            :is="loadMailDriver"
-            :mail-sender-store="mailSenderStore"
-          />
-        </BaseInputGrid>
-        <BaseDivider class="my-4" />
-
-        <BaseButton
-          :loading="isSaving"
-          :disabled="isSaving"
-          variant="primary"
-          type="submit"
-        >
-          <template #left="slotProps">
-            <BaseIcon
-              v-if="!isSaving"
-              name="SaveIcon"
-              :class="slotProps.class"
-            />
-          </template>
-          {{ $t('wizard.save_cont') }}
-        </BaseButton>
-      </div>
     </form>
   </BaseWizardStep>
 </template>
 
-<script setup>
+<script>
-import { computed, ref, inject, onMounted } from 'vue'
+import Smtp from './mail-driver/SmtpMailDriver.vue'
-import { useI18n } from 'vue-i18n'
+import Mailgun from './mail-driver/MailgunMailDriver.vue'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
+import Ses from './mail-driver/SesMailDriver.vue'
-import { useVuelidate } from '@vuelidate/core'
+import Basic from './mail-driver/BasicMailDriver.vue'
-import { required, email, minLength, helpers } from '@vuelidate/validators'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
-import MailSenderDropdown from '@/scripts/admin/components/dropdowns/MailSenderIndexDropdown.vue'
+import { ref } from 'vue'
-import MailSenderTestModal from '@/scripts/admin/components/modal-components/MailSenderTestModal.vue'
-import SmtpDriver from '@/scripts/admin/views/settings/mail-sender/SmtpDriver.vue'
-import MailgunDriver from '@/scripts/admin/views/settings/mail-sender/MailgunDriver.vue'
-import SesDriver from '@/scripts/admin/views/settings/mail-sender/SesDriver.vue'
 
-const pre_t = 'settings.mail_sender'
+export default {
-const mailSenderStore = useMailSenderStore()
+  components: {
-const { t } = useI18n()
+    Smtp,
-const table = ref(null)
+    Mailgun,
-const utils = inject('utils')
+    Ses,
-let isSaving = ref(false)
+    sendmail: Basic,
-const emit = defineEmits(['next'])
+    Mail: Basic,
+  },
 
-const loadMailDriver = computed(() => {
+  emits: ['next'],
-  switch (mailSenderStore.currentMailSender.driver) {
-    case 'smtp':
-      return SmtpDriver
-      break
-    case 'mail':
-      return false
-      break
-    case 'sendmail':
-      return false
-      break
-    case 'mailgun':
-      return MailgunDriver
-      break
-    case 'ses':
-      return SesDriver
-      break
-    default:
-      return false
-  }
-})
 
-// This is multiple email custom validation
+  setup(props, { emit }) {
-const multiEmail = (value) => {
+    const isSaving = ref(false)
-  if (value == '' || value === null) return true
+    const isFetchingInitialData = ref(false)
-  const emailRegex =
-    /^(?:[A-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[A-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9]{2,}(?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i
 
-  const emailArr = value.split(',')
+    const mailDriverStore = useMailDriverStore()
-  let isValid = emailArr.every((v) => {
-    return emailRegex.test(v)
-  })
-  return isValid
-}
 
-const rules = computed(() => {
+    mailDriverStore.mail_driver = 'mail'
-  return {
-    name: {
-      required: helpers.withMessage(t('validation.required'), required),
-      minLength: helpers.withMessage(
-        t('validation.name_min_length', { count: 3 }),
-        minLength(3)
-      ),
-    },
-    from_name: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    from_address: {
-      required: helpers.withMessage(t('validation.required'), required),
-      email: helpers.withMessage(t('validation.email_incorrect'), email),
-    },
-    cc: {
-      multiEmail: helpers.withMessage(
-        t('validation.email_incorrect'),
-        multiEmail
-      ),
-    },
-    bcc: {
-      multiEmail: helpers.withMessage(
-        t('validation.email_incorrect'),
-        multiEmail
-      ),
-    },
-    driver: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-  }
-})
 
-const v$ = useVuelidate(
+    loadData()
-  rules,
-  computed(() => mailSenderStore.currentMailSender)
-)
 
-async function submitMailSenderData() {
+    function changeDriver(value) {
-  v$.value.$touch()
+      mailDriverStore.mail_driver = value
-  if (v$.value.$invalid) {
-    return true
-  }
-  try {
-    let data = {
-      ...mailSenderStore.currentMailSender,
-      is_default: true,
     }
-    await mailSenderStore.addMailSender(data)
-    isSaving.value = true
-    emit('next')
-    isSaving.value = false
-  } catch (err) {
-    isSaving.value = false
-    return true
-  }
-}
 
-onMounted(async () => {
+    async function loadData() {
-  await mailSenderStore.fetchMailDrivers()
+      isFetchingInitialData.value = true
-})
+      await mailDriverStore.fetchMailDrivers()
+      isFetchingInitialData.value = false
+    }
+
+    async function next(mailConfigData) {
+      isSaving.value = true
+      let res = await mailDriverStore.updateMailConfig(mailConfigData)
+      isSaving.value = false
+
+      if (res.data.success) {
+        await emit('next', 5)
+      }
+    }
+
+    return {
+      mailDriverStore,
+      isSaving,
+      isFetchingInitialData,
+      changeDriver,
+      next,
+    }
+  },
+}
 </script>

resources/scripts/admin/views/settings/mail-driver/BasicMailDriver.vue

@@ -0,0 +1,158 @@
+<template>
+  <form @submit.prevent="saveEmailConfig">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.mail.driver')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.basicMailConfig.mail_driver.$error &&
+          v$.basicMailConfig.mail_driver.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model="mailDriverStore.basicMailConfig.mail_driver"
+          :content-loading="isFetchingInitialData"
+          :options="mailDrivers"
+          :can-deselect="false"
+          :invalid="v$.basicMailConfig.mail_driver.$error"
+          @update:modelValue="onChangeDriver"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_mail')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.basicMailConfig.from_mail.$error &&
+          v$.basicMailConfig.from_mail.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.basicMailConfig.from_mail"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_mail"
+          :invalid="v$.basicMailConfig.from_mail.$error"
+          @input="v$.basicMailConfig.from_mail.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_name')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.basicMailConfig.from_name.$error &&
+          v$.basicMailConfig.from_name.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.basicMailConfig.from_name"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="name"
+          :invalid="v$.basicMailConfig.from_name.$error"
+          @input="v$.basicMailConfig.from_name.$touch()"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+    <div class="flex mt-8">
+      <BaseButton
+        :content-loading="isFetchingInitialData"
+        :disabled="isSaving"
+        :loading="isSaving"
+        variant="primary"
+        type="submit"
+      >
+        <template #left="slotProps">
+          <BaseIcon v-if="!isSaving" :class="slotProps.class" name="SaveIcon" />
+        </template>
+        {{ $t('general.save') }}
+      </BaseButton>
+      <slot />
+    </div>
+  </form>
+</template>
+
+<script setup>
+import { onMounted, computed } from 'vue'
+import { required, email, helpers } from '@vuelidate/validators'
+import useVuelidate from '@vuelidate/core'
+import { useI18n } from 'vue-i18n'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
+
+const props = defineProps({
+  configData: {
+    type: Object,
+    require: true,
+    default: Object,
+  },
+  isSaving: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  isFetchingInitialData: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  mailDrivers: {
+    type: Array,
+    require: true,
+    default: Array,
+  },
+})
+
+const emit = defineEmits(['submit-data', 'on-change-driver'])
+
+const mailDriverStore = useMailDriverStore()
+const { t } = useI18n()
+
+const rules = computed(() => {
+  return {
+    basicMailConfig: {
+      mail_driver: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      from_mail: {
+        required: helpers.withMessage(t('validation.required'), required),
+        email: helpers.withMessage(t('validation.email_incorrect'), email),
+      },
+      from_name: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+    },
+  }
+})
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => mailDriverStore)
+)
+
+onMounted(() => {
+  for (const key in mailDriverStore.basicMailConfig) {
+    if (props.configData.hasOwnProperty(key)) {
+      mailDriverStore.$patch((state) => {
+        state.basicMailConfig[key] = props.configData[key]
+      })
+    }
+  }
+})
+
+async function saveEmailConfig() {
+  v$.value.basicMailConfig.$touch()
+  if (!v$.value.basicMailConfig.$invalid) {
+    emit('submit-data', mailDriverStore.basicMailConfig)
+  }
+  return false
+}
+
+function onChangeDriver() {
+  v$.value.basicMailConfig.mail_driver.$touch()
+  emit('on-change-driver', mailDriverStore.basicMailConfig.mail_driver)
+}
+</script>

resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue

@@ -0,0 +1,247 @@
+<template>
+  <form @submit.prevent="saveEmailConfig">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.mail.driver')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.mail_driver.$error &&
+          v$.mailgunConfig.mail_driver.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model="mailDriverStore.mailgunConfig.mail_driver"
+          :content-loading="isFetchingInitialData"
+          :options="mailDrivers"
+          :can-deselect="false"
+          :invalid="v$.mailgunConfig.mail_driver.$error"
+          @update:modelValue="onChangeDriver"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.mailgun_domain')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.mail_mailgun_domain.$error &&
+          v$.mailgunConfig.mail_mailgun_domain.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.mailgunConfig.mail_mailgun_domain"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mailgun_domain"
+          :invalid="v$.mailgunConfig.mail_mailgun_domain.$error"
+          @input="v$.mailgunConfig.mail_mailgun_domain.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.mailgun_secret')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.mail_mailgun_secret.$error &&
+          v$.mailgunConfig.mail_mailgun_secret.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.mailgunConfig.mail_mailgun_secret"
+          :content-loading="isFetchingInitialData"
+          :type="getInputType"
+          name="mailgun_secret"
+          autocomplete="off"
+          :invalid="v$.mailgunConfig.mail_mailgun_secret.$error"
+          @input="v$.mailgunConfig.mail_mailgun_secret.$touch()"
+        >
+          <template #right>
+            <BaseIcon
+              v-if="isShowPassword"
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeOffIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+            <BaseIcon
+              v-else
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+          </template>
+        </BaseInput>
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.mailgun_endpoint')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.mail_mailgun_endpoint.$error &&
+          v$.mailgunConfig.mail_mailgun_endpoint.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.mailgunConfig.mail_mailgun_endpoint"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mailgun_endpoint"
+          :invalid="v$.mailgunConfig.mail_mailgun_endpoint.$error"
+          @input="v$.mailgunConfig.mail_mailgun_endpoint.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_mail')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.from_mail.$error &&
+          v$.mailgunConfig.from_mail.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.mailgunConfig.from_mail"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_mail"
+          :invalid="v$.mailgunConfig.from_mail.$error"
+          @input="v$.mailgunConfig.from_mail.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_name')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.mailgunConfig.from_name.$error &&
+          v$.mailgunConfig.from_name.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.mailgunConfig.from_name"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_name"
+          :invalid="v$.mailgunConfig.from_name.$error"
+          @input="v$.mailgunConfig.from_name.$touch()"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+    <div class="flex my-10">
+      <BaseButton
+        :disabled="isSaving"
+        :content-loading="isFetchingInitialData"
+        :loading="isSaving"
+        variant="primary"
+        type="submit"
+      >
+        <template #left="slotProps">
+          <BaseIcon v-if="!isSaving" name="SaveIcon" :class="slotProps.class" />
+        </template>
+        {{ $t('general.save') }}
+      </BaseButton>
+      <slot />
+    </div>
+  </form>
+</template>
+
+<script setup>
+import { onMounted, ref, computed } from 'vue'
+import { required, email, helpers } from '@vuelidate/validators'
+import useVuelidate from '@vuelidate/core'
+import { useI18n } from 'vue-i18n'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
+
+const props = defineProps({
+  configData: {
+    type: Object,
+    require: true,
+    default: Object,
+  },
+  isSaving: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  isFetchingInitialData: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  mailDrivers: {
+    type: Array,
+    require: true,
+    default: Array,
+  },
+})
+
+const emit = defineEmits(['submit-data', 'on-change-driver'])
+
+const mailDriverStore = useMailDriverStore()
+const { t } = useI18n()
+
+let isShowPassword = ref(false)
+
+const getInputType = computed(() => {
+  if (isShowPassword.value) {
+    return 'text'
+  }
+  return 'password'
+})
+
+const rules = computed(() => {
+  return {
+    mailgunConfig: {
+      mail_driver: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_mailgun_domain: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_mailgun_endpoint: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_mailgun_secret: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      from_mail: {
+        required: helpers.withMessage(t('validation.required'), required),
+        email,
+      },
+      from_name: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+    },
+  }
+})
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => mailDriverStore)
+)
+
+onMounted(() => {
+  for (const key in mailDriverStore.mailgunConfig) {
+    if (props.configData.hasOwnProperty(key)) {
+      mailDriverStore.mailgunConfig[key] = props.configData[key]
+    }
+  }
+})
+
+async function saveEmailConfig() {
+  v$.value.mailgunConfig.$touch()
+  if (!v$.value.mailgunConfig.$invalid) {
+    emit('submit-data', mailDriverStore.mailgunConfig)
+  }
+  return false
+}
+
+function onChangeDriver() {
+  v$.value.mailgunConfig.mail_driver.$touch()
+  emit('on-change-driver', mailDriverStore.mailgunConfig.mail_driver)
+}
+</script>

resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue

@@ -0,0 +1,294 @@
+<template>
+  <form @submit.prevent="saveEmailConfig">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.mail.driver')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_driver.$error &&
+          v$.sesConfig.mail_driver.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model="mailDriverStore.sesConfig.mail_driver"
+          :content-loading="isFetchingInitialData"
+          :options="mailDrivers"
+          :can-deselect="false"
+          :invalid="v$.sesConfig.mail_driver.$error"
+          @update:modelValue="onChangeDriver"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.host')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_host.$error &&
+          v$.sesConfig.mail_host.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.mail_host"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mail_host"
+          :invalid="v$.sesConfig.mail_host.$error"
+          @input="v$.sesConfig.mail_host.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.port')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_port.$error &&
+          v$.sesConfig.mail_port.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.mail_port"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mail_port"
+          :invalid="v$.sesConfig.mail_port.$error"
+          @input="v$.sesConfig.mail_port.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.encryption')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_encryption.$error &&
+          v$.sesConfig.mail_encryption.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model.trim="mailDriverStore.sesConfig.mail_encryption"
+          :content-loading="isFetchingInitialData"
+          :options="encryptions"
+          :invalid="v$.sesConfig.mail_encryption.$error"
+          placeholder="Select option"
+          @input="v$.sesConfig.mail_encryption.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_mail')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.from_mail.$error &&
+          v$.sesConfig.from_mail.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.from_mail"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_mail"
+          :invalid="v$.sesConfig.from_mail.$error"
+          @input="v$.sesConfig.from_mail.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_name')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.from_name.$error &&
+          v$.sesConfig.from_name.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.from_name"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="name"
+          :invalid="v$.sesConfig.from_name.$error"
+          @input="v$.sesConfig.from_name.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.ses_key')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_ses_key.$error &&
+          v$.sesConfig.mail_ses_key.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.mail_ses_key"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mail_ses_key"
+          :invalid="v$.sesConfig.mail_ses_key.$error"
+          @input="v$.sesConfig.mail_ses_key.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.ses_secret')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.sesConfig.mail_ses_secret.$error &&
+          v$.mail_ses_secret.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.sesConfig.mail_ses_secret"
+          :content-loading="isFetchingInitialData"
+          :type="getInputType"
+          name="mail_ses_secret"
+          autocomplete="off"
+          :invalid="v$.sesConfig.mail_ses_secret.$error"
+          @input="v$.sesConfig.mail_ses_secret.$touch()"
+        >
+          <template #right>
+            <BaseIcon
+              v-if="isShowPassword"
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeOffIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+            <BaseIcon
+              v-else
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+          </template>
+        </BaseInput>
+      </BaseInputGroup>
+    </BaseInputGrid>
+
+    <div class="flex my-10">
+      <BaseButton
+        :disabled="isSaving"
+        :content-loading="isFetchingInitialData"
+        :loading="isSaving"
+        variant="primary"
+        type="submit"
+      >
+        <template #left="slotProps">
+          <BaseIcon v-if="!isSaving" name="SaveIcon" :class="slotProps.class" />
+        </template>
+        {{ $t('general.save') }}
+      </BaseButton>
+      <slot />
+    </div>
+  </form>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from 'vue'
+import { required, email, numeric, helpers } from '@vuelidate/validators'
+import useVuelidate from '@vuelidate/core'
+import { useI18n } from 'vue-i18n'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
+
+const props = defineProps({
+  configData: {
+    type: Object,
+    require: true,
+    default: Object,
+  },
+  isSaving: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  isFetchingInitialData: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  mailDrivers: {
+    type: Array,
+    require: true,
+    default: Array,
+  },
+})
+
+const emit = defineEmits(['submit-data', 'on-change-driver'])
+
+const mailDriverStore = useMailDriverStore()
+const { t } = useI18n()
+
+let isShowPassword = ref(false)
+const encryptions = reactive(['tls', 'ssl', 'starttls'])
+
+const rules = computed(() => {
+  return {
+    sesConfig: {
+      mail_driver: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_host: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_port: {
+        required: helpers.withMessage(t('validation.required'), required),
+        numeric,
+      },
+      mail_ses_key: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_ses_secret: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_encryption: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      from_mail: {
+        required: helpers.withMessage(t('validation.required'), required),
+        email: helpers.withMessage(t('validation.email_incorrect'), email),
+      },
+      from_name: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+    },
+  }
+})
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => mailDriverStore)
+)
+
+const getInputType = computed(() => {
+  if (isShowPassword.value) {
+    return 'text'
+  }
+  return 'password'
+})
+
+onMounted(() => {
+  for (const key in mailDriverStore.sesConfig) {
+    if (props.configData.hasOwnProperty(key)) {
+      mailDriverStore.sesConfig[key] = props.configData[key]
+    }
+  }
+})
+
+async function saveEmailConfig() {
+  v$.value.sesConfig.$touch()
+  if (!v$.value.sesConfig.$invalid) {
+    emit('submit-data', mailDriverStore.sesConfig)
+  }
+  return false
+}
+
+function onChangeDriver() {
+  v$.value.sesConfig.mail_driver.$touch()
+  emit('on-change-driver', mailDriverStore.sesConfig.mail_driver)
+}
+</script>

resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue

@@ -0,0 +1,275 @@
+<template>
+  <form @submit.prevent="saveEmailConfig">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.mail.driver')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.mail_driver.$error &&
+          v$.smtpConfig.mail_driver.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model="mailDriverStore.smtpConfig.mail_driver"
+          :content-loading="isFetchingInitialData"
+          :options="mailDrivers"
+          :can-deselect="false"
+          :invalid="v$.smtpConfig.mail_driver.$error"
+          @update:modelValue="onChangeDriver"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.host')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.mail_host.$error &&
+          v$.smtpConfig.mail_host.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.mail_host"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mail_host"
+          :invalid="v$.smtpConfig.mail_host.$error"
+          @input="v$.smtpConfig.mail_host.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :content-loading="isFetchingInitialData"
+        :label="$t('settings.mail.username')"
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.mail_username"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="db_name"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :content-loading="isFetchingInitialData"
+        :label="$t('settings.mail.password')"
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.mail_password"
+          :content-loading="isFetchingInitialData"
+          :type="getInputType"
+          name="password"
+        >
+          <template #right>
+            <BaseIcon
+              v-if="isShowPassword"
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeOffIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+            <BaseIcon
+              v-else
+              class="mr-1 text-gray-500 cursor-pointer"
+              name="EyeIcon"
+              @click="isShowPassword = !isShowPassword"
+            />
+          </template>
+        </BaseInput>
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.port')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.mail_port.$error &&
+          v$.smtpConfig.mail_port.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.mail_port"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="mail_port"
+          :invalid="v$.smtpConfig.mail_port.$error"
+          @input="v$.smtpConfig.mail_port.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.encryption')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.mail_encryption.$error &&
+          v$.smtpConfig.mail_encryption.$errors[0].$message
+        "
+        required
+      >
+        <BaseMultiselect
+          v-model.trim="mailDriverStore.smtpConfig.mail_encryption"
+          :content-loading="isFetchingInitialData"
+          :options="encryptions"
+          :searchable="true"
+          :show-labels="false"
+          placeholder="Select option"
+          :invalid="v$.smtpConfig.mail_encryption.$error"
+          @input="v$.smtpConfig.mail_encryption.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_mail')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.from_mail.$error &&
+          v$.smtpConfig.from_mail.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.from_mail"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_mail"
+          :invalid="v$.smtpConfig.from_mail.$error"
+          @input="v$.smtpConfig.from_mail.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.mail.from_name')"
+        :content-loading="isFetchingInitialData"
+        :error="
+          v$.smtpConfig.from_name.$error &&
+          v$.smtpConfig.from_name.$errors[0].$message
+        "
+        required
+      >
+        <BaseInput
+          v-model.trim="mailDriverStore.smtpConfig.from_name"
+          :content-loading="isFetchingInitialData"
+          type="text"
+          name="from_name"
+          :invalid="v$.smtpConfig.from_name.$error"
+          @input="v$.smtpConfig.from_name.$touch()"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+
+    <div class="flex my-10">
+      <BaseButton
+        :disabled="isSaving"
+        :content-loading="isFetchingInitialData"
+        :loading="isSaving"
+        type="submit"
+        variant="primary"
+      >
+        <template #left="slotProps">
+          <BaseIcon v-if="!isSaving" name="SaveIcon" :class="slotProps.class" />
+        </template>
+        {{ $t('general.save') }}
+      </BaseButton>
+      <slot />
+    </div>
+  </form>
+</template>
+
+<script setup>
+import { reactive, onMounted, ref, computed } from 'vue'
+import { required, email, numeric, helpers } from '@vuelidate/validators'
+import useVuelidate from '@vuelidate/core'
+import { useI18n } from 'vue-i18n'
+import { useMailDriverStore } from '@/scripts/admin/stores/mail-driver'
+
+const props = defineProps({
+  configData: {
+    type: Object,
+    require: true,
+    default: Object,
+  },
+  isSaving: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  isFetchingInitialData: {
+    type: Boolean,
+    require: true,
+    default: false,
+  },
+  mailDrivers: {
+    type: Array,
+    require: true,
+    default: Array,
+  },
+})
+
+const emit = defineEmits(['submit-data', 'on-change-driver'])
+
+const mailDriverStore = useMailDriverStore()
+const { t } = useI18n()
+
+let isShowPassword = ref(false)
+const encryptions = reactive(['tls', 'ssl', 'starttls'])
+
+const getInputType = computed(() => {
+  if (isShowPassword.value) {
+    return 'text'
+  }
+  return 'password'
+})
+
+const rules = computed(() => {
+  return {
+    smtpConfig: {
+      mail_driver: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_host: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      mail_port: {
+        required: helpers.withMessage(t('validation.required'), required),
+        numeric: helpers.withMessage(t('validation.numbers_only'), numeric),
+      },
+      mail_encryption: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+      from_mail: {
+        required: helpers.withMessage(t('validation.required'), required),
+        email: helpers.withMessage(t('validation.email_incorrect'), email),
+      },
+      from_name: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
+    },
+  }
+})
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => mailDriverStore)
+)
+
+onMounted(() => {
+  for (const key in mailDriverStore.smtpConfig) {
+    if (props.configData.hasOwnProperty(key)) {
+      mailDriverStore.smtpConfig[key] = props.configData[key]
+    }
+  }
+})
+
+async function saveEmailConfig() {
+  v$.value.smtpConfig.$touch()
+  if (!v$.value.smtpConfig.$invalid) {
+    emit('submit-data', mailDriverStore.smtpConfig)
+  }
+  return false
+}
+
+function onChangeDriver() {
+  v$.value.smtpConfig.mail_driver.$touch()
+  emit('on-change-driver', mailDriverStore.smtpConfig.mail_driver)
+}
+</script>

resources/scripts/admin/views/settings/mail-sender/Index.vue

@@ -1,136 +0,0 @@
-<template>
-  <BaseSettingCard
-    :title="$tc(`${pre_t}.title`, 2)"
-    :description="$t(`${pre_t}.description`)"
-  >
-    <MailSenderModal />
-    <MailSenderTestModal />
-
-    <template #action>
-      <BaseButton
-        type="submit"
-        variant="primary-outline"
-        @click="openMailSenderModal"
-      >
-        <template #left="slotProps">
-          <BaseIcon :class="slotProps.class" name="PlusIcon" />
-        </template>
-        {{ $t(`${pre_t}.add_new_mail_sender`) }}
-      </BaseButton>
-    </template>
-
-    <BaseTable
-      ref="table"
-      class="mt-16"
-      :data="fetchData"
-      :columns="mailSenderColumns"
-    >
-      <template #cell-is_default="{ row }">
-        <BaseBadge
-          :bg-color="
-            utils.getBadgeStatusColor(row.data.is_default ? 'YES' : 'NO')
-              .bgColor
-          "
-          :color="
-            utils.getBadgeStatusColor(row.data.is_default ? 'YES' : 'NO').color
-          "
-        >
-          {{ row.data.is_default ? $t('general.yes') : $t('general.no') }}
-        </BaseBadge>
-      </template>
-
-      <template #cell-actions="{ row }">
-        <MailSenderDropdown
-          :row="row.data"
-          :table="table"
-          :load-data="refreshTable"
-        />
-      </template>
-    </BaseTable>
-  </BaseSettingCard>
-</template>
-
-<script setup>
-import { computed, ref, inject } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { useModalStore } from '@/scripts/stores/modal'
-import MailSenderModal from '@/scripts/admin/components/modal-components/MailSenderModal.vue'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
-import MailSenderDropdown from '@/scripts/admin/components/dropdowns/MailSenderIndexDropdown.vue'
-import MailSenderTestModal from '@/scripts/admin/components/modal-components/MailSenderTestModal.vue'
-
-const pre_t = 'settings.mail_sender'
-const modalStore = useModalStore()
-const mailSenderStore = useMailSenderStore()
-const { t } = useI18n()
-const table = ref(null)
-const utils = inject('utils')
-
-function openMailSenderModal() {
-  modalStore.openModal({
-    title: t(`${pre_t}.add_new_mail_sender`),
-    componentName: 'MailSenderModal',
-    size: 'md',
-    refreshData: refreshTable,
-  })
-}
-
-const mailSenderColumns = computed(() => {
-  return [
-    {
-      key: 'name',
-      label: t(`${pre_t}.name`),
-      thClass: 'extra',
-      tdClass: 'font-medium text-gray-900',
-    },
-    {
-      key: 'driver',
-      label: t(`${pre_t}.driver`),
-      thClass: 'extra',
-      tdClass: 'font-medium text-gray-900',
-    },
-    {
-      key: 'from_address',
-      label: t(`${pre_t}.from_address`),
-      thClass: 'extra',
-      tdClass: 'font-medium text-gray-900',
-    },
-    {
-      key: 'is_default',
-      label: t(`${pre_t}.is_default`),
-      thClass: 'extra',
-      tdClass: 'font-medium text-gray-900',
-    },
-    {
-      key: 'actions',
-      label: '',
-      tdClass: 'text-right text-sm font-medium',
-      sortable: false,
-    },
-  ]
-})
-
-async function fetchData({ page, filter, sort }) {
-  let data = {
-    orderByField: sort.fieldName || 'created_at',
-    orderBy: sort.order || 'desc',
-    page,
-  }
-
-  let response = await mailSenderStore.fetchMailSenders(data)
-
-  return {
-    data: response.data.data,
-    pagination: {
-      totalPages: response.data.meta.last_page,
-      currentPage: page,
-      totalCount: response.data.meta.total,
-      limit: response.data.meta.per_page ? response.data.meta.per_page : 10,
-    },
-  }
-}
-
-async function refreshTable() {
-  table.value && table.value.refresh()
-}
-</script>

resources/scripts/admin/views/settings/mail-sender/MailgunDriver.vue

@@ -1,104 +0,0 @@
-<template>
-  <!-- Domain -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.domain`)"
-    :error="v$.domain.$error && v$.domain.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.mailgunConfig.domain"
-      :invalid="v$.domain.$error"
-      type="text"
-      @input="v$.domain.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- Mailgun Secret -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.secret`)"
-    :error="v$.secret.$error && v$.secret.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model="mailSenderStore.mailgunConfig.secret"
-      :type="getInputType"
-      autocomplete="off"
-      :invalid="v$.secret.$error"
-      @input="v$.secret.$touch()"
-    >
-      <template #right>
-        <BaseIcon
-          v-if="isShowPassword"
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeOffIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-        <BaseIcon
-          v-else
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-      </template>
-    </BaseInput>
-  </BaseInputGroup>
-
-  <!-- Mailgun Endpoint -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.endpoint`)"
-    :error="v$.endpoint.$error && v$.endpoint.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.mailgunConfig.endpoint"
-      type="text"
-      :invalid="v$.endpoint.$error"
-      @input="v$.endpoint.$touch()"
-    />
-  </BaseInputGroup>
-</template>
-
-<script setup>
-import { computed, ref } from "vue"
-import { useI18n } from "vue-i18n"
-import { required, email, numeric, helpers } from "@vuelidate/validators"
-import { useVuelidate } from "@vuelidate/core"
-
-const pre_t = "settings.mail_sender.mailgun_config"
-const { t } = useI18n()
-
-const props = defineProps({
-  mailSenderStore: {
-    type: Object,
-    require: true,
-    default: Object,
-  },
-})
-
-let isShowPassword = ref(false)
-const getInputType = computed(() => {
-  if (isShowPassword.value) {
-    return "text"
-  }
-  return "password"
-})
-
-const rules = computed(() => {
-  return {
-    domain: {
-      required: helpers.withMessage(t("validation.required"), required),
-    },
-    endpoint: {
-      required: helpers.withMessage(t("validation.required"), required),
-    },
-    secret: {
-      required: helpers.withMessage(t("validation.required"), required),
-    },
-  }
-})
-
-const v$ = useVuelidate(
-  rules,
-  computed(() => props.mailSenderStore.mailgunConfig)
-)
-</script>

resources/scripts/admin/views/settings/mail-sender/SesDriver.vue

@@ -1,143 +0,0 @@
-<template>
-  <!-- Host -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.host`)"
-    :error="v$.host.$error && v$.host.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.sesConfig.host"
-      :invalid="v$.host.$error"
-      type="text"
-      @input="v$.host.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- Port -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.port`)"
-    :error="v$.port.$error && v$.port.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.sesConfig.port"
-      type="text"
-      :invalid="v$.port.$error"
-      @input="v$.port.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- Encryption -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.encryption`)"
-    :error="v$.encryption.$error && v$.encryption.$errors[0].$message"
-    required
-  >
-    <BaseMultiselect
-      v-model.trim="mailSenderStore.sesConfig.encryption"
-      :options="encryptions"
-      :searchable="true"
-      :show-labels="false"
-      :placeholder="$t('general.select_option')"
-      :invalid="v$.encryption.$error"
-      @input="v$.encryption.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- SES Key -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.ses_key`)"
-    :error="v$.ses_key.$error && v$.ses_key.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.sesConfig.ses_key"
-      type="text"
-      :invalid="v$.ses_key.$error"
-      @input="v$.ses_key.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- SES Secret -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.ses_secret`)"
-    :error="v$.ses_secret.$error && v$.ses_secret.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model="mailSenderStore.sesConfig.ses_secret"
-      :type="getInputType"
-      autocomplete="off"
-      :invalid="v$.ses_secret.$error"
-      @input="v$.ses_secret.$touch()"
-    >
-      <template #right>
-        <BaseIcon
-          v-if="isShowPassword"
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeOffIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-        <BaseIcon
-          v-else
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-      </template>
-    </BaseInput>
-  </BaseInputGroup>
-</template>
-
-<script setup>
-import { computed, ref, reactive } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { required, email, numeric, helpers } from '@vuelidate/validators'
-import { useVuelidate } from '@vuelidate/core'
-
-const pre_t = 'settings.mail_sender.ses_config'
-const { t } = useI18n()
-
-const props = defineProps({
-  mailSenderStore: {
-    type: Object,
-    require: true,
-    default: Object,
-  },
-})
-
-let isShowPassword = ref(false)
-const getInputType = computed(() => {
-  if (isShowPassword.value) {
-    return 'text'
-  }
-  return 'password'
-})
-const encryptions = props.mailSenderStore.mail_encryptions
-
-const rules = computed(() => {
-  return {
-    host: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    port: {
-      required: helpers.withMessage(t('validation.required'), required),
-      numeric,
-    },
-    encryption: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    ses_key: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    ses_secret: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-  }
-})
-
-const v$ = useVuelidate(
-  rules,
-  computed(() => props.mailSenderStore.sesConfig)
-)
-</script>

resources/scripts/admin/views/settings/mail-sender/SmtpDriver.vue

@@ -1,120 +0,0 @@
-<template>
-  <!-- Host -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.host`)"
-    :error="v$.host.$error && v$.host.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.smtpConfig.host"
-      :invalid="v$.host.$error"
-      type="text"
-      @input="v$.host.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- Port -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.port`)"
-    :error="v$.port.$error && v$.port.$errors[0].$message"
-    required
-  >
-    <BaseInput
-      v-model.trim="mailSenderStore.smtpConfig.port"
-      type="text"
-      :invalid="v$.port.$error"
-      @input="v$.port.$touch()"
-    />
-  </BaseInputGroup>
-
-  <!-- Username -->
-  <BaseInputGroup :label="$t(`${pre_t}.username`)">
-    <BaseInput v-model.trim="mailSenderStore.smtpConfig.username" type="text" />
-  </BaseInputGroup>
-
-  <!-- Password -->
-  <BaseInputGroup :label="$t(`${pre_t}.password`)">
-    <BaseInput
-      v-model="mailSenderStore.smtpConfig.password"
-      :type="getInputType"
-    >
-      <template #right>
-        <BaseIcon
-          v-if="isShowPassword"
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeOffIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-        <BaseIcon
-          v-else
-          class="mr-1 text-gray-500 cursor-pointer"
-          name="EyeIcon"
-          @click="isShowPassword = !isShowPassword"
-        />
-      </template>
-    </BaseInput>
-  </BaseInputGroup>
-
-  <!-- Encryption -->
-  <BaseInputGroup
-    :label="$t(`${pre_t}.encryption`)"
-    :error="v$.encryption.$error && v$.encryption.$errors[0].$message"
-    required
-  >
-    <BaseMultiselect
-      v-model.trim="mailSenderStore.smtpConfig.encryption"
-      :options="encryptions"
-      :searchable="true"
-      :show-labels="false"
-      :placeholder="$t('general.select_option')"
-      :invalid="v$.encryption.$error"
-      @input="v$.encryption.$touch()"
-    />
-  </BaseInputGroup>
-</template>
-
-<script setup>
-import { computed, ref, reactive } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { required, numeric, helpers } from '@vuelidate/validators'
-import { useVuelidate } from '@vuelidate/core'
-
-const pre_t = 'settings.mail_sender.smtp_config'
-const { t } = useI18n()
-
-const props = defineProps({
-  mailSenderStore: {
-    type: Object,
-    require: true,
-    default: Object,
-  },
-})
-let isShowPassword = ref(false)
-const getInputType = computed(() => {
-  if (isShowPassword.value) {
-    return 'text'
-  }
-  return 'password'
-})
-const encryptions = props.mailSenderStore.mail_encryptions
-
-const rules = computed(() => {
-  return {
-    host: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    port: {
-      required: helpers.withMessage(t('validation.required'), required),
-      numeric: helpers.withMessage(t('validation.numbers_only'), numeric),
-    },
-    encryption: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-  }
-})
-
-const v$ = useVuelidate(
-  rules,
-  computed(() => props.mailSenderStore.smtpConfig)
-)
-</script>

resources/scripts/admin/views/users/Create.vue

@@ -162,7 +162,7 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive, onMounted } from 'vue'
+import { ref, computed, reactive } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
 import {

resources/scripts/components/base/BaseModal.vue

@@ -54,6 +54,7 @@
               bg-white
               rounded-lg
               text-left
+              overflow-hidden
               relative
               shadow-xl
               transition-all

resources/scripts/locales/en.json

@@ -100,9 +100,7 @@
     "pay_invoice": "Pay Invoice",
     "login_successfully": "Logged in successfully!",
     "logged_out_successfully": "Logged out successfully",
-    "mark_as_default": "Mark as default",
+    "mark_as_default": "Mark as default"
-    "select_option": "Select option",
-    "send_test_mail": "Send Test Mail"
   },
   "dashboard": {
     "select_year": "Select year",
@@ -235,8 +233,7 @@
     "updated_message": "Customer updated successfully",
     "address_updated_message": "Address Information Updated succesfully",
     "deleted_message": "Customer deleted successfully | Customers deleted successfully",
-    "edit_currency_not_allowed": "Cannot change currency once transactions created.",
+    "edit_currency_not_allowed": "Cannot change currency once transactions created."
-    "select_sender": "Select Sender"
   },
   "items": {
     "title": "Items",
@@ -731,8 +728,7 @@
     "updated_message": "User updated successfully",
     "deleted_message": "User deleted successfully | Users deleted successfully",
     "select_company_role": "Select Role for {company}",
-    "companies": "Companies",
+    "companies": "Companies"
-    "select_sender": "Select Sender"
   },
   "reports": {
     "title": "Report",
@@ -811,8 +807,7 @@
       "payment_modes": "Payment Modes",
       "notes": "Notes",
       "exchange_rate": "Exchange Rate",
-      "address_information": "Address Information",
+      "address_information": "Address Information"
-      "mail_sender": "Mail Senders"
     },
     "address_information": {
       "section_description": "  You can update Your Address information using form below."
@@ -1316,51 +1311,6 @@
       "state_placeholder": "Example: CA",
       "zip_placeholder": "Example: 90024",
       "invalid_address": "Please provide valid address details."
-    },
-    "mail_sender": {
-      "title": "Mail Sender | Mail Senders",
-      "description": "Configure & test your mail senders for the selected company.",
-      "add_new_mail_sender": "New Mail Sender",
-      "name": "Sender Name",
-      "name_help": "Type a name to identify the sender for users.",
-      "driver": "Mail Driver",
-      "is_default": "Set as default",
-      "is_default_description": "You can only set one sender as default at a given time.",
-      "cc": "CC",
-      "bcc": "BCC",
-      "from_address": "From Mail Address",
-      "from_name": "From Mail Name",
-      "edit_mail_sender": "Edit Mail Sender",
-      "delete_mail_sender": "Delete Mail Sender",
-      "confirm_delete": "You will not be able to recover this Mail Sender",
-      "created_message": "Mail Sender created successfully",
-      "updated_message": "Mail Sender updated successfully",
-      "deleted_message": "Mail Sender deleted successfully",
-      "default_record_exists": "Default mail sender already exist",
-      "email_list": "Supports a comma separated list of email addresses",
-      "select_mail_sender": "Select Mail Sender",
-      "manage_mail_sender": "Manage Mail Senders",
-      "no_mail_sender_found": "No mail senders found!",
-      "no_mail_sender_found_description": "You must configure at-least one mail sender for the selected company in order to continue.",
-      "smtp_config": {
-        "host": "Host",
-        "port": "Port",
-        "username": "Username",
-        "password": "Password",
-        "encryption": "Encryption"
-      },
-      "mailgun_config": {
-        "domain": "Domain",
-        "secret": "Maingun Secret",
-        "endpoint": "Mailgun Endpoint"
-      },
-      "ses_config": {
-        "host": "Host",
-        "port": "Port",
-        "encryption": "Encryption",
-        "ses_key": "SES Key",
-        "ses_secret": "SES Secret"
-      }
     }
   },
   "wizard": {

resources/views/app.blade.php

@@ -21,7 +21,7 @@
         <link rel="stylesheet" href="/modules/styles/{{ $name }}">
     @endforeach
 
-    @vite
+    @vite('resources/scripts/main.js')
 </head>
 
 <body
@@ -57,15 +57,15 @@
 
         window.login_page_description = "{{$login_page_description}}"
 
-        @endif     
+        @endif
         @if(isset($copyright_text))
 
         window.copyright_text = "{{$copyright_text}}"
 
-        @endif    
+        @endif
 
-        window.Crater.start()
+        // window.Crater.start()
     </script>
 </body>
 
-</html>
+</html>

routes/api.php

@@ -47,8 +47,6 @@ use Crater\Http\Controllers\V1\Admin\Invoice\SendInvoiceController;
 use Crater\Http\Controllers\V1\Admin\Invoice\SendInvoicePreviewController;
 use Crater\Http\Controllers\V1\Admin\Item\ItemsController;
 use Crater\Http\Controllers\V1\Admin\Item\UnitsController;
-use Crater\Http\Controllers\V1\Admin\MailSender\GetAllMailSendersController;
-use Crater\Http\Controllers\V1\Admin\MailSender\MailSenderController;
 use Crater\Http\Controllers\V1\Admin\Mobile\AuthController;
 use Crater\Http\Controllers\V1\Admin\Modules\ApiTokenController;
 use Crater\Http\Controllers\V1\Admin\Modules\CompleteModuleInstallationController;
@@ -403,11 +401,13 @@ Route::prefix('/v1')->group(function () {
             // Mails
             //----------------------------------
 
-            Route::apiResource('mail-senders', MailSenderController::class);
+            Route::get('/mail/drivers', [MailConfigurationController::class, 'getMailDrivers']);
 
-            Route::get('/mail-drivers', [MailConfigurationController::class, 'getMailDrivers']);
+            Route::get('/mail/config', [MailConfigurationController::class, 'getMailEnvironment']);
 
-            Route::post('/mail-test', [MailConfigurationController::class, 'TestMailDriver']);
+            Route::post('/mail/config', [MailConfigurationController::class, 'saveMailEnvironment']);
+
+            Route::post('/mail/test', [MailConfigurationController::class, 'testEmailConfig']);
 
             Route::get('/company/mail/config', GetCompanyMailConfigurationController::class);
 

vite.config.ts

@@ -1,17 +1,24 @@
-import { defineConfig } from 'laravel-vite'
+import { defineConfig } from 'vite'
+import laravel from 'laravel-vite-plugin'
 import vue from '@vitejs/plugin-vue'
 
 export default defineConfig({
     server: {
-        watch: {
+      watch: {
-            ignored: ['**/.env/**'],
+        ignored: ['**/.env/**'],
-        },
+      },
     },
+    plugins: [
+      vue(),
+      laravel({
+        input: ['resources/scripts/main.js'],
+        valetTls: false,
+      }),
+    ],
     resolve: {
-        alias: {
+      alias: {
-            "vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js"
+        '@': '/resources',
-        }
+        'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
-    }
+      },
-}).withPlugins(
+    },
-    vue
+  })
-)