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 IP lookup to activities table

Browse Source
This commit is contained in:
Hillel Coren 2017-04-25 11:04:36 +03:00
parent ed82cdfd24
commit 5293db2756
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Constants.php
View File

@ -321,6 +321,7 @@ if (! defined('APP_NAME')) {
define('OFX_HOME_URL', env('OFX_HOME_URL', 'http://www.ofxhome.com/index.php/home/directory/all'));
define('GOOGLE_ANALYITCS_URL', env('GOOGLE_ANALYITCS_URL', 'https://www.google-analytics.com/collect'));
define('TRANSIFEX_URL', env('TRANSIFEX_URL', 'https://www.transifex.com/invoice-ninja/invoice-ninja'));
define('IP_LOOKUP_URL', env('IP_LOOKUP_URL', 'http://whatismyipaddress.com/ip/'));
define('CHROME_PDF_HELP_URL', 'https://support.google.com/chrome/answer/6213030?hl=en');
define('FIREFOX_PDF_HELP_URL', 'https://support.mozilla.org/en-US/kb/view-pdf-files-firefox');

14
app/Ninja/Datatables/ActivityDatatable.php
View File

@ -14,7 +14,19 @@ class ActivityDatatable extends EntityDatatable
[
'activities.id',
function ($model) {
return Utils::timestampToDateTimeString(strtotime($model->created_at));
$str = Utils::timestampToDateTimeString(strtotime($model->created_at));
if ($model->is_system && in_array($model->activity_type_id, [
ACTIVITY_TYPE_VIEW_INVOICE,
ACTIVITY_TYPE_VIEW_QUOTE,
ACTIVITY_TYPE_CREATE_PAYMENT,
ACTIVITY_TYPE_APPROVE_QUOTE,
])) {
$ipLookUpLink = IP_LOOKUP_URL . $model->ip;
$str .= sprintf(' &nbsp; <i class="fa fa-globe" style="cursor:pointer" title="%s" onclick="openUrl(\'%s\', \'IP Lookup\')"></i>', $model->ip, $ipLookUpLink);
}
return $str;
},
],
[

1
app/Ninja/Repositories/ActivityRepository.php
View File

@ -91,6 +91,7 @@ class ActivityRepository
'activities.adjustment',
'activities.notes',
'activities.ip',
'activities.is_system',
'users.first_name as user_first_name',
'users.last_name as user_last_name',
'users.email as user_email',