From 36801316c64dc16cca081a7bb670a115e7cedcc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 2 Sep 2021 11:33:31 +0200 Subject: [PATCH 1/3] Define `entity` routes explicitly --- routes/client.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routes/client.php b/routes/client.php index 12e530ffa2d8..60e20ea15305 100644 --- a/routes/client.php +++ b/routes/client.php @@ -90,7 +90,9 @@ Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\Subscri Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { /*Invitation catches*/ Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter'); - Route::get('{entity}/{invitation_key}', 'ClientPortal\InvitationController@router'); + Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@router'); + Route::get('quote/{invitation_key}', 'ClientPortal\InvitationController@router'); + Route::get('credit/{invitation_key}', 'ClientPortal\InvitationController@router'); 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('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key'); From 92ec8f13a1e038cf82428be669396f0886cb3975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 2 Sep 2021 11:38:14 +0200 Subject: [PATCH 2/3] Redirect button back to client portal --- resources/views/portal/ninja2020/layout/error.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/layout/error.blade.php b/resources/views/portal/ninja2020/layout/error.blade.php index 920eb59334c5..b04dacd5bb5b 100644 --- a/resources/views/portal/ninja2020/layout/error.blade.php +++ b/resources/views/portal/ninja2020/layout/error.blade.php @@ -15,7 +15,7 @@ @yield('code') — @yield('message') - + {{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }} From 160370c362ef3f6a78f196f0325bacb023982b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Sun, 5 Sep 2021 12:41:00 +0200 Subject: [PATCH 3/3] Add router methods for invoice, credit & quote --- .../ClientPortal/InvitationController.php | 15 +++++++++++++++ routes/client.php | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index 797af5a09e86..1fbf37bedd24 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -46,6 +46,21 @@ class InvitationController extends Controller 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) { diff --git a/routes/client.php b/routes/client.php index 60e20ea15305..65590aa78c1e 100644 --- a/routes/client.php +++ b/routes/client.php @@ -90,9 +90,9 @@ Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\Subscri Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { /*Invitation catches*/ Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter'); - Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@router'); - Route::get('quote/{invitation_key}', 'ClientPortal\InvitationController@router'); - Route::get('credit/{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('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');