diff --git a/app/Http/Controllers/V1/Admin/General/BootstrapController.php b/app/Http/Controllers/V1/Admin/General/BootstrapController.php
index 56ab082b..b9c72ff4 100644
--- a/app/Http/Controllers/V1/Admin/General/BootstrapController.php
+++ b/app/Http/Controllers/V1/Admin/General/BootstrapController.php
@@ -56,7 +56,8 @@ class BootstrapController extends Controller
'login_page_logo',
'login_page_heading',
'login_page_description',
- 'admin_document_title'
+ 'admin_page_title',
+ 'copyright_text'
]);
return response()->json([
diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php
index 9c88fd3a..b24925eb 100644
--- a/app/Providers/ViewServiceProvider.php
+++ b/app/Providers/ViewServiceProvider.php
@@ -29,7 +29,8 @@ class ViewServiceProvider extends ServiceProvider
View::share('login_page_logo', get_login_page_logo());
View::share('login_page_heading', get_login_page_heading());
View::share('login_page_description', get_login_page_description());
- View::share('admin_document_title', get_admin_document_title());
+ View::share('admin_page_title', get_admin_page_title());
+ View::share('copyright_text', get_copyright_text());
}
}
}
diff --git a/app/Space/helpers.php b/app/Space/helpers.php
index 8ddaedb3..b590592f 100644
--- a/app/Space/helpers.php
+++ b/app/Space/helpers.php
@@ -33,6 +33,18 @@ function get_customer_logo($company_id)
}
}
+/**
+ * Get current customer page title
+ *
+ * @param $company_id
+ * @return string
+ */
+function get_customer_page_title($company_id)
+{
+ if (\Storage::disk('local')->has('database_created')) {
+ return CompanySetting::getSetting('customer_portal_page_title', $company_id);
+ }
+}
/**
* Get current admin portal logo
@@ -94,15 +106,28 @@ function get_login_page_description()
}
/**
- * Get admin document title
+ * Get admin page title
*
* @param $company_id
* @return string
*/
-function get_admin_document_title()
+function get_admin_page_title()
{
if (\Storage::disk('local')->has('database_created')) {
- return Setting::getSetting('admin_document_title');
+ return Setting::getSetting('admin_page_title');
+ }
+}
+
+/**
+ * Get admin page title
+ *
+ * @param $company_id
+ * @return string
+ */
+function get_copyright_text()
+{
+ if (\Storage::disk('local')->has('database_created')) {
+ return Setting::getSetting('copyright_text');
}
}
diff --git a/resources/scripts/admin/layouts/LayoutLogin.vue b/resources/scripts/admin/layouts/LayoutLogin.vue
index 1987a1e4..7e07d1c1 100644
--- a/resources/scripts/admin/layouts/LayoutLogin.vue
+++ b/resources/scripts/admin/layouts/LayoutLogin.vue
@@ -54,7 +54,7 @@
"
>
- Copyright @ {{ documentTitle }}, Inc.
+ {{ documentTitle }}, Inc.
{{ new Date().getFullYear() }}
@@ -161,11 +161,10 @@ const pageDescription = computed(() => {
})
const documentTitle = computed(() => {
- if (window.admin_document_title) {
- return window.admin_document_title
+ if (window.copyright_text) {
+ return window.copyright_text
}
-
- return 'Crater Invoice'
+ return 'Copyright @ Crater Invoice'
})
const loginPageLogo = computed(() => {
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index f3606209..2df11c0d 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -3,7 +3,20 @@
- Crater - Self Hosted Invoicing Platform
+ @if (Route::currentRouteName() === 'admin')
+ @if(isset($admin_page_title) && $admin_page_title != null)
+ {{$admin_page_title}}
+ @else
+ Crater - Self Hosted Invoicing Platform
+ @endif
+ @endif
+ @if (Route::currentRouteName() === 'customer.login')
+ @if(isset($customer_page_title) && $customer_page_title != null)
+ {{$customer_page_title}}
+ @else
+ Crater - Self Hosted Invoicing Platform
+ @endif
+ @endif
@@ -57,12 +70,13 @@
window.login_page_description = "{{$login_page_description}}"
- @endif
- @if(isset($admin_document_title))
+ @endif
+ @if(isset($copyright_text))
- window.admin_document_title = "{{$admin_document_title}}"
+ window.copyright_text = "{{$copyright_text}}"
+
+ @endif
- @endif
window.Crater.start()
diff --git a/routes/web.php b/routes/web.php
index ac694513..1759b63c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,7 +136,8 @@ Route::get('/admin/{vue?}', function () {
Route::get('{company:slug}/customer/{vue?}', function (Company $company) {
return view('app')->with([
'customer_logo' => get_customer_logo($company->id),
- 'current_theme' => get_customer_portal_theme($company->id)
+ 'current_theme' => get_customer_portal_theme($company->id),
+ 'customer_page_title' => get_customer_page_title($company->id)
]);
})->where('vue', '[\/\w\.-]*')->name('customer.login')->middleware(['install']);