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

Merge pull request #2830 from dicarlosystems/in2816-display-contact-in-activity

Browse Source 
Display contact in activity dashboard and client activity
This commit is contained in:
Hillel Coren 2019-05-19 17:04:52 +03:00 committed by GitHub
commit 9a608bcc65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Activity.php
View File

@ -121,6 +121,7 @@ class Activity extends Eloquent
$user = $this->user; $user = $this->user;
$invoice = $this->invoice; $invoice = $this->invoice;
$contactId = $this->contact_id; $contactId = $this->contact_id;
$contact = $this->contact;
$payment = $this->payment; $payment = $this->payment;
$credit = $this->credit; $credit = $this->credit;
$expense = $this->expense; $expense = $this->expense;
@ -133,7 +134,7 @@ class Activity extends Eloquent
'user' => $isSystem ? '<i>' . trans('texts.system') . '</i>' : e($user->getDisplayName()), 'user' => $isSystem ? '<i>' . trans('texts.system') . '</i>' : e($user->getDisplayName()),
'invoice' => $invoice ? link_to($invoice->getRoute(), $invoice->getDisplayName()) : null, 'invoice' => $invoice ? link_to($invoice->getRoute(), $invoice->getDisplayName()) : null,
'quote' => $invoice ? link_to($invoice->getRoute(), $invoice->getDisplayName()) : null, 'quote' => $invoice ? link_to($invoice->getRoute(), $invoice->getDisplayName()) : null,
'contact' => $contactId ? link_to($client->getRoute(), $client->getDisplayName()) : e($user->getDisplayName()), 'contact' => $contactId ? link_to($client->getRoute(), $contact->getDisplayName()) : e($user->getDisplayName()),
'payment' => $payment ? e($payment->transaction_reference) : null, 'payment' => $payment ? e($payment->transaction_reference) : null,
'payment_amount' => $payment ? $account->formatMoney($payment->amount, $payment) : null, 'payment_amount' => $payment ? $account->formatMoney($payment->amount, $payment) : null,
'adjustment' => $this->adjustment ? $account->formatMoney($this->adjustment, $this) : null, 'adjustment' => $this->adjustment ? $account->formatMoney($this->adjustment, $this) : null,

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

@ -44,7 +44,7 @@ class ActivityDatatable extends EntityDatatable
'user' => $model->is_system ? '<i>' . trans('texts.system') . '</i>' : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), 'user' => $model->is_system ? '<i>' . trans('texts.system') . '</i>' : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email),
'invoice' => $model->invoice ? link_to('/invoices/' . $model->invoice_public_id, $model->is_recurring ? trans('texts.recurring_invoice') : $model->invoice)->toHtml() : null, 'invoice' => $model->invoice ? link_to('/invoices/' . $model->invoice_public_id, $model->is_recurring ? trans('texts.recurring_invoice') : $model->invoice)->toHtml() : null,
'quote' => $model->invoice ? link_to('/quotes/' . $model->invoice_public_id, $model->invoice)->toHtml() : null, 'quote' => $model->invoice ? link_to('/quotes/' . $model->invoice_public_id, $model->invoice)->toHtml() : null,
'contact' => $model->contact_id ? link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model))->toHtml() : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), 'contact' => $model->contact_id ? link_to('/clients/' . $model->client_public_id, Utils::getPersonDisplayName($model->first_name, $model->last_name, $model->email))->toHtml() : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email),
'payment' => $model->payment ? e($model->payment) : '', 'payment' => $model->payment ? e($model->payment) : '',
'credit' => $model->payment_amount ? Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) : '', 'credit' => $model->payment_amount ? Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) : '',
'payment_amount' => $model->payment_amount ? Utils::formatMoney($model->payment_amount, $model->currency_id, $model->country_id) : null, 'payment_amount' => $model->payment_amount ? Utils::formatMoney($model->payment_amount, $model->currency_id, $model->country_id) : null,

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

