kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #3475

Browse Source
This commit is contained in:
James Cole
2020-08-06 20:08:04 +02:00
parent ed0f04d644
commit eb256fced6
3 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app/Repositories/Bill/BillRepository.php
View File

@@ -50,6 +50,7 @@ use Storage;
class BillRepository implements BillRepositoryInterface class BillRepository implements BillRepositoryInterface
{ {
use CreatesObjectGroups; use CreatesObjectGroups;
private User $user; private User $user;
/** /**
@@ -387,26 +388,46 @@ class BillRepository implements BillRepositoryInterface
/** /**
* @param Bill $bill * @param Bill $bill
* *
* @return string * @return array
*/ */
public function getOverallAverage(Bill $bill): string public function getOverallAverage(Bill $bill): array
{ {
/** @var JournalRepositoryInterface $repos */ /** @var JournalRepositoryInterface $repos */
$repos = app(JournalRepositoryInterface::class); $repos = app(JournalRepositoryInterface::class);
$repos->setUser($this->user); $repos->setUser($this->user);
// get and sort on currency
$result = [];
$journals = $bill->transactionJournals()->get(); $journals = $bill->transactionJournals()->get();
$sum = '0';
$count = (string)$journals->count();
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($journals as $journal) { foreach ($journals as $journal) {
$sum = bcadd($sum, $repos->getJournalTotal($journal)); /** @var Transaction $transaction */
} $transaction = $journal->transactions()->where('amount', '<', 0)->first();
$avg = '0'; $currencyId = (int) $journal->transaction_currency_id;
if ($journals->count() > 0) { $currency = $journal->transactionCurrency;
$avg = bcdiv($sum, $count); $result[$currencyId] = $result[$currencyId] ?? [
'sum' => '0',
'count' => 0,
'avg' => '0',
'currency_id' => $currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
];
$result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], $transaction->amount);
$result[$currencyId]['count']++;
} }
return $avg; // after loop, re-loop for avg.
/**
* @var int $currencyId
* @var array $arr
*/
foreach ($result as $currencyId => $arr) {
$result[$currencyId]['avg'] = bcdiv($arr['sum'], (string) $arr['count']);
}
return $result;
} }
/** /**
@@ -535,30 +556,50 @@ class BillRepository implements BillRepositoryInterface
* @param Bill $bill * @param Bill $bill
* @param Carbon $date * @param Carbon $date
* *
* @return string * @return array
*/ */
public function getYearAverage(Bill $bill, Carbon $date): string public function getYearAverage(Bill $bill, Carbon $date): array
{ {
/** @var JournalRepositoryInterface $repos */ /** @var JournalRepositoryInterface $repos */
$repos = app(JournalRepositoryInterface::class); $repos = app(JournalRepositoryInterface::class);
$repos->setUser($this->user); $repos->setUser($this->user);
// get and sort on currency
$result = [];
$journals = $bill->transactionJournals() $journals = $bill->transactionJournals()
->where('date', '>=', $date->year . '-01-01 00:00:00') ->where('date', '>=', $date->year . '-01-01 00:00:00')
->where('date', '<=', $date->year . '-12-31 23:59:59') ->where('date', '<=', $date->year . '-12-31 23:59:59')
->get(); ->get();
$sum = '0';
$count = (string)$journals->count();
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($journals as $journal) { foreach ($journals as $journal) {
$sum = bcadd($sum, $repos->getJournalTotal($journal)); /** @var Transaction $transaction */
} $transaction = $journal->transactions()->where('amount', '<', 0)->first();
$avg = '0'; $currencyId = (int) $journal->transaction_currency_id;
if ($journals->count() > 0) { $currency = $journal->transactionCurrency;
$avg = bcdiv($sum, $count); $result[$currencyId] = $result[$currencyId] ?? [
'sum' => '0',
'count' => 0,
'avg' => '0',
'currency_id' => $currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
];
$result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], $transaction->amount);
$result[$currencyId]['count']++;
} }
return $avg; // after loop, re-loop for avg.
/**
* @var int $currencyId
* @var array $arr
*/
foreach ($result as $currencyId => $arr) {
$result[$currencyId]['avg'] = bcdiv($arr['sum'], (string) $arr['count']);
}
return $result;
} }
/** /**

8
app/Repositories/Bill/BillRepositoryInterface.php
View File

@@ -198,9 +198,9 @@ interface BillRepositoryInterface
/** /**
* @param Bill $bill * @param Bill $bill
* *
* @return string * @return array
*/ */
public function getOverallAverage(Bill $bill): string; public function getOverallAverage(Bill $bill): array;
/** /**
* @param int $size * @param int $size
@@ -254,9 +254,9 @@ interface BillRepositoryInterface
* @param Bill $bill * @param Bill $bill
* @param Carbon $date * @param Carbon $date
* *
* @return string * @return array
*/ */
public function getYearAverage(Bill $bill, Carbon $date): string; public function getYearAverage(Bill $bill, Carbon $date): array;
/** /**
* Link a set of journals to a bill. * Link a set of journals to a bill.

12
resources/views/v1/bills/show.twig
View File

@@ -55,11 +55,19 @@
</tr> </tr>
<tr> <tr>
<td>{{ trans('firefly.average_bill_amount_year', {year: year}) }}</td> <td>{{ trans('firefly.average_bill_amount_year', {year: year}) }}</td>
<td>{{ formatAmountByCurrency(object.data.currency,yearAverage) }}</td> <td>
{% for avg in yearAverage %}
{{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}<br>
{% endfor %}
</td>
</tr> </tr>
<tr> <tr>
<td>{{ 'average_bill_amount_overall'|_ }}</td> <td>{{ 'average_bill_amount_overall'|_ }}</td>
<td>{{ formatAmountByCurrency(object.data.currency, overallAverage) }}</td> <td>
{% for avg in overallAverage %}
{{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}<br>
{% endfor %}
</td>
</tr> </tr>
</table> </table>
</div> </div>