From 5d4ee1f586a64b54664df8863c323f3821d85241 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 29 May 2022 11:24:23 +1000 Subject: [PATCH] Change output of activities for react app --- app/Http/Controllers/ActivityController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index b726715d7be4..e216355c9d14 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -97,7 +97,8 @@ class ActivityController extends BaseController $data = $activities->cursor()->map(function ($activity) use($system){ - $arr['string'] = ctrans('texts.activity_'.$activity->activity_type_id,[ + $arr= + [ 'client' => $activity->client ? $activity->client : '', 'contact' => $activity->contact ? $activity->contact : '', 'quote' => $activity->quote ? $activity->quote : '', @@ -108,7 +109,7 @@ class ActivityController extends BaseController 'payment' => $activity->payment ? $activity->payment : '', 'credit' => $activity->credit ? $activity->credit : '', 'task' => $activity->task ? $activity->task : '', - ]); + ]; return array_merge($arr, $activity->toArray());