@ -71,7 +71,7 @@ class ActivityRepository
->join('accounts', 'accounts.id', '=', 'activities.account_id') ->join('accounts', 'accounts.id', '=', 'activities.account_id')
->join('users', 'users.id', '=', 'activities.user_id') ->join('users', 'users.id', '=', 'activities.user_id')
->join('clients', 'clients.id', '=', 'activities.client_id') ->join('clients', 'clients.id', '=', 'activities.client_id')
->leftJoin('contacts', 'contacts.client_id', '=', 'clients.id') ->leftJoin('contacts', 'contacts.id', '=', 'activities.contact_id')
->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id') ->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id')
->leftJoin('payments', 'payments.id', '=', 'activities.payment_id') ->leftJoin('payments', 'payments.id', '=', 'activities.payment_id')
->leftJoin('credits', 'credits.id', '=', 'activities.credit_id') ->leftJoin('credits', 'credits.id', '=', 'activities.credit_id')
@ -79,7 +79,6 @@ class ActivityRepository
->leftJoin('expenses', 'expenses.id', '=', 'activities.expense_id') ->leftJoin('expenses', 'expenses.id', '=', 'activities.expense_id')
->leftJoin('tickets', 'tickets.id', '=', 'activities.ticket_id') ->leftJoin('tickets', 'tickets.id', '=', 'activities.ticket_id')
->where('clients.id', '=', $clientId) ->where('clients.id', '=', $clientId)
->where('contacts.is_primary', '=', 1)
->whereNull('contacts.deleted_at') ->whereNull('contacts.deleted_at')
->select( ->select(
DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'), DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
@ -115,6 +114,7 @@ class ActivityRepository
'expenses.public_notes as expense_public_notes', 'expenses.public_notes as expense_public_notes',
'expenses.public_id as expense_public_id', 'expenses.public_id as expense_public_id',
'tickets.public_id as ticket_public_id' 'tickets.public_id as ticket_public_id'
); )
->orderBy('activities.created_at', 'desc');
} }
} }

2
app/Ninja/Repositories/DashboardRepository.php
View File

@ -345,7 +345,7 @@ class DashboardRepository
$activities = $activities->where('activities.user_id', '=', $userId); $activities = $activities->where('activities.user_id', '=', $userId);
} }
return $activities->orderBy('activities.created_at', 'desc') return $activities->orderBy('activities.created_at', 'desc')->orderBy('activities.id', 'desc')
->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task', 'expense', 'contact') ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task', 'expense', 'contact')
->take(50) ->take(50)
->get(); ->get();

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

@ -756,11 +756,11 @@ $LANG = array(
'activity_3' => ':user deleted client :client', 'activity_3' => ':user deleted client :client',
'activity_4' => ':user created invoice :invoice', 'activity_4' => ':user created invoice :invoice',
'activity_5' => ':user updated invoice :invoice', 'activity_5' => ':user updated invoice :invoice',
'activity_6' => ':user emailed invoice :invoice to :contact', 'activity_6' => ':user emailed invoice :invoice for :client to :contact',
'activity_7' => ':contact viewed invoice :invoice', 'activity_7' => ':contact viewed invoice :invoice for :client',
'activity_8' => ':user archived invoice :invoice', 'activity_8' => ':user archived invoice :invoice',
'activity_9' => ':user deleted invoice :invoice', 'activity_9' => ':user deleted invoice :invoice',
'activity_10' => ':contact entered payment :payment for :invoice', 'activity_10' => ':contact entered payment :payment for :invoice for :client',
'activity_11' => ':user updated payment :payment', 'activity_11' => ':user updated payment :payment',
'activity_12' => ':user archived payment :payment', 'activity_12' => ':user archived payment :payment',
'activity_13' => ':user deleted payment :payment', 'activity_13' => ':user deleted payment :payment',
@ -770,7 +770,7 @@ $LANG = array(
'activity_17' => ':user deleted :credit credit', 'activity_17' => ':user deleted :credit credit',
'activity_18' => ':user created quote :quote', 'activity_18' => ':user created quote :quote',
'activity_19' => ':user updated quote :quote', 'activity_19' => ':user updated quote :quote',
'activity_20' => ':user emailed quote :quote to :contact', 'activity_20' => ':user emailed quote :quote for :client to :contact',
'activity_21' => ':contact viewed quote :quote', 'activity_21' => ':contact viewed quote :quote',
'activity_22' => ':user archived quote :quote', 'activity_22' => ':user archived quote :quote',
'activity_23' => ':user deleted quote :quote', 'activity_23' => ':user deleted quote :quote',
@ -779,7 +779,7 @@ $LANG = array(
'activity_26' => ':user restored client :client', 'activity_26' => ':user restored client :client',
'activity_27' => ':user restored payment :payment', 'activity_27' => ':user restored payment :payment',
'activity_28' => ':user restored :credit credit', 'activity_28' => ':user restored :credit credit',
'activity_29' => ':contact approved quote :quote', 'activity_29' => ':contact approved quote :quote for :client',
'activity_30' => ':user created vendor :vendor', 'activity_30' => ':user created vendor :vendor',
'activity_31' => ':user archived vendor :vendor', 'activity_31' => ':user archived vendor :vendor',
'activity_32' => ':user deleted vendor :vendor', 'activity_32' => ':user deleted vendor :vendor',