From 1ff29a2d55511d926094bea8090d1f0a96a5de8e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 14 Jan 2021 20:31:27 +1100 Subject: [PATCH] Fix for usercreated event --- .github/workflows/release.yml | 2 +- app/Helpers/Generic.php | 4 ++++ app/Jobs/User/CreateUser.php | 2 +- public/css/card-js.min.css | 0 tests/Feature/Export/ExportCsvTest.php | 4 ++-- tests/Feature/LoginTest.php | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) mode change 100644 => 100755 public/css/card-js.min.css diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b9b5164999ec..9e08efd48a7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: - name: Cleanup Builds run: | sudo rm -rf bootstrap/cache/* - + sudo rm -rf node_modules - name: Build project # This would actually build your project, using zip for an example artifact run: | zip -r ./invoiceninja.zip ./ diff --git a/app/Helpers/Generic.php b/app/Helpers/Generic.php index d6fca896f94c..fc3444176fed 100644 --- a/app/Helpers/Generic.php +++ b/app/Helpers/Generic.php @@ -21,6 +21,10 @@ */ function nlog($output, $context = []): void { + $trace = debug_backtrace(); + + \Illuminate\Support\Facades\Log::channel('invoiceninja')->info(print_r($trace[1]['class'],1), []); + if (config('ninja.expanded_logging')) { if (gettype($output) == 'object') { $output = print_r($output, 1); diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index f517267ed7e9..4a81aad3d5c3 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -78,7 +78,7 @@ class CreateUser 'settings' => null, ]); - event(new UserWasCreated($user, $this->company, Ninja::eventVars())); + event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars())); return $user; } diff --git a/public/css/card-js.min.css b/public/css/card-js.min.css old mode 100644 new mode 100755 diff --git a/tests/Feature/Export/ExportCsvTest.php b/tests/Feature/Export/ExportCsvTest.php index abe2e610087f..d1ac66b6e91f 100644 --- a/tests/Feature/Export/ExportCsvTest.php +++ b/tests/Feature/Export/ExportCsvTest.php @@ -58,8 +58,8 @@ class ExportCsvTest extends TestCase $merged_values = array_merge($header_invoice_values, (array)$header_item_values); $merged_keys = array_merge($header_invoice_keys, (array)$header_item_keys); - nlog(print_r($merged_keys, 1)); - nlog(print_r($merged_values, 1)); + // nlog(print_r($merged_keys, 1)); + // nlog(print_r($merged_values, 1)); foreach ($merged_keys as &$key) { diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php index b9d3648c8254..ae2289fbd00d 100644 --- a/tests/Feature/LoginTest.php +++ b/tests/Feature/LoginTest.php @@ -195,7 +195,7 @@ class LoginTest extends TestCase $arr = $response->json(); - nlog(print_r($arr, 1)); + // nlog(print_r($arr, 1)); $response->assertStatus(200); }