Skip to content

Commit 829e420

Browse files
author
FastAct
authored
Merge branch 'Blair2004:master' into master
2 parents e5a1d3e + 7053172 commit 829e420

File tree

3 files changed

+2215
-2073
lines changed

3 files changed

+2215
-2073
lines changed

app/Models/RolePermission.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ class RolePermission extends NsRootModel
1111
protected $table = 'nexopos_role_permission';
1212

1313
public $timestamps = false;
14-
}
14+
15+
public $incrementing = false;
16+
}

app/Services/OrdersService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2825,6 +2825,7 @@ public function getPaymentTypesReport( $startRange, $endRange )
28252825
$payments = OrderPayment::where( 'created_at', '>=', $startRange )
28262826
->where( 'created_at', '<=', $endRange )
28272827
->whereIn( 'identifier', $paymentsIdentifier )
2828+
->whereRelation('order', 'payment_status', Order::PAYMENT_PAID)
28282829
->get();
28292830

28302831
$total = $payments->map( fn( $payment ) => $payment->value )->sum();

0 commit comments

Comments
 (0)