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

Set 'silent' in the client portal at the client level

Browse Source
This commit is contained in:
Hillel Coren 2017-02-26 13:56:54 +02:00
parent 3daeaaa7ee
commit 300845c7fe
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/ClientPortalController.php
View File

@ -48,11 +48,6 @@ class ClientPortalController extends BaseController
public function view($invitationKey) public function view($invitationKey)
{ {
if (request()->silent) {
session(['silent' => true]);
return redirect(request()->url());
}
if (! $invitation = $this->invoiceRepo->findInvoiceByInvitation($invitationKey)) { if (! $invitation = $this->invoiceRepo->findInvoiceByInvitation($invitationKey)) {
return $this->returnError(); return $this->returnError();
} }
@ -61,6 +56,11 @@ class ClientPortalController extends BaseController
$client = $invoice->client; $client = $invoice->client;
$account = $invoice->account; $account = $invoice->account;
if (request()->silent) {
session(['silent:' . $client->id => true]);
return redirect(request()->url());
}
if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) { if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) {
return response()->view('error', [ return response()->view('error', [
'error' => trans('texts.invoice_not_found'), 'error' => trans('texts.invoice_not_found'),
@ -69,7 +69,7 @@ class ClientPortalController extends BaseController
$account->loadLocalizationSettings($client); $account->loadLocalizationSettings($client);
if (! Input::has('phantomjs') && ! session('silent') && ! Session::has($invitation->invitation_key) if (! Input::has('phantomjs') && ! session('silent:' . $client->id) && ! Session::has($invitation->invitation_key)
&& (! Auth::check() || Auth::user()->account_id != $invoice->account_id)) { && (! Auth::check() || Auth::user()->account_id != $invoice->account_id)) {
if ($invoice->isType(INVOICE_TYPE_QUOTE)) { if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
event(new QuoteInvitationWasViewed($invoice, $invitation)); event(new QuoteInvitationWasViewed($invoice, $invitation));
@ -228,11 +228,6 @@ class ClientPortalController extends BaseController
public function dashboard($contactKey = false) public function dashboard($contactKey = false)
{ {
if (request()->silent) {
session(['silent' => true]);
return redirect(request()->url());
}
if ($contactKey) { if ($contactKey) {
if (! $contact = Contact::where('contact_key', '=', $contactKey)->first()) { if (! $contact = Contact::where('contact_key', '=', $contactKey)->first()) {
return $this->returnError(); return $this->returnError();
@ -244,8 +239,13 @@ class ClientPortalController extends BaseController
$client = $contact->client; $client = $contact->client;
$account = $client->account; $account = $client->account;
$account->loadLocalizationSettings($client);
if (request()->silent) {
session(['silent:' . $client->id => true]);
return redirect(request()->url());
}
$account->loadLocalizationSettings($client);
$color = $account->primary_color ? $account->primary_color : '#0b4d78'; $color = $account->primary_color ? $account->primary_color : '#0b4d78';
$customer = false; $customer = false;