Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5548 from turbo124/v5-develop

Browse Source 
Fixes for company domain
This commit is contained in:
David Bomba 2021-04-28 13:40:31 +10:00 committed by GitHub
commit 5f94787ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Company.php
View File

@ -423,7 +423,11 @@ class Company extends BaseModel
public function domain() public function domain()
{ {
if (Ninja::isNinja()) { if (Ninja::isNinja()) {
return $this->subdomain . config('ninja.app_domain');
if($this->portal_mode == 'domain')
return $this->portal_domain;
return "https://{$this->subdomain}" . config('ninja.app_domain');
} }
return config('ninja.app_url'); return config('ninja.app_url');

2
config/ninja.php
View File

@ -13,7 +13,7 @@ return [
'debug_enabled' => env('APP_DEBUG', false), 'debug_enabled' => env('APP_DEBUG', false),
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.1.55', 'app_version' => '5.1.55',
'app_tag' => '5.1.55-release', 'app_tag' => '5.1.55-release',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',