Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for upcoming and past due invoice queries

This commit is contained in:
David Bomba 2025-03-19 11:03:50 +11:00
parent 8115cf1a9e
commit 3b73c4bb05
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filters/InvoiceFilters.php
View File

@ -167,7 +167,9 @@ class InvoiceFilters extends QueryFilters
$query->whereNull('due_date') $query->whereNull('due_date')
->orWhere(function ($q) { ->orWhere(function ($q) {
$q->where('due_date', '>=', now()->startOfDay()->subSecond())->where('partial', 0); $q->where('due_date', '>=', now()->startOfDay()->subSecond())->where(function ($qq){
$qq->where('partial', 0)->orWhere('balance', '>', 0);
});
}) })
->orWhere(function ($q) { ->orWhere(function ($q) {
$q->where('partial_due_date', '>=', now()->startOfDay()->subSecond())->where('partial', '>', 0); $q->where('partial_due_date', '>=', now()->startOfDay()->subSecond())->where('partial', '>', 0);
@ -193,8 +195,8 @@ class InvoiceFilters extends QueryFilters
->where('is_deleted', 0) ->where('is_deleted', 0)
->where('balance', '>', 0) ->where('balance', '>', 0)
->where(function ($query) { ->where(function ($query) {
$query->where('due_date', '<', now()) $query->where('due_date', '<', now()->startOfDay()->addDay())
->orWhere('partial_due_date', '<', now()); ->orWhere('partial_due_date', '<', now()->startOfDay()->addDay());
}) })
->orderBy('due_date', 'ASC'); ->orderBy('due_date', 'ASC');
}); });

2
app/Http/Controllers/SubscriptionController.php
View File

@ -345,7 +345,7 @@ class SubscriptionController extends BaseController
* ), * ),
* ) * )
*/ */
public function update(UpdateSubscriptionRequest $request, Subscription $subscription): \Illuminate\Http\Response public function update(UpdateSubscriptionRequest $request, Subscription $subscription)
{ {
if ($request->entityIsDeleted($subscription)) { if ($request->entityIsDeleted($subscription)) {
return $request->disallowUpdate(); return $request->disallowUpdate();