Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00
Code Issues Releases Activity

Merge pull request #5560 from turbo124/v5-develop

Browse Source 
5.1.56
This commit is contained in:
David Bomba 2021-04-29 18:39:29 +10:00 committed by GitHub
commit 86534fe1e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 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.1.55
5.1.56

6
app/Transformers/CompanyUserTransformer.php
View File

@ -38,10 +38,12 @@ class CompanyUserTransformer extends EntityTransformer
public function transform(CompanyUser $company_user)
{
$blank_obj = new \stdClass;
return [
'permissions' => $company_user->permissions ?: '',
'notifications' => (object) $company_user->notifications,
'settings' => (object) $company_user->settings,
'notifications' => (object) $company_user->notifications ?: $blank_obj,
'settings' => (object) $company_user->settings ?: $blank_obj,
'is_owner' => (bool) $company_user->is_owner,
'is_admin' => (bool) $company_user->is_admin,
'is_locked' => (bool) $company_user->is_locked,

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.1.55',
'app_tag' => '5.1.55-release',
'app_version' => '5.1.56',
'app_tag' => '5.1.56-release',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

2
resources/views/portal/ninja2020/gateways/stripe/credit_card/authorize.blade.php
View File

@ -2,7 +2,7 @@
@section('gateway_head')
<meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
<meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
<meta name="stripe-account-id" content="{{ $gateway->getConfigField('account_id') }}">
<meta name="stripe-secret" content="{{ $intent->client_secret }}">
<meta name="only-authorization" content="true">
<meta name="stripe-token" content="">