From b504585f88d550163814844547192e5dac4d7b80 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 19:42:16 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20-=20=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B3=20=D1=81=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=BC=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0?=
 =?UTF-8?q?=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/employers/messages.blade.php |   28 +++++++++-------
 resources/views/workers/messages.blade.php   |   44 +++++++++++++++-----------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/resources/views/employers/messages.blade.php b/resources/views/employers/messages.blade.php
index fdafc89..1bfb81b 100644
--- a/resources/views/employers/messages.blade.php
+++ b/resources/views/employers/messages.blade.php
@@ -102,9 +102,8 @@
                                                     <svg>
                                                         <use xlink:href="{{ asset('images/sprite.svg#pic') }}"></use>
                                                     </svg>
-
-
                                                     @if ($type_message == 'input')
+                                                       @if (isset($it->user_from->is_worker))
                                                         @if ($it->user_from->is_worker)
                                                             @if (isset($it->user_from->workers[0]->photo))
                                                                 <img src="{{ asset(Storage::url($it->user_from->workers[0]->photo)) }}" alt="">
@@ -118,21 +117,28 @@
                                                                 <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                             @endif
                                                         @endif
+                                                       @else
+                                                            <img src="{{ asset('images/default_man.jpg') }}" alt="">
+                                                       @endif
                                                     @endif
 
                                                     @if ($type_message == 'output')
-                                                        @if ($it->user_from->is_worker)
-                                                            @if (isset($it->user_from->workers[0]->photo))
-                                                                <img src="{{ asset(Storage::url($it->user_from->workers[0]->photo)) }}" alt="">
+                                                        @if (isset($it->user_from->is_worker))
+                                                            @if ($it->user_from->is_worker)
+                                                                @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
                                                             @else
-                                                                <img src="{{ asset('images/default_man.jpg') }}" 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="">
+                                                                @endif
                                                             @endif
                                                         @else
-                                                            @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="">
-                                                            @endif
+                                                            <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                         @endif
                                                     @endif
                                                 </div>
diff --git a/resources/views/workers/messages.blade.php b/resources/views/workers/messages.blade.php
index 6b8a4d9..f08f282 100644
--- a/resources/views/workers/messages.blade.php
+++ b/resources/views/workers/messages.blade.php
@@ -55,36 +55,44 @@
                                             </svg>
                                             <!-- Комментарий: обновление структуры вывода картинок, все корректное -->
                                             @if ($type_message == 'input')
-                                                @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="">
+                                               @if (isset($it->user_from->is_worker))
+                                                    @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
-                                                        <img src="{{ asset('images/default_man.jpg') }}" 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="">
+                                                        @endif
                                                     @endif
                                                 @else
-                                                    @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="">
-                                                    @endif
+                                                    <img src=" asset('images/default_man.jpg') }}" alt="">
                                                 @endif
                                             @endif
 
                                             <!-- Обновление исходящих сообщений - фотографии компании и работника -->
                                             <!-- коммит 2 -->
                                             @if ($type_message == 'output')
-                                                @if ($it->user_from->is_worker)
-                                                    @if (isset($it->user_from->workers[0]->photo))
-                                                        <img src="{{ asset(Storage::url($it->user_from->workers[0]->photo)) }}" alt="">
+                                                @if (isset($it->user_from->is_worker))
+                                                    @if ($it->user_from->is_worker)
+                                                        @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
                                                     @else
-                                                        <img src="{{ asset('images/default_man.jpg') }}" alt="">
+                                                        @if (isset($it->user_from->employers->logo))
+                                                            <img src="{{ asset(Storage::url($it->user_from->employers->logo)) }}" alt="">
+                                                        @else
+                                                            <img src="{{ asset('images/default_man.jpg') }}" alt="">
+                                                        @endif
                                                     @endif
                                                 @else
-                                                    @if (isset($it->user_from->employers->logo))
-                                                        <img src="{{ asset(Storage::url($it->user_from->employers->logo)) }}" alt="">
-                                                    @else
-                                                        <img src="{{ asset('images/default_man.jpg') }}" alt="">
-                                                    @endif
+                                                    <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                 @endif
                                             @endif
                                         </div>
-- 
1.7.10.4