Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00
Code Issues Releases Activity

Use queues in send reminders command

Browse Source
This commit is contained in:
Hillel Coren 2018-03-28 22:11:35 +03:00
parent a439da5b0c
commit 25feebd6c2
7 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Libraries/Utils.php
View File

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

3
app/Ninja/Repositories/AccountRepository.php
View File

@ -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();

3
bower.json
View File

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

3
config/ninja.php
View File

@ -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', ''),
];

2
resources/lang/en/texts.php
View File

@ -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!',
);

27
resources/views/master.blade.php
View File

@ -198,6 +198,31 @@
</script>
<link rel="stylesheet" type="text/css" href="{{ asset('css/cookieconsent.min.css') }}"/>
<script src="{{ asset('js/cookieconsent.min.js') }}"></script>
<script>
window.addEventListener("load", function(){
window.cookieconsent.initialise({
"palette": {
"popup": {
"background": "#000"
},
"button": {
"background": "#f1d600"
},
},
"cookie": {
"domain": "{{ config('session.domain') }}"
},
"content": {
"href": "{{ Utils::isNinja() ? Utils::getPrivacyLink() : (config('ninja.privacy_policy_url') ?: 'https://cookiesandyou.com/' ) }}",
"message": {!! json_encode(trans('texts.cookie_message')) !!},
"dismiss": {!! json_encode(trans('texts.got_it')) !!},
"link": {!! json_encode(trans('texts.learn_more')) !!},
}
})}
);
</script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@ -231,6 +256,8 @@
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}', 'auto');
ga('set', 'anonymizeIp', true);
@if (request()->invitation_key || request()->proposal_invitation_key || request()->contact_key)
ga('send', 'pageview', { 'page': '/client/portal' });
@else

2
resources/views/partials/accept_terms.blade.php
View File

@ -15,7 +15,7 @@
<div class="panel-body">
{!! Former::checkbox('accepted_terms')->text(trans('texts.agree_to_terms', [
'terms' => link_to(Utils::getTermsLink(), trans('texts.terms_of_service'), ['target' => '_blank']),
'privacy' => link_to(Utils::getTermsLink(), trans('texts.privacy_policy'), ['target' => '_blank']),
'privacy' => link_to(Utils::getPrivacyLink(), trans('texts.privacy_policy'), ['target' => '_blank']),
]))->raw()->value(1) !!}
</div>
</div>