diff --git a/VERSION.txt b/VERSION.txt index 1b88b5827956..a478fd27a62e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.0.24 \ No newline at end of file +5.0.25 \ No newline at end of file diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 436a8ae373ac..e0d5468ab5ce 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -1191,6 +1191,8 @@ class Import implements ShouldQueue if (! $user) { $user = UserFactory::create($this->company->account->id); } + + info("getting user id = {$user->id} - {$user->email}"); return $user; } diff --git a/config/ninja.php b/config/ninja.php index 0ad22ee66c20..6edfe78c9e16 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -12,7 +12,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/').'/', 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.0.24', + 'app_version' => '5.0.25', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php index d00556bdc854..b57686358775 100644 --- a/resources/views/portal/ninja2020/invoices/show.blade.php +++ b/resources/views/portal/ninja2020/invoices/show.blade.php @@ -8,12 +8,6 @@ @section('body') - @if(!$invoice->isApproved() && $client->getSetting('custom_message_unapproved_quote')) - @component('portal.ninja2020.components.message') - {{ $client->getSetting('custom_message_unapproved_quote') }} - @endcomponent - @endif - @if(!$invoice->isPayable() && $client->getSetting('custom_message_paid_invoice')) @component('portal.ninja2020.components.message') {{ $client->getSetting('custom_message_paid_invoice') }} diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php index cacff8059168..b99aa2cb7fb0 100644 --- a/tests/Feature/GroupSettingTest.php +++ b/tests/Feature/GroupSettingTest.php @@ -23,7 +23,7 @@ use Tests\TestCase; class GroupSettingTest extends TestCase { use MakesHash; - use DatabaseTransactions; + //use DatabaseTransactions; use MockAccountData; public function setUp(): void @@ -42,7 +42,7 @@ class GroupSettingTest extends TestCase public function testAddGroupSettings() { $settings = new \stdClass; - $settings->currency_id = 1; + $settings->currency_id = '1'; $data = [ 'name' => 'testX', @@ -65,7 +65,7 @@ class GroupSettingTest extends TestCase public function testArchiveGroupSettings() { $settings = new \stdClass; - $settings->currency_id = 1; + $settings->currency_id = '1'; $data = [ 'name' => 'testY',