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

include negative invoices in outstanding queries

This commit is contained in:
David Bomba 2024-12-05 20:38:19 +11:00
parent 971b989e57
commit fc16cb7ebd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Services/Chart/ChartQueries.php
View File

@ -218,6 +218,7 @@ trait ChartQueries
{ {
$user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id; $user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id;
// AND invoices.balance > 0
return DB::select(" return DB::select("
SELECT SELECT
@ -232,7 +233,7 @@ trait ChartQueries
AND clients.is_deleted = 0 AND clients.is_deleted = 0
{$user_filter} {$user_filter}
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND invoices.balance > 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
", ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ", ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
@ -242,7 +243,7 @@ trait ChartQueries
{ {
$user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id; $user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id;
//AND invoices.balance > 0
return DB::select(" return DB::select("
SELECT SELECT
SUM(invoices.balance / COALESCE(NULLIF(invoices.exchange_rate, 0), 1)) as amount, SUM(invoices.balance / COALESCE(NULLIF(invoices.exchange_rate, 0), 1)) as amount,
@ -255,7 +256,7 @@ trait ChartQueries
AND clients.is_deleted = 0 AND clients.is_deleted = 0
{$user_filter} {$user_filter}
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND invoices.balance > 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
", [ ", [
'company_id' => $this->company->id, 'company_id' => $this->company->id,