DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-03-26 12:29:39 +00:00
parent 7060ffaf34 f450cafe3e
commit 0611ab9b4c
2 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/views/hardware/view.blade.php
View file

@ -983,6 +983,7 @@
</div> <!-- div.col-md-4 --> </div> <!-- div.col-md-4 -->
</div><!-- /row --> </div><!-- /row -->
</div><!-- /.tab-pane asset details --> </div><!-- /.tab-pane asset details -->
</div>
<div class="tab-pane fade" id="software"> <div class="tab-pane fade" id="software">
<div class="row"> <div class="row">

63
resources/views/licenses/view.blade.php
View file

@ -174,23 +174,56 @@
@endif @endif
@if ($license->supplier_id) @if ($license->supplier)
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<strong> <strong>{{ trans('general.supplier') }}</strong>
{{ trans('general.supplier') }} </div>
</strong> <div class="col-md-9">
</div> @can('view', \App\Models\Supplier::class)
<div class="col-md-9"> <a href="{{ route('suppliers.show', $license->supplier->id) }}">
@if ($license->supplier) {{ $license->supplier->name }}
<a href="{{ route('suppliers.show', $license->supplier_id) }}"> </a>
@else
{{ $license->supplier->name }} {{ $license->supplier->name }}
</a> @endcan
@else
{{ trans('general.deleted') }} @if ($license->supplier->url)
@endif <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
</div>
</div> </div>
</div> @else
{{ trans('general.deleted') }}
@endif @endif