Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add option to disable map #1223

Browse Source
This commit is contained in:
Hillel Coren 2016-12-25 09:57:33 +02:00
parent 183592e551
commit 5f39ec1162
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -46,6 +46,7 @@ API_SECRET=password
#GOOGLE_CLIENT_SECRET= #GOOGLE_CLIENT_SECRET=
#GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google #GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google
GOOGLE_MAPS_ENABLED=true
#GOOGLE_MAPS_API_KEY= #GOOGLE_MAPS_API_KEY=
#S3_KEY= #S3_KEY=

8
app/Models/Client.php
View File

@ -379,6 +379,14 @@ class Client extends EntityModel
return ENTITY_CLIENT; return ENTITY_CLIENT;
} }
/**
* @return bool
*/
public function showMap()
{
return $this->hasAddress() && env('GOOGLE_MAPS_ENABLED') !== false;
}
/** /**
* @return bool * @return bool
*/ */

8
app/Models/Vendor.php
View File

@ -267,6 +267,14 @@ class Vendor extends EntityModel
return 'vendor'; return 'vendor';
} }
/**
* @return bool
*/
public function showMap()
{
return $this->hasAddress() && env('GOOGLE_MAPS_ENABLED') !== false;
}
/** /**
* @return bool * @return bool
*/ */

6
resources/views/clients/show.blade.php
View File

@ -6,7 +6,7 @@
<script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script> <script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
<link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/> <link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
@if ($client->hasAddress()) @if ($client->showMap())
<style> <style>
#map { #map {
width: 100%; width: 100%;
@ -186,7 +186,7 @@
</div> </div>
</div> </div>
@if ($client->hasAddress()) @if ($client->showMap())
<div id="map"></div> <div id="map"></div>
<br/> <br/>
@endif @endif
@ -332,7 +332,7 @@
}); });
} }
@if ($client->hasAddress()) @if ($client->showMap())
function initialize() { function initialize() {
var mapCanvas = document.getElementById('map'); var mapCanvas = document.getElementById('map');
var mapOptions = { var mapOptions = {

6
resources/views/vendors/show.blade.php vendored
View File

@ -6,7 +6,7 @@
<script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script> <script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
<link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/> <link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
@if ($vendor->hasAddress()) @if ($vendor->showMap())
<style> <style>
#map { #map {
width: 100%; width: 100%;
@ -167,7 +167,7 @@
</div> </div>
</div> </div>
@if ($vendor->hasAddress()) @if ($vendor->showMap())
<div id="map"></div> <div id="map"></div>
<br/> <br/>
@endif @endif
@ -219,7 +219,7 @@
} }
} }
@if ($vendor->hasAddress()) @if ($vendor->showMap())
function initialize() { function initialize() {
var mapCanvas = document.getElementById('map'); var mapCanvas = document.getElementById('map');
var mapOptions = { var mapOptions = {