From 5b68a321a6f401d75effd045ada8e97879d734e5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 8 Sep 2020 18:15:45 -0700
Subject: [PATCH 1/3] Added comapny formatter to asset maintenance report -
 fixes [ch15119]

---
 resources/views/reports/asset_maintenances.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index 7f18fefb6d..fb98db7c95 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -35,7 +35,7 @@
                         }'>
                 <thead>
                 <tr>
-                    <th data-field="company" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
+                    <th data-field="company" data-sortable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                     <th data-sortable="false" data-field="asset_name" data-formatter="assetNameLinkFormatter">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
                     <th data-sortable="false" data-field="supplier" data-formatter="suppliersLinkObjFormatter">{{ trans('general.supplier') }}</th>

From b9e19468e5c4c7e2a9f0ec5a09292e48610acd85 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 15 Sep 2020 18:43:19 -0700
Subject: [PATCH 2/3] Bumped version for v4.9.5

---
 config/version.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/version.php b/config/version.php
index 255c65bf17..9ca3050de2 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.9.4',
-  'full_app_version' => 'v4.9.4 - build 4437-g799a93c46',
-  'build_version' => '4437',
+  'app_version' => 'v4.9.5',
+  'full_app_version' => 'v4.9.5 - build 4482-g5b68a321a',
+  'build_version' => '4482',
   'prerelease_version' => '',
-  'hash_version' => 'g799a93c46',
-  'full_hash' => 'v4.9.4-41-g799a93c46',
+  'hash_version' => 'g5b68a321a',
+  'full_hash' => 'v4.9.5-44-g5b68a321a',
   'branch' => 'master',
-);
\ No newline at end of file
+);

From 471e0fd2fc78007a36223ef3691aa35cc0b8f378 Mon Sep 17 00:00:00 2001
From: Blodinger <Bennett.Blodinger@austintexas.gov>
Date: Tue, 22 Sep 2020 14:30:38 -0500
Subject: [PATCH 3/3] Changes the Google Maps window to be a bit more detailed

---
 resources/views/locations/view.blade.php | 2 +-
 resources/views/suppliers/view.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 5f0c28d6e5..341fd89b81 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -151,7 +151,7 @@
 
         @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
           <div class="col-md-12 text-center">
-            <img src="https://maps.googleapis.com/maps/api/staticmap?center={{ urlencode($location->city.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
+            <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
           </div>
         @endif
 
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 72655fbdec..032345abb4 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -222,7 +222,7 @@
 
     @if (($supplier->state!='') && ($supplier->country!='') && (config('services.google.maps_api_key')))
       <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-        <img src="https://maps.googleapis.com/maps/api/staticmap?center={{ urlencode($supplier->city.','.$supplier->city.' '.$supplier->state.' '.$supplier->country.' '.$supplier->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
+        <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($supplier->address.','.$supplier->city.' '.$supplier->state.' '.$supplier->country.' '.$supplier->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
       </div>
     @endif