Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 12:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for activity controller

Browse Source
This commit is contained in:
David Bomba 2022-05-29 10:14:12 +10:00
parent e37dd8f1f0
commit 5138dc8092
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/ActivityController.php
View File

@ -97,19 +97,21 @@ class ActivityController extends BaseController
$data = $activities->cursor()->map(function ($activity) use($system){ $data = $activities->cursor()->map(function ($activity) use($system){
return ctrans('texts.activity_'.$activity->activity_type_id,[ $arr['string'] = ctrans('texts.activity_'.$activity->activity_type_id,[
'client' => $activity->client ? $activity->client->present()->name() : $system, 'client' => $activity->client ? $activity->client : '',
'contact' => $activity->contact ? $activity->contact->first_name . " " .$activity->contact->last_name : $system, 'contact' => $activity->contact ? $activity->contact : '',
'quote' => $activity->quote ? $activity->quote->number : $system, 'quote' => $activity->quote ? $activity->quote : '',
'user' => $activity->user ? $activity->user->present()->name() : $system, 'user' => $activity->user ? $activity->user : '',
'expense' => $activity->expense ? $activity->expense->number : $system, 'expense' => $activity->expense ? $activity->expense : '',
'invoice' => $activity->invoice ? $activity->invoice->number : $system, 'invoice' => $activity->invoice ? $activity->invoice : '',
'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice->number : $system, 'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
'payment' => $activity->payment ? $activity->payment->number : $system, 'payment' => $activity->payment ? $activity->payment : '',
'credit' => $activity->credit ? $activity->credit->number : $system, 'credit' => $activity->credit ? $activity->credit : '',
'task' => $activity->task ? $activity->task->number : $system, 'task' => $activity->task ? $activity->task : '',
]); ]);
return array_merge($arr, $activity->toArray());
}); });
return response()->json(['data' => $data->toArray()], 200); return response()->json(['data' => $data->toArray()], 200);