diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index b1febefdab7a..f2416ed26ba6 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -617,7 +617,6 @@ class CompanySettings extends BaseSettings
'$quote.po_number',
'$quote.date',
'$quote.valid_until',
- '$quote.balance_due',
'$quote.total',
],
'credit_details' => [
diff --git a/app/Notifications/Admin/InvoiceSentNotification.php b/app/Notifications/Admin/InvoiceSentNotification.php
index 23520c79fa2d..5f8133d0789a 100644
--- a/app/Notifications/Admin/InvoiceSentNotification.php
+++ b/app/Notifications/Admin/InvoiceSentNotification.php
@@ -92,7 +92,7 @@ class InvoiceSentNotification extends Notification implements ShouldQueue
'invoice' => $this->invoice->number,
]
),
- 'url' => config('ninja.app_url').'invoices/'.$this->invoice->hashed_id,
+ 'url' => config('ninja.app_url').'/invoices/'.$this->invoice->hashed_id,
'button' => ctrans('texts.view_invoice'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
diff --git a/app/Notifications/Admin/InvoiceViewedNotification.php b/app/Notifications/Admin/InvoiceViewedNotification.php
index e8e0ed3a8e67..793f484d8faf 100644
--- a/app/Notifications/Admin/InvoiceViewedNotification.php
+++ b/app/Notifications/Admin/InvoiceViewedNotification.php
@@ -92,7 +92,7 @@ class InvoiceViewedNotification extends Notification implements ShouldQueue
'invoice' => $this->invoice->number,
]
),
- 'url' => config('ninja.app_url').'invoices/'.$this->invoice->hashed_id,
+ 'url' => config('ninja.app_url').'/invoices/'.$this->invoice->hashed_id,
'button' => ctrans('texts.view_invoice'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
diff --git a/app/Notifications/Admin/NewPartialPaymentNotification.php b/app/Notifications/Admin/NewPartialPaymentNotification.php
index 83eba45e660f..e7023f414a4c 100644
--- a/app/Notifications/Admin/NewPartialPaymentNotification.php
+++ b/app/Notifications/Admin/NewPartialPaymentNotification.php
@@ -89,7 +89,7 @@ class NewPartialPaymentNotification extends Notification implements ShouldQueue
'invoice' => $invoice_texts,
]
),
- 'url' => config('ninja.app_url').'payments/'.$this->payment->hashed_id,
+ 'url' => config('ninja.app_url').'/payments/'.$this->payment->hashed_id,
'button' => ctrans('texts.view_payment'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
diff --git a/app/Notifications/Admin/NewPaymentNotification.php b/app/Notifications/Admin/NewPaymentNotification.php
index 867e9b818da0..ef7070dfd575 100644
--- a/app/Notifications/Admin/NewPaymentNotification.php
+++ b/app/Notifications/Admin/NewPaymentNotification.php
@@ -92,7 +92,7 @@ class NewPaymentNotification extends Notification implements ShouldQueue
'invoice' => $invoice_texts,
]
),
- 'url' => config('ninja.app_url').'payments/'.$this->payment->hashed_id,
+ 'url' => config('ninja.app_url').'/payments/'.$this->payment->hashed_id,
'button' => ctrans('texts.view_payment'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index 209ff8342730..2d02b8931ef6 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -68,7 +68,7 @@ class Phantom
$file_path = $path.$entity_obj->number.'.pdf';
- $url = config('ninja.app_url').'phantom/'.$entity.'/'.$invitation->key.'?phantomjs_secret='.config('ninja.phantomjs_secret');
+ $url = config('ninja.app_url').'/phantom/'.$entity.'/'.$invitation->key.'?phantomjs_secret='.config('ninja.phantomjs_secret');
info($url);
$key = config('ninja.phantomjs_key');
diff --git a/composer.json b/composer.json
index 08c1082e8854..0cc836b574f2 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
"league/omnipay": "^3.0",
"livewire/livewire": "^1.3",
"maennchen/zipstream-php": "^1.2",
- "nwidart/laravel-modules": "^6.0",
+ "nwidart/laravel-modules": "^8.0",
"omnipay/paypal": "^3.0",
"predis/predis": "^1.1",
"sentry/sentry-laravel": "^2",
diff --git a/config/ninja.php b/config/ninja.php
index 00d2b70a1f0c..8e2402b989e2 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -10,7 +10,7 @@ return [
'app_name' => env('APP_NAME'),
'app_env' => env('APP_ENV', 'selfhosted'),
'require_https' => env('REQUIRE_HTTPS', true),
- 'app_url' => rtrim(env('APP_URL', ''), '/').'/',
+ 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.33',
'minimum_client_version' => '5.0.16',
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index 8187713a24e0..6db093859999 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -36,7 +36,7 @@
-
+
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 0928ce4dbbea..e4aef481b2e3 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -57,7 +57,7 @@
-
+
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index df7c8bed0bf0..4e4213116a8e 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -58,7 +58,7 @@
{{-- --}}
-
+
{{-- Feel free to push anything to header using @push('header') --}}
@stack('head')