Skip to content

Commit 9c4cd69

Browse files
snipesnipe
committed
Updated checkout blades
1 parent 64cbe0c commit 9c4cd69

File tree

11 files changed

+152
-96
lines changed

11 files changed

+152
-96
lines changed

‎resources/views/accessories/checkout.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<div class="form-group">
4545
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
4646
<div class="col-md-6">
47-
<p class="form-control-static">{{ $accessory->company->name }}</p>
47+
<p class="form-control-static">{!! $accessory->company->present()->formattedNameLink !!}</p>
4848
</div>
4949
</div>
5050
@endif
@@ -53,9 +53,9 @@
5353
@if ($accessory->category)
5454
<!-- accessory name -->
5555
<div class="form-group">
56-
<label class="col-sm-3 control-label">{{ trans('admin/accessories/general.accessory_category') }}</label>
56+
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
5757
<div class="col-md-6">
58-
<p class="form-control-static">{{ $accessory->category->name }}</p>
58+
<p class="form-control-static">{!! $accessory->category->present()->formattedNameLink !!}</p>
5959
</div>
6060
</div>
6161
@endif

‎resources/views/account/view-assets.blade.php‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
{{ trans('general.company') }}
220220
</div>
221221
<div class="col-md-9">
222-
{{ $user->company->name }}
222+
{!! $user->company->present()->formattedNameLink !!}
223223
</div>
224224

225225
</div>
@@ -383,7 +383,7 @@
383383
{{ trans('general.department') }}
384384
</div>
385385
<div class="col-md-9">
386-
{{ $user->department->name }}
386+
{!! $user->department->present()->formattedNameLink !!}
387387
</div>
388388
</div>
389389
@endif
@@ -504,7 +504,7 @@ class="table table-striped snipe-table"
504504
</td>
505505
<td>
506506
@if (($asset->model) && ($asset->model->category))
507-
{{ $asset->model->category->name }}
507+
{!! $asset->model->category->present()->formattedNameLink !!}
508508
@endif
509509
</td>
510510
<td>
@@ -519,7 +519,7 @@ class="table table-striped snipe-table"
519519
<label class="label label-default">{{ trans('general.deployed') }}</label>
520520
</td>
521521
<td>
522-
{{ $asset->model->name }}
522+
{!! ($asset->model) ? $asset->model->present()->formattedNameLink : trans('general.deleted') !!}
523523
</td>
524524
<td>
525525
{{ $asset->model->model_number }}
@@ -531,7 +531,7 @@ class="table table-striped snipe-table"
531531
{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
532532
</td>
533533
<td>
534-
{{ ($asset->location) ? $asset->location->name : '' }}
534+
{!! ($asset->defaultLoc) ? $asset->defaultLoc->present()->formattedNameLink : trans('general.deleted') !!}
535535
</td>
536536
<td>
537537
{{ ($asset->expected_checkin) ? $asset->expected_checkin_formatted_date : '' }}
@@ -568,6 +568,8 @@ class="table table-striped snipe-table"
568568
</tbody>
569569
</table>
570570
</div><!-- /asset -->
571+
572+
571573
<div class="tab-pane" id="licenses">
572574

573575
<table
@@ -595,7 +597,6 @@ class="table table-striped snipe-table"
595597
<th class="col-md-2">{{ trans('admin/licenses/form.to_name') }}</th>
596598
<th class="col-md-2">{{ trans('admin/licenses/form.to_email') }}</th>
597599
<th class="col-md-2">{{ trans('general.category') }}</th>
598-
599600
</tr>
600601
</thead>
601602
<tbody>
@@ -607,7 +608,6 @@ class="table table-striped snipe-table"
607608
<td>
608609
@can('viewKeys', $license)
609610
<code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $license->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $license->id }}">{{ $license->serial }}</span></span></code>
610-
611611
@else
612612
------------
613613
@endcan
@@ -619,12 +619,15 @@ class="table table-striped snipe-table"
619619
------------
620620
@endcan
621621
</td>
622-
@can('viewKeys', $license)
623-
<td>{{$license->license_email}}</td>
624-
@else
625-
------------
626-
@endcan
627-
<td>{{ ($license->category) ? $license->category->name : trans('general.deleted') }}</td>
622+
<td>
623+
@can('viewKeys', $license)
624+
{{$license->license_email}}
625+
@else
626+
------------
627+
@endcan
628+
</td>
629+
630+
<td>{!! ($license->category) ? $license->category->present()->formattedNameLink : trans('general.deleted') !!}</td>
628631
</tr>
629632
@endforeach
630633
</tbody>

‎resources/views/components/checkout.blade.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,28 @@
2525
@endif
2626

