shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow users to see signed pages

Browse Source
This commit is contained in:
Denis Duliçi 2021-04-21 09:59:56 +03:00
parent 71c63b28db
commit 9fefd0d8c4
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Abstracts/Http/PaymentController.php
View File

@ -117,9 +117,9 @@ abstract class PaymentController extends BaseController
public function getInvoiceUrl($invoice) public function getInvoiceUrl($invoice)
{ {
return $this->user return request()->isPortal($invoice->company_id)
? route('portal.invoices.show', $invoice->id) ? route('portal.invoices.show', $invoice->id)
: URL::signedRoute('signed.invoices.show', [$invoice->id, 'company_id' => $invoice->company_id]); : URL::signedRoute('signed.invoices.show', [$invoice->id]);
} }
public function getConfirmUrl($invoice) public function getConfirmUrl($invoice)
@ -144,7 +144,7 @@ abstract class PaymentController extends BaseController
public function getModuleUrl($invoice, $suffix) public function getModuleUrl($invoice, $suffix)
{ {
return $this->user return request()->isPortal($invoice->company_id)
? route('portal.' . $this->alias . '.invoices.' . $suffix, $invoice->id) ? route('portal.' . $this->alias . '.invoices.' . $suffix, $invoice->id)
: URL::signedRoute('signed.' . $this->alias . '.invoices.' . $suffix, [$invoice->id]); : URL::signedRoute('signed.' . $this->alias . '.invoices.' . $suffix, [$invoice->id]);
} }

2
app/Http/Kernel.php
View File

@ -107,7 +107,6 @@ class Kernel extends HttpKernel
'session.errors', 'session.errors',
'csrf', 'csrf',
'signature', 'signature',
'signed.redirect',
'company.identify', 'company.identify',
'bindings', 'bindings',
'header.x', 'header.x',
@ -154,7 +153,6 @@ class Kernel extends HttpKernel
'install.can' => \App\Http\Middleware\CanInstall::class, 'install.can' => \App\Http\Middleware\CanInstall::class,
'install.redirect' => \App\Http\Middleware\RedirectIfNotInstalled::class, 'install.redirect' => \App\Http\Middleware\RedirectIfNotInstalled::class,
'money' => \App\Http\Middleware\Money::class, 'money' => \App\Http\Middleware\Money::class,
'signed.redirect' => \App\Http\Middleware\RedirectSignedIfAuthenticated::class,
'wizard.redirect' => \App\Http\Middleware\RedirectIfWizardNotCompleted::class, 'wizard.redirect' => \App\Http\Middleware\RedirectIfWizardNotCompleted::class,
// Vendor // Vendor

37
app/Http/Middleware/RedirectSignedIfAuthenticated.php
View File

@ -1,37 +0,0 @@
<?php
namespace App\Http\Middleware;
use App\Models\Document\Document;
use Closure;
class RedirectSignedIfAuthenticated
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if (!$user = user()) {
return $next($request);
}
$prefix = $user->contact ? 'portal.' : '';
$page = 'dashboard';
$params = [];
if ($request->segment(3) == 'invoices') {
$page = 'invoices.show';
$invoice = Document::find($request->segment(4));
$params = [$invoice->id];
}
return redirect()->route($prefix . $page, $params);
}
}