IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues.

Browse Source
This commit is contained in:
James Cole 2023-12-20 07:42:44 +01:00
parent 5ecc1929f9
commit ee41eadcd9
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V2/Controllers/Summary/BasicController.php
View File

@ -126,10 +126,8 @@ class BasicController extends Controller
*/
private function getBalanceInformation(Carbon $start, Carbon $end): array
{
$return = [];
$currencies = [];
$object = new SummaryBalanceGrouped();
$default = app('amount')->getDefaultCurrency();
$object = new SummaryBalanceGrouped();
$default = app('amount')->getDefaultCurrency();
$object->setDefault($default);
/** @var User $user */

17
app/Support/Http/Api/SummaryBalanceGrouped.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Support\Http\Api;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
use Log;
class SummaryBalanceGrouped
{
@ -49,13 +50,16 @@ class SummaryBalanceGrouped
*/
public function groupTransactions(string $key, array $journals): void
{
Log::debug(sprintf('Now in groupTransactions with key "%s" and %d journal(s)', $key, count($journals)));
$converter = new ExchangeRateConverter();
$this->keys[] = $key;
$multiplier = 'income' === $key ? '-1' : '1';
/** @var array $journal */
foreach ($journals as $journal) {
// transaction info:
$currencyId = (int)$journal['currency_id'];
$amount = $journal['amount'];
$amount = bcmul($journal['amount'], $multiplier);
$currency = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
$currencies[$currencyId] = $currency;
$nativeAmount = $converter->convert($currency, $this->default, $journal['date'], $amount);
@ -75,7 +79,10 @@ class SummaryBalanceGrouped
$this->amounts[self::SUM][$currencyId] = bcadd($this->amounts[self::SUM][$currencyId], $amount);
$this->amounts[$key]['native'] = bcadd($this->amounts[$key]['native'], $nativeAmount);
$this->amounts[self::SUM]['native'] = bcadd($this->amounts[self::SUM]['native'], $nativeAmount);
}
app('log')->debug(sprintf('this->amounts[%s][native] is now %s', $key, $this->amounts[$key]['native']));
app('log')->debug(sprintf('this->amounts[%s][native] is now %s', self::SUM, $this->amounts[$key]['native']));
}
/**
@ -83,6 +90,7 @@ class SummaryBalanceGrouped
*/
public function groupData(): array
{
Log::debug('Now going to group data.');
$return = [];
foreach ($this->keys as $key) {
$title = match ($key) {
@ -91,10 +99,9 @@ class SummaryBalanceGrouped
'income' => 'earned',
default => 'something'
};
$amount = 'income' === $key ? bcsub($this->amounts[$key]['native'], '-1') : $this->amounts[$key]['native'];
$return[] = [
'key' => sprintf('%s-in-native', $title),
'value' => $amount,
'value' => $this->amounts[$key]['native'],
'currency_id' => (string)$this->default->id,
'currency_code' => $this->default->code,
'currency_symbol' => $this->default->symbol,
@ -118,11 +125,9 @@ class SummaryBalanceGrouped
'income' => 'earned',
default => 'something'
};
$amount = $this->amounts[$key][$currencyId] ?? '0';
$amount = 'income' === $key ? bcsub($amount, '-1') : $amount;
$return[] = [
'key' => sprintf('%s-in-%s', $title, $currency->code),
'value' => $amount,
'value' => $this->amounts[$key][$currencyId] ?? '0',
'currency_id' => (string)$currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,