2727
<div class="box-body">
28+
29+
@if ($component->company)
30+
<!-- accessory name -->
31+
<div class="form-group">
32+
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
33+
<div class="col-md-6">
34+
<p class="form-control-static">{!! $component->company->present()->formattedNameLink !!}</p>
35+
</div>
36+
</div>
37+
@endif
38+
39+
40+
@if ($component->category)
41+
<!-- accessory name -->
42+
<div class="form-group">
43+
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
44+
<div class="col-md-6">
45+
<p class="form-control-static">{!! $component->category->present()->formattedNameLink !!}</p>
46+
</div>
47+
</div>
48+
@endif
49+
2850
<!-- Asset -->
2951
@include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id', 'company_id' => $component->company_id, 'required' => 'true', 'value' => old('asset_id')])
3052

‎resources/views/consumables/checkout.blade.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,29 @@
3636
</div>
3737
</div>
3838
@endif
39+
40+
@if ($consumable->company)
41+
<!-- accessory name -->
42+
<div class="form-group">
43+
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
44+
<div class="col-md-6">
45+
<p class="form-control-static">{!! $consumable->company->present()->formattedNameLink !!}</p>
46+
</div>
47+
</div>
48+
@endif
49+
50+
3951
@if ($consumable->category)
40-
<!-- consumable name -->
52+
<!-- category name -->
4153
<div class="form-group">
4254
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
4355
<div class="col-md-6">
44-
<p class="form-control-static">{{ $consumable->category->name }}</p>
56+
<p class="form-control-static">{!! $consumable->category->present()->formattedNameLink !!}</p>
4557
</div>
4658
</div>
4759
@endif
4860

61+
4962
<!-- total -->
5063
<div class="form-group">
5164
<label class="col-sm-3 control-label">{{ trans('admin/components/general.total') }}</label>

‎resources/views/consumables/view.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
{{ trans('general.company') }}
173173
</div>
174174
<div class="col-md-9">
175-
{{ $consumable->company->name }}
175+
{!! $consumable->company->present()->formattedNameLink !!}
176176
</div>
177177
</div>
178178
@endif
@@ -184,7 +184,7 @@
184184
{{ trans('general.category') }}
185185
</div>
186186
<div class="col-md-9">
187-
{{ $consumable->category->name }}
187+
{!! $consumable->category->present()->formattedNameLink !!}
188188
</div>
189189
</div>
190190
@endif
@@ -240,7 +240,7 @@
240240
{{ trans('general.location') }}
241241
</div>
242242
<div class="col-md-9">
243-
{{ $consumable->location->name }}
243+
{!! $consumable->location->present()->formattedNameLink !!}
244244
</div>
245245
</div>
246246
@endif
@@ -252,7 +252,7 @@
252252
{{ trans('general.supplier') }}
253253
</div>
254254
<div class="col-md-9">
255-
{{ $consumable->supplier->name }}
255+
{!! $consumable->supplier->present()->formattedNameLink !!}
256256
</div>
257257
</div>
258258
@endif
@@ -264,7 +264,7 @@
264264
{{ trans('general.manufacturer') }}
265265
</div>
266266
<div class="col-md-9">
267-
{{ $consumable->manufacturer->name }}
267+
{!! $consumable->manufacturer->present()->formattedNameLink !!}
268268
</div>
269269
</div>
270270
@endif

‎resources/views/hardware/checkin.blade.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
@endif
4242
{{csrf_field()}}
4343

44+
@if ($asset->company)
45+
<!-- accessory name -->
46+
<div class="form-group">
47+
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
48+
<div class="col-md-6">
49+
<p class="form-control-static">{!! $asset->company->present()->formattedNameLink !!}</p>
50+
</div>
51+
</div>
52+
@endif
53+
54+
55+
@if ($asset->model->category)
56+
<!-- category name -->
57+
<div class="form-group">
58+
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
59+
<div class="col-md-6">
60+
<p class="form-control-static">{!! $asset->model->category->present()->formattedNameLink !!}</p>
61+
</div>
62+
</div>
63+
@endif
64+
4465
<!-- AssetModel name -->
4566
<div class="form-group">
4667
<label for="model" class="col-sm-3 control-label">

‎resources/views/hardware/checkout.blade.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,23 @@
2626
</div>
2727
<div class="box-body">
2828
{{csrf_field()}}
29-
@if ($asset->company && $asset->company->name)
29+
@if ($asset->company)
30+
<!-- accessory name -->
3031
<div class="form-group">
31-
<label for="company" class="col-md-3 control-label">
32-
{{ trans('general.company') }}
33-
</label>
34-
<div class="col-md-8">
35-
<p class="form-control-static" style="padding-top: 7px;">
36-
{{ $asset->company->name }}
37-
</p>
32+
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
33+
<div class="col-md-6">
34+
<p class="form-control-static">{!! $asset->company->present()->formattedNameLink !!}</p>
35+
</div>
36+
</div>
37+
@endif
38+
39+
40+
@if ($asset->model->category)
41+
<!-- category name -->
42+
<div class="form-group">
43+
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
44+
<div class="col-md-6">
45+
<p class="form-control-static">{!! $asset->model->category->present()->formattedNameLink !!}</p>
3846
</div>
3947
</div>
4048
@endif

0 commit comments

Comments
 (0)