diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index a4cdceaf2c0c..718aeea3648d 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -182,6 +182,11 @@ class Utils
return static::isNinja() ? NINJA_WEB_URL.'/terms' : NINJA_WEB_URL.'/self-hosting-the-invoice-ninja-platform';
}
+ public static function getPrivacyLink()
+ {
+ return static::isNinja() ? NINJA_WEB_URL.'/terms' : NINJA_WEB_URL.'/self-hosting-the-invoice-ninja-platform';
+ }
+
public static function isOAuthEnabled()
{
$providers = [
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 844781dbc624..c3134cbbe5bf 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -67,6 +67,8 @@ class AccountRepository
$account->currency_id = DEFAULT_CURRENCY;
// Set default language/currency based on IP
+ // TODO Disabled until GDPR implications are understood
+ /*
if (\Cache::get('currencies')) {
if ($data = unserialize(@file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $account->ip))) {
$currencyCode = strtolower($data['geoplugin_currencyCode']);
@@ -94,6 +96,7 @@ class AccountRepository
}
}
}
+ */
$account->save();
diff --git a/bower.json b/bower.json
index f8330738a111..5006740a957f 100644
--- a/bower.json
+++ b/bower.json
@@ -41,7 +41,8 @@
"jt.timepicker": "jquery-timepicker-jt#^1.11.12",
"qrcode.js": "qrcode-js#*",
"money.js": "^0.1.3",
- "grapesjs": "^0.13.8"
+ "grapesjs": "^0.13.8",
+ "cookieconsent": "^3.0.6"
},
"resolutions": {
"jquery": "~1.11"
diff --git a/config/ninja.php b/config/ninja.php
index 7a9b9b3fb0c9..5fb1ffd754e7 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -23,4 +23,7 @@ return [
'exchange_rates_url' => env('EXCHANGE_RATES_URL', 'https://api.fixer.io/latest'),
'exchange_rates_base' => env('EXCHANGE_RATES_BASE', 'EUR'),
+ // privacy policy
+ 'privacy_policy_url' => env('PRIVACY_POLICY_URL', ''),
+
];
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index fed82e77dd0c..ae7c5153b416 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2796,6 +2796,8 @@ $LANG = array(
'send_item_details_help' => 'Send the line item details to the payment gateway.',
'view_proposal' => 'View Proposal',
'view_in_portal' => 'View in Portal',
+ 'cookie_message' => 'This website uses cookies to ensure you get the best experience on our website.',
+ 'got_it' => 'Got it!',
);
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 1e41dd0ca0e5..8ea8a92f8542 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -198,6 +198,31 @@
+
+
+