kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues 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
2 changed files with 13 additions and 10 deletions
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 private function getBalanceInformation(Carbon $start, Carbon $end): array
{ {
$return = []; $object = new SummaryBalanceGrouped();
$currencies = []; $default = app('amount')->getDefaultCurrency();
$object = new SummaryBalanceGrouped();
$default = app('amount')->getDefaultCurrency();
$object->setDefault($default); $object->setDefault($default);
/** @var User $user */ /** @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\Models\TransactionCurrency;
use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
use Log;
class SummaryBalanceGrouped class SummaryBalanceGrouped
{ {
@@ -49,13 +50,16 @@ class SummaryBalanceGrouped
*/ */
public function groupTransactions(string $key, array $journals): void 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(); $converter = new ExchangeRateConverter();
$this->keys[] = $key; $this->keys[] = $key;
$multiplier = 'income' === $key ? '-1' : '1';
/** @var array $journal */ /** @var array $journal */
foreach ($journals as $journal) { foreach ($journals as $journal) {
// transaction info: // transaction info:
$currencyId = (int)$journal['currency_id']; $currencyId = (int)$journal['currency_id'];
$amount = $journal['amount']; $amount = bcmul($journal['amount'], $multiplier);
$currency = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId); $currency = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
$currencies[$currencyId] = $currency; $currencies[$currencyId] = $currency;
$nativeAmount = $converter->convert($currency, $this->default, $journal['date'], $amount); $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[self::SUM][$currencyId] = bcadd($this->amounts[self::SUM][$currencyId], $amount);
$this->amounts[$key]['native'] = bcadd($this->amounts[$key]['native'], $nativeAmount); $this->amounts[$key]['native'] = bcadd($this->amounts[$key]['native'], $nativeAmount);
$this->amounts[self::SUM]['native'] = bcadd($this->amounts[self::SUM]['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 public function groupData(): array
{ {
Log::debug('Now going to group data.');
$return = []; $return = [];
foreach ($this->keys as $key) { foreach ($this->keys as $key) {
$title = match ($key) { $title = match ($key) {
@@ -91,10 +99,9 @@ class SummaryBalanceGrouped
'income' => 'earned', 'income' => 'earned',
default => 'something' default => 'something'
}; };
$amount = 'income' === $key ? bcsub($this->amounts[$key]['native'], '-1') : $this->amounts[$key]['native'];
$return[] = [ $return[] = [
'key' => sprintf('%s-in-native', $title), 'key' => sprintf('%s-in-native', $title),
'value' => $amount, 'value' => $this->amounts[$key]['native'],
'currency_id' => (string)$this->default->id, 'currency_id' => (string)$this->default->id,
'currency_code' => $this->default->code, 'currency_code' => $this->default->code,
'currency_symbol' => $this->default->symbol, 'currency_symbol' => $this->default->symbol,
@@ -118,11 +125,9 @@ class SummaryBalanceGrouped
'income' => 'earned', 'income' => 'earned',
default => 'something' default => 'something'
}; };
$amount = $this->amounts[$key][$currencyId] ?? '0';
$amount = 'income' === $key ? bcsub($amount, '-1') : $amount;
$return[] = [ $return[] = [
'key' => sprintf('%s-in-%s', $title, $currency->code), 'key' => sprintf('%s-in-%s', $title, $currency->code),
'value' => $amount, 'value' => $this->amounts[$key][$currencyId] ?? '0',
'currency_id' => (string)$currency->id, 'currency_id' => (string)$currency->id,
'currency_code' => $currency->code, 'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol, 'currency_symbol' => $currency->symbol,