Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11197 from turbo124/v5-develop 

v5.12.18
This commit is contained in:
David Bomba 2025-08-19 04:53:47 +10:00 committed by GitHub
parent 2cae92db38 7af38fcbd1
commit 8c621972b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.12.17
5.12.18

1
app/Models/Company.php
View File

@ -228,6 +228,7 @@ use Laracasts\Presenter\PresentableTrait;
* @property-read int|null $users_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vendor> $vendors
* @property-read int|null $vendors_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Location> $locations
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Webhook> $webhooks
* @method static \Illuminate\Database\Eloquent\Builder|Company where($query)
* @method static \Illuminate\Database\Eloquent\Builder|Company find($query)

1
app/Transformers/CompanyTransformer.php
View File

@ -226,7 +226,6 @@ class CompanyTransformer extends EntityTransformer
'has_quickbooks_token' => $company->quickbooks ? true : false,
'is_quickbooks_token_active' => $company->quickbooks?->accessTokenKey ?? false,
'legal_entity_id' => $company->legal_entity_id ?? null,
'microsoft_client_id' => Ninja::isSelfHost() ? config('services.microsoft.client_id') : '',
];
}

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.12.17'),
'app_tag' => env('APP_TAG', '5.12.17'),
'app_version' => env('APP_VERSION', '5.12.18'),
'app_tag' => env('APP_TAG', '5.12.18'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

2
config/scout.php
View File

@ -44,7 +44,7 @@ return [
// 'queue' => env('SCOUT_QUEUE', true),
'queue' => [
'connection' => 'redis',
'connection' => env('QUEUE_CONNECTION', 'sync'),
'queue' => 'scout'
],

2
resources/views/index/index.blade.php
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html data-report-errors="{{ $report_errors }}" data-rc="{{ $rc }}" data-user-agent="{{ $user_agent }}" data-login="{{ $login }}" data-signup="{{ $signup }}" data-white-label="{{ $white_label }}">
<html data-report-errors="{{ $report_errors }}" data-rc="{{ $rc }}" data-user-agent="{{ $user_agent }}" data-login="{{ $login }}" data-signup="{{ $signup }}" data-white-label="{{ $white_label }}" data-microsoft-client-id="{{ config('services.microsoft.client_id') }}">
<head>
<!-- Source: https://github.com/invoiceninja/invoiceninja -->
<!-- Version: {{ config('ninja.app_version') }} -->