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

Fix client overview portal link w/iframe

Browse Source
This commit is contained in:
Hillel Coren 2018-05-14 09:45:35 +03:00
parent 94296e6642
commit 2b7b9f83e4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Contact.php
View File

@ -183,6 +183,7 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
} }
$account = $this->account; $account = $this->account;
$iframe_url = $account->iframe_url;
$url = trim(SITE_URL, '/'); $url = trim(SITE_URL, '/');
if ($account->hasFeature(FEATURE_CUSTOM_URL)) { if ($account->hasFeature(FEATURE_CUSTOM_URL)) {
@ -190,7 +191,13 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
$url = $account->present()->clientPortalLink(); $url = $account->present()->clientPortalLink();
} }
if ($this->account->subdomain) { if ($iframe_url) {
if ($account->is_custom_domain) {
$url = $iframe_url;
} else {
return "{$iframe_url}?{$this->contact_key}/client";
}
} elseif ($this->account->subdomain) {
$url = Utils::replaceSubdomain($url, $account->subdomain); $url = Utils::replaceSubdomain($url, $account->subdomain);
} }
} }

1
routes/web.php
View File

@ -46,6 +46,7 @@ Route::group(['middleware' => ['lookup:contact', 'auth:client']], function () {
Route::get('client/documents/js/{documents}/{filename}', 'ClientPortalController@getDocumentVFSJS'); Route::get('client/documents/js/{documents}/{filename}', 'ClientPortalController@getDocumentVFSJS');
Route::get('client/documents/{invitation_key}/{documents}/{filename?}', 'ClientPortalController@getDocument'); Route::get('client/documents/{invitation_key}/{documents}/{filename?}', 'ClientPortalController@getDocument');
Route::get('client/documents/{invitation_key}/{filename?}', 'ClientPortalController@getInvoiceDocumentsZip'); Route::get('client/documents/{invitation_key}/{filename?}', 'ClientPortalController@getInvoiceDocumentsZip');
Route::get('client/{contact_key?}', 'ClientPortalController@dashboard');
Route::get('api/client.quotes', ['as' => 'api.client.quotes', 'uses' => 'ClientPortalController@quoteDatatable']); Route::get('api/client.quotes', ['as' => 'api.client.quotes', 'uses' => 'ClientPortalController@quoteDatatable']);
Route::get('api/client.credits', ['as' => 'api.client.credits', 'uses' => 'ClientPortalController@creditDatatable']); Route::get('api/client.credits', ['as' => 'api.client.credits', 'uses' => 'ClientPortalController@creditDatatable']);