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

Merge pull request #6556 from beganovich/v5-654

Browse Source 
(v5) Redirect back to client portal page on error pages
This commit is contained in:
David Bomba 2021-09-05 20:43:14 +10:00 committed by GitHub
commit 831fbade7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -46,6 +46,21 @@ class InvitationController extends Controller
return $this->genericRouter('recurring_invoice', $invitation_key); return $this->genericRouter('recurring_invoice', $invitation_key);
} }
public function invoiceRouter(string $invitation_key)
{
return $this->genericRouter('invoice', $invitation_key);
}
public function quoteRouter(string $invitation_key)
{
return $this->genericRouter('quote', $invitation_key);
}
public function creditRouter(string $invitation_key)
{
return $this->genericRouter('credit', $invitation_key);
}
private function genericRouter(string $entity, string $invitation_key) private function genericRouter(string $entity, string $invitation_key)
{ {

2
resources/views/portal/ninja2020/layout/error.blade.php
View File

@ -15,7 +15,7 @@
@yield('code') — @yield('message') @yield('code') — @yield('message')
</span> </span>
<a class="button-link text-sm mt-2" href="{{ request()->getSchemeAndHttpHost() }}"> <a class="button-link text-sm mt-2" href="{{ url(request()->getSchemeAndHttpHost() . '/client') }}">
{{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }} {{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }}
</a> </a>
</div> </div>

4
routes/client.php
View File

@ -90,7 +90,9 @@ Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\Subscri
Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
/*Invitation catches*/ /*Invitation catches*/
Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter'); Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
Route::get('{entity}/{invitation_key}', 'ClientPortal\InvitationController@router'); Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter');
Route::get('quote/{invitation_key}', 'ClientPortal\InvitationController@quoteRouter');
Route::get('credit/{invitation_key}', 'ClientPortal\InvitationController@creditRouter');
Route::get('recurring_invoice/{invitation_key}/download_pdf', 'RecurringInvoiceController@downloadPdf')->name('recurring_invoice.download_invitation_key'); Route::get('recurring_invoice/{invitation_key}/download_pdf', 'RecurringInvoiceController@downloadPdf')->name('recurring_invoice.download_invitation_key');
Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key'); Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key');
Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key'); Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key');