DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #8466 from benwa/gmaps-8465

Browse source 
Changes Google Map to be a bit more detailed
This commit is contained in:
snipe 2020-09-22 17:59:45 -07:00 committed by GitHub
parent 4bd140c324 83dfa2a28c
commit ba70e07637
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/version.php
View file

@ -1,5 +1,6 @@
<?php
return array (
'app_version' => 'v5.0.0-beta-4',
'full_app_version' => 'v5.0.0-beta-4 - build 4482-g5b68a321a',
'build_version' => '4482',
@ -7,4 +8,4 @@ return array (
'hash_version' => 'g5b68a321a',
'full_hash' => 'v5.0.0-beta-4-44-g5b68a321a',
'branch' => 'develop',
);
);

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

@ -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

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

@ -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