From 0d9b6eaf7150629b0323a80867ebda7d72e16332 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 26 Mar 2024 12:18:04 +0000
Subject: [PATCH 1/3] Added supplier details to license view

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 71 +++++++++++++++++++------
 1 file changed, 56 insertions(+), 15 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index b23023f489..8caddd03b9 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -174,23 +174,64 @@
                 @endif
 
 
-                @if ($license->supplier_id)
-                  <div class="row">
-                    <div class="col-md-3">
-                      <strong>
-                        {{ trans('general.supplier') }}
-                      </strong>
-                    </div>
-                    <div class="col-md-9">
-                      @if ($license->supplier)
-                        <a href="{{ route('suppliers.show', $license->supplier_id) }}">
+                @if ($license->supplier)
+                    <div class="row">
+                      <div class="col-md-3">
+                        <strong>{{ trans('general.supplier') }}</strong>
+                      </div>
+                      <div class="col-md-9">
+                        @can('view', \App\Models\Supplier::class)
+                          <a href="{{ route('suppliers.show', $license->supplier->id) }}">
+                            {{ $license->supplier->name }}
+                          </a>
+                        @else
                           {{ $license->supplier->name }}
-                        </a>
-                      @else
-                      {{ trans('general.deleted') }}
-                      @endif
+                        @endcan
+                        
+                          @if ($license->supplier->url)
+                            <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
+                          @endif
+
+                          @if ($license->supplier->phone)
+                            <br><i class="fas fa-phone" aria-hidden="true"></i>
+                            <a href="tel:{{ $license->supplier->phone }}">{{ $license->supplier->phone }}</a>
+                          @endif
+
+                          @if ($license->supplier->email)
+                            <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->supplier->email }}">{{ $license->supplier->email }}</a>
+                          @endif
+
+                          @if ($license->supplier->address)
+                            <br>{{ $license->supplier->address }}
+                          @endif
+                          @if ($license->supplier->address2)
+                            <br>{{ $license->supplier->address2 }}
+                          @endif
+                          @if ($license->supplier->city)
+                            <br>{{ $license->supplier->city }},
+                          @endif
+                          @if ($license->supplier->state)
+                            {{ $license->supplier->state }}
+                          @endif
+                          @if ($license->supplier->country)
+                            {{ $license->supplier->country }}
+                          @endif
+                          @if ($license->supplier->zip)
+                            {{ $license->supplier->zip }}
+                          @endif
+
+
+
+                        @if ($license->supplier->support_phone)
+                          <br><i class="fas fa-phone" aria-hidden="true"></i>
+                          <a href="tel:{{ $license->supplier->support_phone }}">{{ $license->supplier->support_phone }}</a>
+                        @endif
+
+                        @if ($license->supplier->support_email)
+                          <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->supplier->support_email }}">{{ $license->supplier->support_email }}</a>
+                        @endif
+                      </div>
                     </div>
-                  </div>
                 @endif
 
 

From 77dacfcc30e4eb42deb6657f296002b4b6b2046f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 26 Mar 2024 12:19:29 +0000
Subject: [PATCH 2/3] Show if deleted supplier

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 8caddd03b9..62c5ffa67f 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -187,7 +187,7 @@
                         @else
                           {{ $license->supplier->name }}
                         @endcan
-                        
+
                           @if ($license->supplier->url)
                             <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
                           @endif
@@ -232,6 +232,8 @@
                         @endif
                       </div>
                     </div>
+                @else
+                    {{ trans('general.deleted') }}
                 @endif
 
 

From a4e5ae0938dccc87af3c2172f71e97448d73f884 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 26 Mar 2024 12:20:27 +0000
Subject: [PATCH 3/3] Removed duplicates

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 62c5ffa67f..4f47055c27 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -219,17 +219,7 @@
                           @if ($license->supplier->zip)
                             {{ $license->supplier->zip }}
                           @endif
-
-
-
-                        @if ($license->supplier->support_phone)
-                          <br><i class="fas fa-phone" aria-hidden="true"></i>
-                          <a href="tel:{{ $license->supplier->support_phone }}">{{ $license->supplier->support_phone }}</a>
-                        @endif
-
-                        @if ($license->supplier->support_email)
-                          <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->supplier->support_email }}">{{ $license->supplier->support_email }}</a>
-                        @endif
+                        
                       </div>
                     </div>
                 @else