From 87a82fb2125a0b9520d5779cee10e4570d557b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Wed, 15 May 2024 14:54:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BE=D0=B4=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0?=
 =?UTF-8?q?=B8=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/employers/messages.blade.php |   11 +++++++----
 resources/views/workers/messages.blade.php   |   21 +++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/resources/views/employers/messages.blade.php b/resources/views/employers/messages.blade.php
index dce9c85..ef385b7 100644
--- a/resources/views/employers/messages.blade.php
+++ b/resources/views/employers/messages.blade.php
@@ -103,10 +103,13 @@
                                                         <use xlink:href="{{ asset('images/sprite.svg#pic') }}"></use>
                                                     </svg>
 
+
                                                     @if ($type_message == 'input')
                                                         @if ($it->user_to->is_worker)
-                                                            @if (isset($it->user_to->workers->phote))
-                                                                <img src="{{ asset(Storage::url($it->user_to->workers->phote)) }}" alt="">
+                                                            @if (isset($it->user_to->workers->photo))
+                                                                <img src="{{ asset(Storage::url($it->user_to->workers->photo)) }}" alt="">
+                                                            @elseif(isset($it->user_to->file))
+                                                                <img src="{{ asset(Storage::url($it->user_to->file)) }}" alt="">
                                                             @else
                                                                 <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                             @endif
@@ -121,8 +124,8 @@
 
                                                     @if ($type_message == 'output')
                                                         @if ($it->user_from->is_worker)
-                                                            @if (isset($it->user_from->workers->phote))
-                                                                <img src="{{ asset(Storage::url($it->user_from->workers->phote)) }}" alt="">
+                                                            @if (isset($it->user_from->workers->photo))
+                                                                <img src="{{ asset(Storage::url($it->user_from->workers->photo)) }}" alt="">
                                                             @else
                                                                 <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                             @endif
diff --git a/resources/views/workers/messages.blade.php b/resources/views/workers/messages.blade.php
index f267a10..7cbaa9d 100644
--- a/resources/views/workers/messages.blade.php
+++ b/resources/views/workers/messages.blade.php
@@ -44,36 +44,37 @@
                                 </div>
                             </div>-->
                         </div>
-
                         @if ($messages->count())
                             @foreach($messages as $it)
                                 <div class="messages__item">
                                     <div class="messages__item-info">
+                                        <!--<pre> print_r(asset(Storage::url($it->user_from->employers[0]->logo))) }}</pre>-->
                                         <div class="messages__item-photo">
                                             <svg>
                                                 <use xlink:href="{{ asset('images/sprite.svg#pic') }}"></use>
                                             </svg>
-
+                                            <!-- Комментарий: обновление структуры вывода картинок, все корректное -->
                                             @if ($type_message == 'input')
-                                                @if ($it->user_to->is_worker)
-                                                    @if (isset($it->user_to->workers->phote))
-                                                        <img src="{{ asset(Storage::url($it->user_to->workers->phote)) }}" alt="">
+                                                @if ($it->user_from->is_worker)
+                                                    @if (isset($it->user_from->workers[0]->photo))
+                                                        <img src="{{ asset(Storage::url($it->user_to->workers[0]->photo)) }}" alt="">
                                                     @else
                                                         <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                     @endif
                                                 @else
-                                                    @if (isset($it->user_to->employers->logo))
-                                                        <img src="{{ asset(Storage::url($it->user_to->employers->logo)) }}" alt="">
+                                                    @if (isset($it->user_from->employers[0]->logo))
+                                                        <img src="{{ asset(Storage::url($it->user_from->employers[0]->logo)) }}" alt="">
                                                     @else
-                                                        <img src="{{ asset('images/default_man.jpg') }}" alt="">
+                                                        <img src=" asset('images/default_man.jpg') }}" alt="">
                                                     @endif
                                                 @endif
                                             @endif
 
+                                            <!-- Обновление исходящих сообщений - фотографии компании и работника -->
                                             @if ($type_message == 'output')
                                                 @if ($it->user_from->is_worker)
-                                                    @if (isset($it->user_from->workers->phote))
-                                                        <img src="{{ asset(Storage::url($it->user_from->workers->phote)) }}" alt="">
+                                                    @if (isset($it->user_from->workers[0]->photo))
+                                                        <img src="{{ asset(Storage::url($it->user_from->workers[0]->photo)) }}" alt="">
                                                     @else
                                                         <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                     @endif
-- 
1.7.10.4