Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5550 from turbo124/v5-develop

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

2
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -45,7 +45,7 @@ class StoreCompanyRequest extends Request
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) { if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
$rules['portal_domain'] = 'sometimes|url'; $rules['portal_domain'] = 'sometimes|url';
} else { } else {
$rules['portal_domain'] = 'nullable|alpha_num'; $rules['subdomain'] = 'nullable|alpha_num';
} }
return $rules; return $rules;

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -46,7 +46,7 @@ class UpdateCompanyRequest extends Request
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) { if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
$rules['portal_domain'] = 'sometimes|url'; $rules['portal_domain'] = 'sometimes|url';
} else { } else {
$rules['portal_domain'] = 'nullable|alpha_num'; $rules['subdomain'] = 'nullable|alpha_num';
} }
// if($this->company->account->isPaidHostedClient()) { // if($this->company->account->isPaidHostedClient()) {