Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for chart queries

Browse Source
This commit is contained in:
David Bomba 2023-05-12 10:52:06 +10:00
parent 52cac9ddea
commit e1b5b8ef69
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,9 @@ trait ChartQueries
IFNULL(payments.currency_id, :company_currency) AS currency_id IFNULL(payments.currency_id, :company_currency) AS currency_id
FROM payments FROM payments
WHERE payments.status_id IN (4,5,6) WHERE payments.status_id IN (4,5,6)
AND (payments.date BETWEEN :start_date AND :end_date)
AND payments.company_id = :company_id AND payments.company_id = :company_id
AND payments.is_deleted = 0 AND payments.is_deleted = 0
AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY payments.date GROUP BY payments.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
'), [ '), [
@ -109,7 +109,7 @@ trait ChartQueries
SELECT SELECT
sum(invoices.balance) as amount, sum(invoices.balance) as amount,
count(invoices.id) as outstanding_count, count(invoices.id) as outstanding_count,
IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
FROM clients FROM clients
JOIN invoices JOIN invoices
on invoices.client_id = clients.id on invoices.client_id = clients.id
@ -128,8 +128,7 @@ trait ChartQueries
return DB::select(DB::raw(" return DB::select(DB::raw("
SELECT SELECT
sum(invoices.paid_to_date) as paid_to_date, sum(invoices.paid_to_date) as paid_to_date,
sum(invoices.amount) as invoiced_amount, IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id
FROM clients FROM clients
JOIN invoices JOIN invoices
on invoices.client_id = clients.id on invoices.client_id = clients.id
@ -143,21 +142,48 @@ trait ChartQueries
"), ['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]);
} }
public function getOutstandingChartQuery($start_date, $end_date, $currency_id)
{
return DB::select(DB::raw("
SELECT
sum(invoices.balance) as total,
invoices.date,
IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
FROM clients
JOIN invoices
on invoices.client_id = clients.id
WHERE invoices.status_id IN (2,3,4)
AND invoices.company_id = :company_id
AND clients.is_deleted = 0
AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.date
HAVING currency_id = :currency_id
"), [
'company_currency' => (int) $this->company->settings->currency_id,
'currency_id' => $currency_id,
'company_id' => $this->company->id,
'start_date' => $start_date,
'end_date' => $end_date,
]);
}
public function getInvoiceChartQuery($start_date, $end_date, $currency_id) public function getInvoiceChartQuery($start_date, $end_date, $currency_id)
{ {
return DB::select(DB::raw(" return DB::select(DB::raw("
SELECT SELECT
sum(invoices.amount) as total, sum(invoices.amount) as total,
invoices.date, invoices.date,
IFNULL(CAST(JSON_EXTRACT( settings, '$.currency_id' ) AS SIGNED), :company_currency) AS currency_id IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
FROM clients FROM clients
JOIN invoices JOIN invoices
on invoices.client_id = clients.id on invoices.client_id = clients.id
WHERE invoices.status_id IN (2,3,4) WHERE invoices.status_id IN (2,3,4)
AND (invoices.date BETWEEN :start_date AND :end_date)
AND invoices.company_id = :company_id AND invoices.company_id = :company_id
AND clients.is_deleted = 0 AND clients.is_deleted = 0
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.date GROUP BY invoices.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ "), [

1
app/Services/Chart/ChartService.php
View File

@ -75,6 +75,7 @@ class ChartService
foreach ($currencies as $key => $value) { foreach ($currencies as $key => $value) {
$data[$key]['invoices'] = $this->getInvoiceChartQuery($start_date, $end_date, $key); $data[$key]['invoices'] = $this->getInvoiceChartQuery($start_date, $end_date, $key);
// $data[$key]['outstanding'] = $this->getOutstandingChartQuery($start_date, $end_date, $key);
$data[$key]['payments'] = $this->getPaymentChartQuery($start_date, $end_date, $key); $data[$key]['payments'] = $this->getPaymentChartQuery($start_date, $end_date, $key);
$data[$key]['expenses'] = $this->getExpenseChartQuery($start_date, $end_date, $key); $data[$key]['expenses'] = $this->getExpenseChartQuery($start_date, $end_date, $key);
} }

2
app/Services/Report/ProfitLoss.php
View File

@ -237,7 +237,7 @@ class ProfitLoss
sum(invoices.total_taxes) as total_taxes, sum(invoices.total_taxes) as total_taxes,
(sum(invoices.total_taxes) / IFNULL(invoices.exchange_rate, 1)) AS net_converted_taxes, (sum(invoices.total_taxes) / IFNULL(invoices.exchange_rate, 1)) AS net_converted_taxes,
sum(invoices.amount - invoices.total_taxes) as net_amount, sum(invoices.amount - invoices.total_taxes) as net_amount,
IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id, IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
(sum(invoices.amount - invoices.total_taxes) / IFNULL(invoices.exchange_rate, 1)) AS net_converted_amount (sum(invoices.amount - invoices.total_taxes) / IFNULL(invoices.exchange_rate, 1)) AS net_converted_amount
FROM clients FROM clients
JOIN invoices JOIN invoices