diff --git a/VERSION.txt b/VERSION.txt index fe757942e66b..c554ea8c958d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.55 \ No newline at end of file +5.1.56 \ No newline at end of file diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php index 2ead828ebeb4..a9a70456997a 100644 --- a/app/Transformers/CompanyUserTransformer.php +++ b/app/Transformers/CompanyUserTransformer.php @@ -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, diff --git a/config/ninja.php b/config/ninja.php index 8b2383b03a32..ac6696c0f031 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -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), diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card/authorize.blade.php index acbbc5d81b7c..e6eb2bf8f820 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/credit_card/authorize.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card/authorize.blade.php @@ -2,7 +2,7 @@ @section('gateway_head') - +