message

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();
     }

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());

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]);
     }
 }

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' => 'Редактирование операции'];

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;
         }

resources/views/mail/feedback/support.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <p>Вам пришло сообщение с обратной связи.</p>
     <p class="mb-10">Email отправителя: {{$data['feedback-email']}}</p>
-    <p class="mb-10">Имя отправителя: {{$data['feedback-name']}}</p>
+    <p class="mb-10">Имя отправителя: {{$typeTitle}}</p>
     <p class="mb-10">Тема сообщения: {{$data['feedback-type']}}</p>
     <p class="mb-10">Сообщение: {{$data['feedback-message']}}</p>
 @endsection