mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Change output of activities for react app
This commit is contained in:
parent
5138dc8092
commit
5d4ee1f586
@ -97,7 +97,8 @@ class ActivityController extends BaseController
|
|||||||
|
|
||||||
$data = $activities->cursor()->map(function ($activity) use($system){
|
$data = $activities->cursor()->map(function ($activity) use($system){
|
||||||
|
|
||||||
$arr['string'] = ctrans('texts.activity_'.$activity->activity_type_id,[
|
$arr=
|
||||||
|
[
|
||||||
'client' => $activity->client ? $activity->client : '',
|
'client' => $activity->client ? $activity->client : '',
|
||||||
'contact' => $activity->contact ? $activity->contact : '',
|
'contact' => $activity->contact ? $activity->contact : '',
|
||||||
'quote' => $activity->quote ? $activity->quote : '',
|
'quote' => $activity->quote ? $activity->quote : '',
|
||||||
@ -108,7 +109,7 @@ class ActivityController extends BaseController
|
|||||||
'payment' => $activity->payment ? $activity->payment : '',
|
'payment' => $activity->payment ? $activity->payment : '',
|
||||||
'credit' => $activity->credit ? $activity->credit : '',
|
'credit' => $activity->credit ? $activity->credit : '',
|
||||||
'task' => $activity->task ? $activity->task : '',
|
'task' => $activity->task ? $activity->task : '',
|
||||||
]);
|
];
|
||||||
|
|
||||||
return array_merge($arr, $activity->toArray());
|
return array_merge($arr, $activity->toArray());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user