Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-28 16:19:22 +03:00
parent 954a7a8fd4
commit 638f248782
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/ninja.php
View File

@ -3,7 +3,7 @@
return [ return [
// Marketing links // Marketing links
'time_tracker' => env('TIME_TRACKER_URL', 'https://www.invoiceninja.com'), 'time_tracker_web_url' => env('TIME_TRACKER_WEB_URL'),
// Hosted plan coupons // Hosted plan coupons
'coupon_50_off' => env('COUPON_50_OFF', false), 'coupon_50_off' => env('COUPON_50_OFF', false),

8
resources/views/tasks/time_tracker.blade.php
View File

@ -507,11 +507,11 @@
toastr.options.positionClass = 'toast-bottom-right'; toastr.options.positionClass = 'toast-bottom-right';
if (navigator.userAgent != 'Time Tracker') { if (navigator.userAgent != 'Time Tracker') {
var link = '{{ config('ninja.time_tracker') }}'; var link = '{{ config('ninja.time_tracker_web_url') }}';
var message = "{{ trans('texts.download_desktop_app') }}"; var message = "{{ trans('texts.download_desktop_app') }}";
if (isMobile) { if (isMobile) {
toastr.warning("{{ trans('texts.time_tracker_mobile_help')}}", false, { toastr.warning("{{ trans('texts.time_tracker_mobile_help')}}", false, {
timeOut: 10000, timeOut: 5000,
closeButton: true, closeButton: true,
}); });
if (isIPhone) { if (isIPhone) {
@ -522,8 +522,9 @@
message = "{{ trans('texts.download_android_app') }}"; message = "{{ trans('texts.download_android_app') }}";
} }
} }
if (link) {
var options = { var options = {
timeOut: 10000, timeOut: 5000,
closeButton: true, closeButton: true,
onclick: function() { onclick: function() {
window.open(link, '_blank'); window.open(link, '_blank');
@ -531,6 +532,7 @@
}; };
toastr.info(message, false, options); toastr.info(message, false, options);
} }
}
if (model.isDesktop()) { if (model.isDesktop()) {
sendKeepAlive(); sendKeepAlive();