Merge branch 'document-title' into 'master'

add admin_document_title

See merge request mohit.panjvani/crater-web!1447
This commit is contained in:
Mohit Panjwani
2022-02-24 12:40:33 +00:00
8 changed files with 81 additions and 69 deletions

View File

@ -55,7 +55,9 @@ class BootstrapController extends Controller
'admin_portal_logo',
'login_page_logo',
'login_page_heading',
'login_page_description'
'login_page_description',
'admin_page_title',
'copyright_text'
]);
return response()->json([

View File

@ -44,8 +44,8 @@ class InvoicePdfController extends Controller
}
return view('app')->with([
'customer_logo' => get_customer_logo($invoice->company_id),
'current_theme' => get_customer_portal_theme($invoice->company_id)
'customer_logo' => get_company_setting('customer_portal_logo', $invoice->company_id),
'current_theme' => get_company_setting('customer_portal_theme', $invoice->company_id)
]);
}

View File

@ -26,9 +26,11 @@ class ViewServiceProvider extends ServiceProvider
public function boot()
{
if (\Storage::disk('local')->has('database_created') && Schema::hasTable('settings')) {
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('login_page_logo', get_app_setting('login_page_logo'));
View::share('login_page_heading', get_app_setting('login_page_heading'));
View::share('login_page_description', get_app_setting('login_page_description'));
View::share('admin_page_title', get_app_setting('admin_page_title'));
View::share('copyright_text', get_app_setting('copyright_text'));
}
}
}

View File

@ -7,93 +7,56 @@ use Crater\Models\Setting;
use Illuminate\Support\Str;
/**
* Get current customer theme
* Get company setting
*
* @param $company_id
* @return string
*/
function get_customer_portal_theme($company_id)
function get_company_setting($key, $company_id)
{
if (\Storage::disk('local')->has('database_created')) {
return CompanySetting::getSetting('customer_portal_theme', $company_id);
return CompanySetting::getSetting($key, $company_id);
}
}
/**
* Get current customer logo
* Get app setting
*
* @param $company_id
* @return string
*/
function get_customer_logo($company_id)
function get_app_setting($key)
{
if (\Storage::disk('local')->has('database_created')) {
return CompanySetting::getSetting('customer_portal_logo', $company_id);
return Setting::getSetting($key);
}
}
/**
* Get current admin portal logo
* Get page title
*
* @param $company_id
* @return string
*/
function get_login_page_logo()
function get_page_title($company_id)
{
if (\Storage::disk('local')->has('database_created')) {
return Setting::getSetting('login_page_logo');
}
}
$routeName = Route::currentRouteName();
/**
* Get current admin theme
*
* @return string
*/
function get_admin_portal_theme()
{
if (\Storage::disk('local')->has('database_created')) {
$setting = Setting::getSetting('admin_portal_theme');
$pageTitle = null;
$defaultPageTitle = 'Crater - Self Hosted Invoicing Platform';
if ($setting) {
return $setting;
if (\Storage::disk('local')->has('database_created')) {
if ($routeName === 'customer.dashboard') {
$pageTitle = CompanySetting::getSetting('customer_portal_page_title', $company_id);
return $pageTitle ? $pageTitle : $defaultPageTitle;
}
return 'crater';
}
return 'crater';
}
/**
* Get current login page heading
*
* @param $company_id
* @return string
*/
function get_login_page_heading()
{
if (\Storage::disk('local')->has('database_created')) {
return Setting::getSetting('login_page_heading');
$pageTitle = Setting::getSetting('admin_page_title');
return $pageTitle ? $pageTitle : $defaultPageTitle;
}
}
/**
* Get current login page description
*
* @param $company_id
* @return string
*/
function get_login_page_description()
{
if (\Storage::disk('local')->has('database_created')) {
return Setting::getSetting('login_page_description');
}
}
/**
* Set Active Path
*