diff --git a/app/Http/Controllers/Api/Users/UsersController.php b/app/Http/Controllers/Api/Users/UsersController.php index 95cd827..2a8f844 100644 --- a/app/Http/Controllers/Api/Users/UsersController.php +++ b/app/Http/Controllers/Api/Users/UsersController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Api\Users; +use App\Events\UserRegistered; use App\Http\Controllers\Controller; use App\Models\User; use App\Transformers\Users\UserTransformer; @@ -47,6 +48,7 @@ class UsersController extends Controller { ]); $user = $this->model->create($request->all()); $user->assignRole('User'); + event(new UserRegistered($user, $request->get('password'))); //if ($request->has('roles')) $user->syncRoles($request['roles']); return fractal($user, new UserTransformer())->respond(201); } diff --git a/app/Models/Applications/Application.php b/app/Models/Applications/Application.php index 0abf05c..b6c7038 100644 --- a/app/Models/Applications/Application.php +++ b/app/Models/Applications/Application.php @@ -69,6 +69,10 @@ class Application extends Model { })->get(); } + public function getConclusionAttribute() { + return $this->conclusions()->first(); + } + public function submit(): bool { $res = $this->update(['status' => ApplicationStatus::PROCESSING]); diff --git a/resources/views/mail/applications/status-changed.blade.php b/resources/views/mail/applications/status-changed.blade.php index 3863e25..d7597f6 100644 --- a/resources/views/mail/applications/status-changed.blade.php +++ b/resources/views/mail/applications/status-changed.blade.php @@ -8,5 +8,7 @@

Назначение продукции: {{$application->product->purpose ?? 'не указано'}}

@elseif($status === \App\Models\Applications\ApplicationStatus::COMPLETED)

{{$application->title}} выполнена.

+

Эксперт: {{$application->conclusion->author->name ?? 'не указан'}}

+

Мнение эксперта: {{$application->conclusion->message ?? 'не указано'}}

@endif @endsection \ No newline at end of file