From 5293db2756a4e5be4c101f3285273ad54df891bf Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 25 Apr 2017 11:04:36 +0300
Subject: [PATCH] Add IP lookup to activities table

---
 app/Constants.php                             |  1 +
 app/Ninja/Datatables/ActivityDatatable.php    | 14 +++++++++++++-
 app/Ninja/Repositories/ActivityRepository.php |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Constants.php b/app/Constants.php
index 30637bbbe398..d703cd0b8776 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -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');
 
diff --git a/app/Ninja/Datatables/ActivityDatatable.php b/app/Ninja/Datatables/ActivityDatatable.php
index 8c3785168af0..989d89bcf0fb 100644
--- a/app/Ninja/Datatables/ActivityDatatable.php
+++ b/app/Ninja/Datatables/ActivityDatatable.php
@@ -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;
                 },
             ],
             [
diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php
index 30a68429087f..dc1d87993988 100644
--- a/app/Ninja/Repositories/ActivityRepository.php
+++ b/app/Ninja/Repositories/ActivityRepository.php
@@ -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',