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

Show company name in client portal dashboard activities

Browse Source
This commit is contained in:
Hillel Coren 2016-05-23 09:02:31 +03:00
parent 6cfee6ec70
commit 86240affab
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PublicClientController.php
View File

@ -323,7 +323,7 @@ class PublicClientController extends BaseController
->addColumn('activity_type_id', function ($model) { ->addColumn('activity_type_id', function ($model) {
$data = [ $data = [
'client' => Utils::getClientDisplayName($model), 'client' => Utils::getClientDisplayName($model),
'user' => $model->is_system ? ('<i>' . trans('texts.system') . '</i>') : ($model->user_first_name . ' ' . $model->user_last_name), 'user' => $model->is_system ? ('<i>' . trans('texts.system') . '</i>') : ($model->account_name),
'invoice' => $model->invoice, 'invoice' => $model->invoice,
'contact' => Utils::getClientDisplayName($model), 'contact' => Utils::getClientDisplayName($model),
'payment' => $model->payment ? ' ' . $model->payment : '', 'payment' => $model->payment ? ' ' . $model->payment : '',

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

@ -91,6 +91,7 @@ class ActivityRepository
'invoices.public_id as invoice_public_id', 'invoices.public_id as invoice_public_id',
'invoices.is_recurring', 'invoices.is_recurring',
'clients.name as client_name', 'clients.name as client_name',
'accounts.name as account_name',
'clients.public_id as client_public_id', 'clients.public_id as client_public_id',
'contacts.id as contact', 'contacts.id as contact',
'contacts.first_name as first_name', 'contacts.first_name as first_name',