From d26ff60258389d8af96743fd5ba03530f7bfe867 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 17:34:30 +1000
Subject: [PATCH 1/5] catch all for company_user.settings

---
 app/Transformers/CompanyUserTransformer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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,

From f825b72540903f59fc8c49a9561ab2c1ba629a56 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 18:27:06 +1000
Subject: [PATCH 2/5] Fixes for stripe

---
 .../ninja2020/gateways/stripe/credit_card/authorize.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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')
     <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="">

From 2039fd0ef57570808c125292f7ebed7b4dd337a1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 18:29:03 +1000
Subject: [PATCH 3/5] fixes for stripe

---
 .../views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php | 2 +-
 .../portal/ninja2020/gateways/stripe/credit_card/pay.blade.php  | 2 +-
 .../views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
index 9d439f17e9dc..6097b42524de 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
@@ -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="return-url" content="{{ $return_url }}">
     <meta name="currency" content="{{ $currency }}">
     <meta name="amount" content="{{ $stripe_amount }}">
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
index 2585f611cbf2..b6ae13f15552 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
@@ -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="">
 @endsection
diff --git a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
index 36f9352cac76..ce99e4acc93b 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
@@ -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="return-url" content="{{ $return_url }}">
     <meta name="amount" content="{{ $stripe_amount }}">
     <meta name="country" content="{{ $country }}">

From 9726dc15c24a1e0821873e030280f3c8008114e1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 18:29:57 +1000
Subject: [PATCH 4/5] v5.1.56

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

From aefd515b4e954e4fc2cf776ace15f3213985c367 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 18:36:04 +1000
Subject: [PATCH 5/5] Fixes for stripe

---
 .../views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php | 2 +-
 .../portal/ninja2020/gateways/stripe/credit_card/pay.blade.php  | 2 +-
 .../views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
index 6097b42524de..9d439f17e9dc 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php
@@ -2,7 +2,7 @@
 
 @section('gateway_head')
     <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
-    <meta name="stripe-account-id" content="{{ $gateway->getConfigField('account_id') }}">
+    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
     <meta name="return-url" content="{{ $return_url }}">
     <meta name="currency" content="{{ $currency }}">
     <meta name="amount" content="{{ $stripe_amount }}">
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
index b6ae13f15552..2585f611cbf2 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
@@ -2,7 +2,7 @@
 
 @section('gateway_head')
     <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
-    <meta name="stripe-account-id" content="{{ $gateway->getConfigField('account_id') }}">
+    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
     <meta name="stripe-secret" content="{{ $intent->client_secret }}">
     <meta name="only-authorization" content="">
 @endsection
diff --git a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
index ce99e4acc93b..36f9352cac76 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php
@@ -2,7 +2,7 @@
 
 @section('gateway_head')
     <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
-    <meta name="stripe-account-id" content="{{ $gateway->getConfigField('account_id') }}">
+    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
     <meta name="return-url" content="{{ $return_url }}">
     <meta name="amount" content="{{ $stripe_amount }}">
     <meta name="country" content="{{ $country }}">