Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Add mark paid for credits

Browse Source
This commit is contained in:
David Bomba 2023-06-19 19:48:53 +10:00
parent e07c070d39
commit e9dbe62d33
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filters/DesignFilters.php
View File

@ -61,11 +61,11 @@ class DesignFilters extends QueryFilters
*/
public function entityFilter(): Builder
{
//19-03-2023 change the scope for the design filters
return $this->builder->where(function ($query) {
$query->where('company_id', auth()->user()->company()->id)->orWhere('company_id', null)->orderBy('id', 'asc');
// return $this->builder->where('company_id', auth()->user()->company()->id)->orWhere('company_id', null)->orderBy('id', 'asc');
/** @var \App\Models\User $user */
$user = auth()->user();
return $this->builder->where(function ($query) use($user){
$query->where('company_id', $user->company()->id)->orWhere('company_id', null)->orderBy('id', 'asc');
});
}

2
app/Services/Credit/CreditService.php
View File

@ -243,7 +243,7 @@ class CreditService
public function triggeredActions($request)
{
$this->invoice = (new TriggeredActions($this->credit, $request))->run();
$this->credit = (new TriggeredActions($this->credit, $request))->run();
return $this;
}

4
app/Services/Credit/TriggeredActions.php
View File

@ -61,6 +61,10 @@ class TriggeredActions extends AbstractService
$company->save();
}
if ($this->request->has('mark_paid') && $this->request->input('mark_paid') == 'true') {
$this->credit->service()->markPaid()->save();
}
return $this->credit;
}