markus/finanzen
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

bugfix if no results in subquery for BillDetails

Browse Source
This commit is contained in:
Markus 2023-11-03 21:20:36 +01:00
parent ae3ae2df5d
commit 77d4fd938c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/mBills.php
View File

@ -27,8 +27,11 @@ class mBills extends Model {
$quelle = model('App\Models\mAccounts'); $quelle = model('App\Models\mAccounts');
$this->where('datum >=', date( 'Y-m-d', strtotime($start))); $this->where('datum >=', date( 'Y-m-d', strtotime($start)));
$this->where('datum <=', date( 'Y-m-d', strtotime($ende))); $this->where('datum <=', date( 'Y-m-d', strtotime($ende)));
// alle Detailsbuchungen wo account id übereinstimmt
if ($source > 0) { if ($source > 0) {
$subs = $details->select('bill_id')->where('account_id',$source)->findAll(); $subs = $details->select('bill_id')->where('account_id',$source)->findAll();
// log_message('error', 'Get Entries Det {msg}', ['msg'=>(string)$this->db->getLastQuery()]);
if (0 < sizeof($subs)){
$keys=array(); $keys=array();
foreach ($subs as $value) { foreach ($subs as $value) {
$keys[] = intval($value->bill_id); $keys[] = intval($value->bill_id);
@ -37,8 +40,17 @@ class mBills extends Model {
$this->where('source_id', $source ); $this->where('source_id', $source );
$this->orWhereIn('id', $keys ); $this->orWhereIn('id', $keys );
$this->groupEnd(); $this->groupEnd();
} else {
$this->where('source_id', $source );
} }
}
$result = $this->orderBy('datum','desc')->where('lkz',null)->findAll(); $result = $this->orderBy('datum','desc')->where('lkz',null)->findAll();
if (0 == sizeof($result)){
return $result;
}
$keys=array(); $keys=array();
foreach ($result as $value) { foreach ($result as $value) {
$keys[] = intval($value->id); $keys[] = intval($value->id);