diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 8f49531ea467..7d931c1022fa 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -35,6 +35,7 @@ use App\Models\BankTransaction;
 use App\Models\QuoteInvitation;
 use Illuminate\Console\Command;
 use App\Models\CreditInvitation;
+use App\Models\RecurringInvoice;
 use App\Models\InvoiceInvitation;
 use App\DataMapper\ClientSettings;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php
index beffeeac2f1d..140dc08a904b 100644
--- a/app/Http/Requests/Shop/StoreShopClientRequest.php
+++ b/app/Http/Requests/Shop/StoreShopClientRequest.php
@@ -108,7 +108,7 @@ class StoreShopClientRequest extends Request
             $settings->currency_id = $this->getCurrencyCode($input['currency_code']);
         }
 
-        $input['settings'] = $settings;
+        $input['settings'] = (array)$settings;
 
         if (isset($input['contacts'])) {
             foreach ($input['contacts'] as $key => $contact) {
diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php
index ed7c7056845c..13a161462aae 100644
--- a/app/Utils/Traits/Inviteable.php
+++ b/app/Utils/Traits/Inviteable.php
@@ -79,7 +79,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         $entity_type = Str::snake(class_basename($this->entityType()));
@@ -94,7 +94,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         switch ($this->company->portal_mode) {
@@ -119,7 +119,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         switch ($this->company->portal_mode) {
diff --git a/phpstan.neon b/phpstan.neon
index ff93e96cc5b3..6bc4f9205594 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -13,6 +13,7 @@ parameters:
         - 'app/DataMapper/Analytics/*'
         - 'app/PaymentDrivers/Authorize/*'
         - 'app/Utils/Traits/*'
+        - 'resources/views/*'
     universalObjectCratesClasses:
         - App\DataMapper\Tax\RuleInterface
         - App\DataMapper\FeesAndLimits
diff --git a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
index 290de387db96..d15f748c6e23 100644
--- a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
@@ -1,5 +1,5 @@
 <div>
-  <div class="flex flex-col items-end mb-2" x-data>
+  <div class="flex flex-row space-x-2 float-right mb-2" x-data>
     <button wire:loading.attr="disabled" wire:click="downloadPdf" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
         <span class="mr-0">{{ ctrans('texts.download_pdf') }}</span>
         <div wire:loading wire:target="downloadPdf">
@@ -9,15 +9,17 @@
             </svg>
         </div>
     </button>
-  <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
-          <span>{{ ctrans('texts.download_e_invoice') }}</span>
-          <div wire:loading wire:target="downloadEInvoice">
-              <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                  <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                  <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-              </svg>
-          </div>
-      </button>
+    @if($settings->enable_e_invoice && $entity_type == 'invoice')
+    <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
+        <span>{{ ctrans('texts.download_e_invoice') }}</span>
+        <div wire:loading wire:target="downloadEInvoice">
+            <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+            </svg>
+        </div>
+    </button>
+    @endif
   </div>
   <div class="hidden lg:block">
     <div wire:init="getPdf()">