From 5d4bbc393ee585e095fe8dcbc80feff09508c4cf Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 20 Jan 2018 00:20:45 -0800
Subject: [PATCH] Fixed #4837 - link phone numbers

---
 app/Presenters/ManufacturerPresenter.php           |  3 ++-
 app/Presenters/UserPresenter.php                   |  1 +
 resources/views/hardware/view.blade.php            | 11 ++++++++---
 resources/views/models/view.blade.php              |  4 +++-
 resources/views/partials/bootstrap-table.blade.php |  8 ++++++++
 resources/views/suppliers/index.blade.php          |  2 +-
 resources/views/suppliers/view.blade.php           |  4 +++-
 resources/views/users/view.blade.php               |  2 +-
 8 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index ecd9d2e250..85a72c1250 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -69,7 +69,8 @@ class ManufacturerPresenter extends Presenter
                 "sortable" => true,
                 "switchable" => true,
                 "title" => trans('admin/manufacturers/table.support_phone'),
-                "visible" => true
+                "visible" => true,
+                "formatter" => "phoneFormatter"
             ],
 
             [
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 3cee47cf29..0d49852263 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -85,6 +85,7 @@ class UserPresenter extends Presenter
                 "switchable" => true,
                 "title" => trans('admin/users/table.phone'),
                 "visible" => true,
+                "formatter"    => "phoneFormatter",
             ],
             [
                 "field" => "address",
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 9e3797f288..f390288587 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -170,7 +170,9 @@
                        @endif
 
                        @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
 
                        @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>
                   @endif
 
-                  @if ((isset($asset->assignedTo->phone)) && ($asset->assignedTo->phone!=''))
-                    <li><i class="fa fa-phone"></i> {{ $asset->assignedTo->phone }}</li>
+                  @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
+                    <li>
+                      <i class="fa fa-phone"></i>
+                      <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
+                    </li>
                   @endif
 
                   @if (isset($asset->location))
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index cf025732ee..66e9053a3c 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -118,7 +118,9 @@
 
                   @if ($model->manufacturer->support_phone)
                       <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>
                   @endif
 
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 300f21c308..c8b4c013e8 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -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) {
         if ((row) && (row!=undefined)) {
             return '<a href="{{ url('/') }}/locations/' + row.id + '"> ' + row.name + '</a>';
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 276a91f023..125b463fda 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -35,7 +35,7 @@
             <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="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="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>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 6d414fbc17..f81e4f144a 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -222,7 +222,9 @@
       <li><i class="fa fa-user"></i> {{ $supplier->contact }}</li>
       @endif
       @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
       @if ($supplier->fax)
       <li><i class="fa fa-print"></i> {{ $supplier->fax }}</li>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 063b20cbff..1996d96c75 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -196,7 +196,7 @@
                   @if ($user->phone)
                   <tr>
                     <td>{{ trans('admin/users/table.phone') }}</td>
-                    <td>{{ $user->phone }}</td>
+                    <td><a href="tel:{{ $user->phone }}">{{ $user->phone }}</a></td>
                   </tr>
                   @endif