DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 00:37:39 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-01-20 00:21:03 -08:00
parent 984275ff05 5d4bbc393e
commit 4ca8272efc
8 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Presenters/ManufacturerPresenter.php
View file

@ -69,7 +69,8 @@ class ManufacturerPresenter extends Presenter
"sortable" => true, "sortable" => true,
"switchable" => true, "switchable" => true,
"title" => trans('admin/manufacturers/table.support_phone'), "title" => trans('admin/manufacturers/table.support_phone'),
"visible" => true "visible" => true,
"formatter" => "phoneFormatter"
], ],
[ [

1
app/Presenters/UserPresenter.php
View file

@ -85,6 +85,7 @@ class UserPresenter extends Presenter
"switchable" => true, "switchable" => true,
"title" => trans('admin/users/table.phone'), "title" => trans('admin/users/table.phone'),
"visible" => true, "visible" => true,
"formatter" => "phoneFormatter",
], ],
[ [
"field" => "address", "field" => "address",

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

@ -170,7 +170,9 @@
@endif @endif
@if ($asset->model->manufacturer->support_phone) @if ($asset->model->manufacturer->support_phone)
<li><i class="fa fa-phone"></i> {{ $asset->model->manufacturer->support_phone }}</li> <li><i class="fa fa-phone"></i>
<a href="tel:{{ $asset->model->manufacturer->support_phone }}">{{ $asset->model->manufacturer->support_phone }}</a>
</li>
@endif @endif
@if ($asset->model->manufacturer->support_email) @if ($asset->model->manufacturer->support_email)
@ -467,8 +469,11 @@
<li><i class="fa fa-envelope-o"></i> <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a></li> <li><i class="fa fa-envelope-o"></i> <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a></li>
@endif @endif
@if ((isset($asset->assignedTo->phone)) && ($asset->assignedTo->phone!='')) @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
<li><i class="fa fa-phone"></i> {{ $asset->assignedTo->phone }}</li> <li>
<i class="fa fa-phone"></i>
<a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
</li>
@endif @endif
@if (isset($asset->location)) @if (isset($asset->location))

4
resources/views/models/view.blade.php
View file

@ -118,7 +118,9 @@
@if ($model->manufacturer->support_phone) @if ($model->manufacturer->support_phone)
<li> <li>
<i class="fa fa-phone"></i> {{ $model->manufacturer->support_phone }} <i class="fa fa-phone"></i>
<a href="tel:{{ $model->manufacturer->support_phone }}">{{ $model->manufacturer->support_phone }}</a>
</li> </li>
@endif @endif

8
resources/views/partials/bootstrap-table.blade.php
View file

@ -425,6 +425,14 @@
} }
// Create a linked phone number in the table list
function phoneFormatter(value) {
if (value) {
return '<a href="tel:' + value + '">' + value + '</a>';
}
}
function deployedLocationFormatter(row, value) { function deployedLocationFormatter(row, value) {
if ((row) && (row!=undefined)) { if ((row) && (row!=undefined)) {
return '<a href="{{ url('/') }}/locations/' + row.id + '"> ' + row.name + '</a>'; return '<a href="{{ url('/') }}/locations/' + row.id + '"> ' + row.name + '</a>';

2
resources/views/suppliers/index.blade.php
View file

@ -35,7 +35,7 @@
<th data-sortable="true" data-field="address">{{ trans('admin/suppliers/table.address') }}</th> <th data-sortable="true" data-field="address">{{ trans('admin/suppliers/table.address') }}</th>
<th data-searchable="true" data-sortable="true" data-field="contact">{{ trans('admin/suppliers/table.contact') }}</th> <th data-searchable="true" data-sortable="true" data-field="contact">{{ trans('admin/suppliers/table.contact') }}</th>
<th data-searchable="true" data-sortable="true" data-field="email" data-formatter="emailFormatter">{{ trans('admin/suppliers/table.email') }}</th> <th data-searchable="true" data-sortable="true" data-field="email" data-formatter="emailFormatter">{{ trans('admin/suppliers/table.email') }}</th>
<th data-searchable="true" data-sortable="true" data-field="phone">{{ trans('admin/suppliers/table.phone') }}</th> <th data-searchable="true" data-sortable="true" data-field="phone" data-formatter="phoneFormatter">{{ trans('admin/suppliers/table.phone') }}</th>
<th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th> <th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
<th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th> <th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th>
<th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th> <th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th>

4
resources/views/suppliers/view.blade.php
View file

@ -222,7 +222,9 @@
<li><i class="fa fa-user"></i> {{ $supplier->contact }}</li> <li><i class="fa fa-user"></i> {{ $supplier->contact }}</li>
@endif @endif
@if ($supplier->phone) @if ($supplier->phone)
<li><i class="fa fa-phone"></i> {{ $supplier->phone }}</li> <li><i class="fa fa-phone"></i>
<a href="tel:{{ $supplier->phone }}">{{ $supplier->phone }}</a>
</li>
@endif @endif
@if ($supplier->fax) @if ($supplier->fax)
<li><i class="fa fa-print"></i> {{ $supplier->fax }}</li> <li><i class="fa fa-print"></i> {{ $supplier->fax }}</li>

2
resources/views/users/view.blade.php
View file

@ -196,7 +196,7 @@
@if ($user->phone) @if ($user->phone)
<tr> <tr>
<td>{{ trans('admin/users/table.phone') }}</td> <td>{{ trans('admin/users/table.phone') }}</td>
<td>{{ $user->phone }}</td> <td><a href="tel:{{ $user->phone }}">{{ $user->phone }}</a></td>
</tr> </tr>
@endif @endif