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

Fixes for payment activities

Browse Source
This commit is contained in:
David Bomba 2023-08-07 23:00:19 +10:00
parent 54b64fe6ad
commit e21b6f3a55
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Requests/Company/ShowCompanyRequest.php
View File

@ -22,6 +22,9 @@ class ShowCompanyRequest extends Request
*/ */
public function authorize() : bool public function authorize() : bool
{ {
return auth()->user()->can('view', $this->company); /** @var \App\Models\User $user */
$user = auth()->user();
return $user->company()->id == $this->company->id;
} }
} }

1
app/Listeners/Invoice/InvoicePaidActivity.php
View File

@ -47,6 +47,7 @@ class InvoicePaidActivity implements ShouldQueue
$fields->user_id = $user_id; $fields->user_id = $user_id;
$fields->invoice_id = $event->invoice->id; $fields->invoice_id = $event->invoice->id;
$fields->client_id = $event->invoice->client_id;
$fields->company_id = $event->invoice->company_id; $fields->company_id = $event->invoice->company_id;
$fields->activity_type_id = Activity::PAID_INVOICE; $fields->activity_type_id = Activity::PAID_INVOICE;
$fields->payment_id = $event->payment->id; $fields->payment_id = $event->payment->id;

3
app/Policies/CompanyPolicy.php
View File

@ -43,7 +43,8 @@ class CompanyPolicy extends EntityPolicy
return ($user->isAdmin() && $entity->id == $user->companyId()) return ($user->isAdmin() && $entity->id == $user->companyId())
|| ($user->hasPermission('view_'.strtolower(class_basename($entity))) && $entity->id == $user->companyId()) || ($user->hasPermission('view_'.strtolower(class_basename($entity))) && $entity->id == $user->companyId())
// || ($user->hasPermission('view_all') && $entity->id == $user->companyId()) // || ($user->hasPermission('view_all') && $entity->id == $user->companyId())
|| $user->owns($entity); || $user->owns($entity)
|| $user->companyId() == $entity->id;
} }
/** /**