diff --git a/app/Http/Controllers/Api/Publications/PublicationsController.php b/app/Http/Controllers/Api/Publications/PublicationsController.php index cddc7f3..b0fb4fe 100644 --- a/app/Http/Controllers/Api/Publications/PublicationsController.php +++ b/app/Http/Controllers/Api/Publications/PublicationsController.php @@ -29,6 +29,10 @@ class PublicationsController extends Controller { $user = Auth::user(); if (!($user->isAdmin ?? null)) $query->where(['is_published' => true]); if ($page = Page::byUuid($request->get('page_id'))->first()) $query->where(['page_id' => $page->id]); + +// if ($page = Page::query()->where(['sub_type' => $request->get('sub_type')])->first()) { +// $query->where('page_id', $page->id); +// } $paginator = $query->paginate(config('app.pagination_limit')); return fractal($paginator, new PublicationTransformer())->respond(); } diff --git a/app/Listeners/SendFeedbackMessage.php b/app/Listeners/SendFeedbackMessage.php index bf5f6e3..db02dc2 100644 --- a/app/Listeners/SendFeedbackMessage.php +++ b/app/Listeners/SendFeedbackMessage.php @@ -11,7 +11,6 @@ class SendFeedbackMessage { public function handle(object $event) { try { - mail('sergey@bodin.ru', 'No error', 'No error'); Mail::to($event->email)->send(new FeedbackSender($event->data)); } catch (\Exception $exception) { mail('sergey@bodin.ru', 'Error', $exception->getMessage()); diff --git a/app/Mail/FeedbackSender.php b/app/Mail/FeedbackSender.php index ccbdca1..1743d6c 100644 --- a/app/Mail/FeedbackSender.php +++ b/app/Mail/FeedbackSender.php @@ -2,6 +2,7 @@ namespace App\Mail; +use App\Models\Dictionaries\DictionaryItem; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -17,6 +18,7 @@ class FeedbackSender extends Mailable implements ShouldQueue { } public function build() { - return $this->subject('Сообщение из обратной связи')->view('mail.feedback.support'); + $typeTitle = DictionaryItem::byUuid($this->data['feedback-type'])->pluck('title'); + return $this->subject('Сообщение из обратной связи')->view('mail.feedback.support',['typeTitle' => $typeTitle]); } } diff --git a/app/Services/Forms/Feedback/FeedbackForms.php b/app/Services/Forms/Feedback/FeedbackForms.php index 4e9bf54..fa8bb97 100644 --- a/app/Services/Forms/Feedback/FeedbackForms.php +++ b/app/Services/Forms/Feedback/FeedbackForms.php @@ -3,22 +3,8 @@ namespace App\Services\Forms\Feedback; use App\Events\FeedbackSender; -use App\Models\Asset; -use App\Models\Dictionaries\Dictionary; -use App\Models\Objects\FieldType; use App\Models\Objects\NirObject; -use App\Models\Objects\ObjectType; -use App\Models\Registries\Entry; -use App\Models\Registries\Operation; -use App\Models\Registries\OperationType; use App\Services\Forms\FormsService; -use App\Transformers\Assets\AssetTransformer; -use App\Transformers\Dictionaries\DictionaryItemTransformer; -use App\Transformers\Objects\FieldTransformer; -use App\Transformers\Objects\ObjectPropertyTransformer; -use App\Transformers\Objects\ObjectTransformer; -use App\Transformers\Registries\OperationTransformer; -use Illuminate\Http\JsonResponse; class FeedbackForms extends FormsService { public array $formTitles = ['create' => 'Создание операции', 'update' => 'Редактирование операции']; diff --git a/app/Services/Forms/Publications/PublicationSmiForms.php b/app/Services/Forms/Publications/PublicationSmiForms.php index 4eb7ac2..5e66020 100644 --- a/app/Services/Forms/Publications/PublicationSmiForms.php +++ b/app/Services/Forms/Publications/PublicationSmiForms.php @@ -49,6 +49,7 @@ class PublicationSmiForms 'name' => 'poster_id', 'title' => 'Превью', 'type' => FieldType::IMAGE, + 'required' => true, 'value' => ($model->poster ?? null) ? fractal($model->poster, new AssetTransformer()) : null ], [ @@ -79,7 +80,9 @@ class PublicationSmiForms $pub['type'] = PublicationType::SMI; $pub['name'] = $data['name']; $pub['excerpt'] = $data['excerpt']; - if (!empty($data['poster_id'])) { + if (empty($data['poster_id'])) { + $pub['poster_id'] = null; + } else { $asset = Asset::query()->where(['uuid' => $data['poster_id']])->first(); $pub['poster_id'] = $asset->id; } @@ -110,7 +113,9 @@ class PublicationSmiForms if (!empty($data['excerpt'])) { $pub['excerpt'] = $data['excerpt']; } - if (!empty($data['poster_id'])) { + if (empty($data['poster_id'])) { + $pub['poster_id'] = null; + } else { $asset = Asset::query()->where(['uuid' => $data['poster_id']])->first(); $pub['poster_id'] = $asset->id; } diff --git a/resources/views/mail/feedback/support.blade.php b/resources/views/mail/feedback/support.blade.php index fa0e900..89c1e0f 100644 --- a/resources/views/mail/feedback/support.blade.php +++ b/resources/views/mail/feedback/support.blade.php @@ -3,7 +3,7 @@ @section('content')

Вам пришло сообщение с обратной связи.

Email отправителя: {{$data['feedback-email']}}

-

Имя отправителя: {{$data['feedback-name']}}

+

Имя отправителя: {{$typeTitle}}

Тема сообщения: {{$data['feedback-type']}}

Сообщение: {{$data['feedback-message']}}

@endsection \ No newline at end of file