Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4325 from turbo124/v5-develop

Browse Source 
Minor fixes for client portal
This commit is contained in:
David Bomba 2020-11-18 08:00:02 +11:00 committed by GitHub
commit 6376d5fa98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.24
5.0.25

2
app/Jobs/Util/Import.php
View File

@ -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;
}

2
config/ninja.php
View File

@ -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),

6
resources/views/portal/ninja2020/invoices/show.blade.php
View File

@ -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') }}

6
tests/Feature/GroupSettingTest.php
View File

@ -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',