From e37dd8f1f04945ace0bd6139389537949611b305 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 29 May 2022 09:33:08 +1000
Subject: [PATCH 1/3] Fixes for building release

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ec420bb4388a..5aa905c5bfd7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,7 +50,8 @@ jobs:
           cp -r dist/react/* ../public/react
           cd ..
           rm -rf ui
-
+          php artisan ninja:react
+          
       - name: Prepare JS/CSS assets
         run: |
           npm i

From 5138dc80927c555e58cbca4491f04a62444075c8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 29 May 2022 10:14:12 +1000
Subject: [PATCH 2/3] Fixes for activity controller

---
 app/Http/Controllers/ActivityController.php | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

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

From 5d4ee1f586a64b54664df8863c323f3821d85241 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 29 May 2022 11:24:23 +1000
Subject: [PATCH 3/3] 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());