Merge pull request #10673 from firefly-iii/release-1753936796

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
@@ -110,25 +111,7 @@ class BudgetController extends Controller
     {
         // get all limits:
         $limits   = $this->blRepository->getBudgetLimits($budget, $start, $end);
-
-        //      'currency_id' => string '1' (length=1)
-        //      'currency_code' => string 'EUR' (length=3)
-        //      'currency_name' => string 'Euro' (length=4)
-        //      'currency_symbol' => string '€' (length=3)
-        //      'currency_decimal_places' => int 2
-        //      'start' => string '2025-07-01T00:00:00+02:00' (length=25)
-        //      'end' => string '2025-07-31T23:59:59+02:00' (length=25)
-        //      'budgeted' => string '100.000000000000' (length=16)
-        //      'spent' => string '-421.230000000000' (length=17)
-        //      'left' => string '0' (length=1)
-        //      'overspent' => string '321.230000000000' (length=16)
-
-
         $rows     = [];
-
-        // instead of using the budget limits as a thing to collect all expenses,
-        // use the budget range itself to collect and group them,
-        // AND THEN add budgeted amounts from the limits to the rows.
         $spent    = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
         $expenses = $this->processExpenses($budget->id, $spent, $start, $end);
 
@@ -294,12 +277,36 @@ class BudgetController extends Controller
 
     private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
     {
-        foreach ($limits as $limit) {
-            if ($limit->transaction_currency_id === $currencyId) {
-                return $limit;
+        $amount    = '0';
+        $limit     = null;
+        $converter = new ExchangeRateConverter();
+
+        /** @var BudgetLimit $current */
+        foreach ($limits as $current) {
+            if (true === $this->convertToNative) {
+                if ($current->transaction_currency_id === $this->nativeCurrency->id) {
+                    // simply add it.
+                    $amount = bcadd($amount, (string)$current->amount);
+                    Log::debug(sprintf('Set amount in limit to %s', $amount));
+                }
+                if ($current->transaction_currency_id !== $this->nativeCurrency->id) {
+                    // convert and then add it.
+                    $converted = $converter->convert($current->transactionCurrency, $this->nativeCurrency, $limit->start_date, $limit->amount);
+                    $amount    = bcadd($amount, $converted);
+                    Log::debug(sprintf('Budgeted in limit #%d: %s %s, converted to %s %s', $current->id, $current->transactionCurrency->code, $current->amount, $this->nativeCurrency->code, $converted));
+                    Log::debug(sprintf('Set amount in limit to %s', $amount));
+                }
+            }
+            if ($current->transaction_currency_id === $currencyId) {
+                $limit = $current;
             }
         }
+        if (null !== $limit && true === $this->convertToNative) {
+            // convert and add all amounts.
+            $limit->amount = app('steam')->positive($amount);
+            Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
+        }
 
-        return null;
+        return $limit;
     }
 }

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -25,17 +25,20 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
-use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BudgetController
@@ -45,6 +48,8 @@ class CategoryController extends Controller
     use CleansChartData;
     use ValidatesUserGroupTrait;
 
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
     private AccountRepositoryInterface  $accountRepos;
     private CurrencyRepositoryInterface $currencyRepos;
 
@@ -79,9 +84,10 @@ class CategoryController extends Controller
 
         /** @var Carbon $end */
         $end        = $this->parameters->get('end');
-        $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);
+        $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value]);
         $currencies = [];
         $return     = [];
+        $converter  = new ExchangeRateConverter();
 
         // get journals for entire period:
         /** @var GroupCollectorInterface $collector */
@@ -93,20 +99,40 @@ class CategoryController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $currencyId              = (int) $journal['currency_id'];
-            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
-            $currencies[$currencyId] = $currency;
-            $categoryName            = $journal['category_name'] ?? (string) trans('firefly.no_category');
-            $amount                  = app('steam')->positive($journal['amount']);
-            $key                     = sprintf('%s-%s', $categoryName, $currency->code);
+            // find journal:
+            $journalCurrencyId              = (int)$journal['currency_id'];
+            $currency                       = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
+            $currencies[$journalCurrencyId] = $currency;
+            $currencyId                     = (int)$currency->id;
+            $currencyName                   = (string)$currency->name;
+            $currencyCode                   = (string)$currency->code;
+            $currencySymbol                 = (string)$currency->symbol;
+            $currencyDecimalPlaces          = (int)$currency->decimal_places;
+            $amount                         = app('steam')->positive($journal['amount']);
+
+            // overrule if necessary:
+            if ($this->convertToNative && $journalCurrencyId !== $this->nativeCurrency->id) {
+                $currencyId            = (int)$this->nativeCurrency->id;
+                $currencyName          = (string)$this->nativeCurrency->name;
+                $currencyCode          = (string)$this->nativeCurrency->code;
+                $currencySymbol        = (string)$this->nativeCurrency->symbol;
+                $currencyDecimalPlaces = (int)$this->nativeCurrency->decimal_places;
+                $convertedAmount       = $converter->convert($currency, $this->nativeCurrency, $journal['date'], $amount);
+                Log::debug(sprintf('Converted %s %s to %s %s', $journal['currency_code'], $amount, $this->nativeCurrency->code, $convertedAmount));
+                $amount                = $convertedAmount;
+            }
+
+
+            $categoryName                   = $journal['category_name'] ?? (string)trans('firefly.no_category');
+            $key                            = sprintf('%s-%s', $categoryName, $currencyCode);
             // create arrays
             $return[$key] ??= [
                 'label'                   => $categoryName,
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_name'           => $currency->name,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
+                'currency_id'             => (string)$currencyId,
+                'currency_code'           => $currencyCode,
+                'currency_name'           => $currencyName,
+                'currency_symbol'         => $currencySymbol,
+                'currency_decimal_places' => $currencyDecimalPlaces,
                 'period'                  => null,
                 'start'                   => $start->toAtomString(),
                 'end'                     => $end->toAtomString(),
@@ -114,12 +140,12 @@ class CategoryController extends Controller
             ];
 
             // add monies
-            $return[$key]['amount']  = bcadd($return[$key]['amount'], (string) $amount);
+            $return[$key]['amount']         = bcadd($return[$key]['amount'], (string)$amount);
         }
         $return     = array_values($return);
 
         // order by amount
-        usort($return, static fn (array $a, array $b) => (float) $a['amount'] < (float) $b['amount'] ? 1 : -1);
+        usort($return, static fn (array $a, array $b) => (float)$a['amount'] < (float)$b['amount'] ? 1 : -1);
 
         return response()->json($this->clean($return));
     }

app/Api/V1/Controllers/Models/Bill/ShowController.php

@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;
 use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -76,6 +78,15 @@ class ShowController extends Controller
         $bills       = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator   = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new SubscriptionEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $bills       = $enrichment->enrich($bills);
+
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
         $transformer->setParameters($this->parameters);

app/Repositories/Budget/OperationsRepository.php

@@ -24,14 +24,16 @@ declare(strict_types=1);
 
 namespace FireflyIII\Repositories\Budget;
 
-use Deprecated;
 use Carbon\Carbon;
+use Deprecated;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
@@ -55,17 +57,17 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         $total = '0';
         $count = 0;
         foreach ($budget->budgetlimits as $limit) {
-            $diff   = (int) $limit->start_date->diffInDays($limit->end_date, true);
+            $diff   = (int)$limit->start_date->diffInDays($limit->end_date, true);
             $diff   = 0 === $diff ? 1 : $diff;
             $amount = $limit->amount;
-            $perDay = bcdiv((string) $amount, (string) $diff);
+            $perDay = bcdiv((string)$amount, (string)$diff);
             $total  = bcadd($total, $perDay);
             ++$count;
             app('log')->debug(sprintf('Found %d budget limits. Per day is %s, total is %s', $count, $perDay, $total));
         }
         $avg   = $total;
         if ($count > 0) {
-            $avg = bcdiv($total, (string) $count);
+            $avg = bcdiv($total, (string)$count);
         }
         app('log')->debug(sprintf('%s / %d = %s = average.', $total, $count, $avg));
 
@@ -93,9 +95,9 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         /** @var array $journal */
         foreach ($journals as $journal) {
             // prep data array for currency:
-            $budgetId                     = (int) $journal['budget_id'];
+            $budgetId                     = (int)$journal['budget_id'];
             $budgetName                   = $journal['budget_name'];
-            $currencyId                   = (int) $journal['currency_id'];
+            $currencyId                   = (int)$journal['currency_id'];
             $key                          = sprintf('%d-%d', $budgetId, $currencyId);
 
             $data[$key] ??= [
@@ -110,7 +112,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
                 'entries'                 => [],
             ];
             $date                         = $journal['date']->format($carbonFormat);
-            $data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date] ?? '0', (string) $journal['amount']);
+            $data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date] ?? '0', (string)$journal['amount']);
         }
 
         return $data;
@@ -124,7 +126,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
     public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array
     {
         /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector             = app(GroupCollectorInterface::class);
         $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
         if ($accounts instanceof Collection && $accounts->count() > 0) {
             $collector->setAccounts($accounts);
@@ -136,15 +138,41 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
             $collector->setBudgets($this->getBudgets());
         }
         $collector->withBudgetInformation()->withAccountInformation()->withCategoryInformation();
-        $journals  = $collector->getExtractedJournals();
-        $array     = [];
+        $journals              = $collector->getExtractedJournals();
+        $array                 = [];
+
+        // if needs conversion to native.
+        $convertToNative       = Amount::convertToNative($this->user);
+        $nativeCurrency        = Amount::getNativeCurrencyByUserGroup($this->userGroup);
+        $currencyId            = (int) $nativeCurrency->id;
+        $currencyCode          = $nativeCurrency->code;
+        $currencyName          = $nativeCurrency->name;
+        $currencySymbol        = $nativeCurrency->symbol;
+        $currencyDecimalPlaces = $nativeCurrency->decimal_places;
+        $converter             = new ExchangeRateConverter();
+        $currencies            = [
+            $currencyId => $nativeCurrency,
+        ];
 
         foreach ($journals as $journal) {
-            $currencyId                                                                   = (int) $journal['currency_id'];
-            $budgetId                                                                     = (int) $journal['budget_id'];
-            $budgetName                                                                   = (string) $journal['budget_name'];
+            $amount                                                                       = app('steam')->negative($journal['amount']);
+            $journalCurrencyId                                                            = (int)$journal['currency_id'];
+            if (false === $convertToNative) {
+                $currencyId            = $journalCurrencyId;
+                $currencyName          = $journal['currency_name'];
+                $currencySymbol        = $journal['currency_symbol'];
+                $currencyCode          = $journal['currency_code'];
+                $currencyDecimalPlaces = $journal['currency_decimal_places'];
+            }
+            if (true === $convertToNative && $journalCurrencyId !== $currencyId) {
+                $currencies[$journalCurrencyId] ??= TransactionCurrency::find($journalCurrencyId);
+                $amount = $converter->convert($currencies[$journalCurrencyId], $nativeCurrency, $journal['date'], $amount);
+            }
 
-            // catch "no category" entries.
+            $budgetId                                                                     = (int)$journal['budget_id'];
+            $budgetName                                                                   = (string)$journal['budget_name'];
+
+            // catch "no budget" entries.
             if (0 === $budgetId) {
                 continue;
             }
@@ -153,10 +181,10 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
             $array[$currencyId]                       ??= [
                 'budgets'                 => [],
                 'currency_id'             => $currencyId,
-                'currency_name'           => $journal['currency_name'],
-                'currency_symbol'         => $journal['currency_symbol'],
-                'currency_code'           => $journal['currency_code'],
-                'currency_decimal_places' => $journal['currency_decimal_places'],
+                'currency_name'           => $currencyName,
+                'currency_symbol'         => $currencySymbol,
+                'currency_code'           => $currencyCode,
+                'currency_decimal_places' => $currencyDecimalPlaces,
             ];
 
             // info about the categories:
@@ -168,9 +196,9 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
 
             // add journal to array:
             // only a subset of the fields.
-            $journalId                                                                    = (int) $journal['transaction_journal_id'];
+            $journalId                                                                    = (int)$journal['transaction_journal_id'];
             $array[$currencyId]['budgets'][$budgetId]['transaction_journals'][$journalId] = [
-                'amount'                   => app('steam')->negative($journal['amount']),
+                'amount'                   => $amount,
                 'destination_account_id'   => $journal['destination_account_id'],
                 'destination_account_name' => $journal['destination_account_name'],
                 'source_account_id'        => $journal['source_account_id'],

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -0,0 +1,160 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\JsonApi\Enrichments;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Note;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class SubscriptionEnrichment implements EnrichmentInterface
+{
+    private User                $user;
+    private UserGroup           $userGroup;
+    private Collection          $collection;
+    private bool                $convertToNative = false;
+    private array $subscriptionIds               = [];
+    private array $objectGroups                  = [];
+    private array $mappedObjects                 = [];
+    private array $notes                         = [];
+    private TransactionCurrency $nativeCurrency;
+
+    public function enrich(Collection $collection): Collection
+    {
+        $this->collection = $collection;
+        $this->collectSubscriptionIds();
+        $this->collectNotes();
+        $this->collectObjectGroups();
+
+        $notes            = $this->notes;
+        $objectGroups     = $this->objectGroups;
+        $this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups) {
+            $id            = (int) $item->id;
+            $currency      = $item->transactionCurrency;
+            $meta          = [
+                'notes'              => null,
+                'object_group_id'    => null,
+                'object_group_title' => null,
+                'object_group_order' => null,
+            ];
+            $amounts       = [
+                'amount_min' => Steam::bcround($item->amount_min, $currency->decimal_places),
+                'amount_max' => Steam::bcround($item->amount_max, $currency->decimal_places),
+                'average'    => Steam::bcround(bcdiv(bcadd($item->amount_min, $item->amount_max), '2'), $currency->decimal_places),
+            ];
+
+            // add object group if available
+            if (array_key_exists($id, $this->mappedObjects)) {
+                $key                        = $this->mappedObjects[$id];
+                $meta['object_group_id']    = $objectGroups[$key]['id'];
+                $meta['object_group_title'] = $objectGroups[$key]['title'];
+                $meta['object_group_order'] = $objectGroups[$key]['order'];
+            }
+
+            // Add notes if available.
+            if (array_key_exists($item->id, $notes)) {
+                $meta['notes'] = $notes[$item->id];
+            }
+
+            // Convert amounts to native currency if needed
+            if ($this->convertToNative && $item->currency_id !== $this->nativeCurrency->id) {
+                $converter          = new ExchangeRateConverter();
+                $amounts            = [
+                    'amount_min' => Steam::bcround($converter->convert($item->transactionCurrency, $this->nativeCurrency, today(), $item->amount_min), $this->nativeCurrency->decimal_places),
+                    'amount_max' => Steam::bcround($converter->convert($item->transactionCurrency, $this->nativeCurrency, today(), $item->amount_max), $this->nativeCurrency->decimal_places),
+                ];
+                $amounts['average'] = Steam::bcround(bcdiv(bcadd($amounts['amount_min'], $amounts['amount_max']), '2'), $this->nativeCurrency->decimal_places);
+            }
+            $item->amounts = $amounts;
+            $item->meta    = $meta;
+
+            return $item;
+        });
+
+        return $collection;
+    }
+
+    public function enrichSingle(array|Model $model): array|Model
+    {
+        Log::debug(__METHOD__);
+        $collection = new Collection([$model]);
+        $collection = $this->enrich($collection);
+
+        return $collection->first();
+    }
+
+    private function collectNotes(): void
+    {
+        $notes = Note::query()->whereIn('noteable_id', $this->subscriptionIds)
+            ->whereNotNull('notes.text')
+            ->where('notes.text', '!=', '')
+            ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray()
+        ;
+        foreach ($notes as $note) {
+            $this->notes[(int) $note['noteable_id']] = (string) $note['text'];
+        }
+        Log::debug(sprintf('Enrich with %d note(s)', count($this->notes)));
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user      = $user;
+        $this->userGroup = $user->userGroup;
+    }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+    }
+
+    public function setConvertToNative(bool $convertToNative): void
+    {
+        $this->convertToNative = $convertToNative;
+    }
+
+    public function setNative(TransactionCurrency $nativeCurrency): void
+    {
+        $this->nativeCurrency = $nativeCurrency;
+    }
+
+    private function collectSubscriptionIds(): void
+    {
+        /** @var Bill $bill */
+        foreach ($this->collection as $bill) {
+            $this->subscriptionIds[] = (int) $bill->id;
+        }
+        $this->subscriptionIds = array_unique($this->subscriptionIds);
+    }
+
+    private function collectObjectGroups(): void
+    {
+        $set    = DB::table('object_groupables')
+            ->whereIn('object_groupable_id', $this->subscriptionIds)
+            ->where('object_groupable_type', Bill::class)
+            ->get(['object_groupable_id', 'object_group_id'])
+        ;
+
+        $ids    = array_unique($set->pluck('object_group_id')->toArray());
+
+        foreach ($set as $entry) {
+            $this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;
+        }
+
+        $groups = ObjectGroup::whereIn('id', $ids)->get(['id', 'title', 'order'])->toArray();
+        foreach ($groups as $group) {
+            $group['id']                           = (int) $group['id'];
+            $group['order']                        = (int) $group['order'];
+            $this->objectGroups[(int)$group['id']] = $group;
+        }
+    }
+}

app/Transformers/BillTransformer.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Transformers;
 use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -44,7 +43,7 @@ class BillTransformer extends AbstractTransformer
 {
     private readonly BillDateCalculator      $calculator;
     private readonly bool                    $convertToNative;
-    private readonly TransactionCurrency     $default;
+    private readonly TransactionCurrency     $native;
     private readonly BillRepositoryInterface $repository;
 
     /**
@@ -54,7 +53,7 @@ class BillTransformer extends AbstractTransformer
     {
         $this->repository      = app(BillRepositoryInterface::class);
         $this->calculator      = app(BillDateCalculator::class);
-        $this->default         = Amount::getNativeCurrency();
+        $this->native          = Amount::getNativeCurrency();
         $this->convertToNative = Amount::convertToNative();
     }
 
@@ -66,28 +65,14 @@ class BillTransformer extends AbstractTransformer
      */
     public function transform(Bill $bill): array
     {
-        $default           = $this->parameters->get('defaultCurrency') ?? $this->default;
-
         $paidData          = $this->paidData($bill);
         $lastPaidDate      = $this->getLastPaidDate($paidData);
         $start             = $this->parameters->get('start') ?? today()->subYears(10);
         $end               = $this->parameters->get('end') ?? today()->addYears(10);
         $payDates          = $this->calculator->getPayDates($start, $end, $bill->date, $bill->repeat_freq, $bill->skip, $lastPaidDate);
         $currency          = $bill->transactionCurrency;
-        $notes             = $this->repository->getNoteText($bill);
-        $notes             = '' === $notes ? null : $notes;
-        $objectGroupId     = null;
-        $objectGroupOrder  = null;
-        $objectGroupTitle  = null;
         $this->repository->setUser($bill->user);
 
-        /** @var null|ObjectGroup $objectGroup */
-        $objectGroup       = $bill->objectGroups->first();
-        if (null !== $objectGroup) {
-            $objectGroupId    = $objectGroup->id;
-            $objectGroupOrder = $objectGroup->order;
-            $objectGroupTitle = $objectGroup->title;
-        }
 
         $paidDataFormatted = [];
         $payDatesFormatted = [];
@@ -156,15 +141,16 @@ class BillTransformer extends AbstractTransformer
             'currency_code'                  => $currency->code,
             'currency_symbol'                => $currency->symbol,
             'currency_decimal_places'        => $currency->decimal_places,
-            'native_currency_id'             => null === $default ? null : (string)$default->id,
-            'native_currency_code'           => $default?->code,
-            'native_currency_symbol'         => $default?->symbol,
-            'native_currency_decimal_places' => $default?->decimal_places,
+
+            'native_currency_id'             => (string)$this->native->id,
+            'native_currency_code'           => $this->native->code,
+            'native_currency_symbol'         => $this->native->symbol,
+            'native_currency_decimal_places' => $this->native->decimal_places,
+
             'name'                           => $bill->name,
-            'amount_min'                     => app('steam')->bcround($bill->amount_min, $currency->decimal_places),
-            'amount_max'                     => app('steam')->bcround($bill->amount_max, $currency->decimal_places),
-            'native_amount_min'              => $this->convertToNative ? app('steam')->bcround($bill->native_amount_min, $default->decimal_places) : null,
-            'native_amount_max'              => $this->convertToNative ? app('steam')->bcround($bill->native_amount_max, $default->decimal_places) : null,
+            'amount_min'                     => $bill->amounts['amount_min'],
+            'amount_max'                     => $bill->amounts['amount_max'],
+            'amount_avg'                     => $bill->amounts['average'],
             'date'                           => $bill->date->toAtomString(),
             'end_date'                       => $bill->end_date?->toAtomString(),
             'extension_date'                 => $bill->extension_date?->toAtomString(),
@@ -172,16 +158,16 @@ class BillTransformer extends AbstractTransformer
             'skip'                           => $bill->skip,
             'active'                         => $bill->active,
             'order'                          => $bill->order,
-            'notes'                          => $notes,
-            'object_group_id'                => null !== $objectGroupId ? (string)$objectGroupId : null,
-            'object_group_order'             => $objectGroupOrder,
-            'object_group_title'             => $objectGroupTitle,
+            'notes'                          => $bill->meta['notes'],
+            'object_group_id'                => $bill->meta['object_group_id'],
+            'object_group_order'             => $bill->meta['object_group_order'],
+            'object_group_title'             => $bill->meta['object_group_title'],
 
             // these fields need work:
-            'next_expected_match'            => $nem,
-            'next_expected_match_diff'       => $nemDiff,
-            'pay_dates'                      => $payDatesFormatted,
-            'paid_dates'                     => $paidDataFormatted,
+            //            'next_expected_match'            => $nem,
+            //            'next_expected_match_diff'       => $nemDiff,
+            //            'pay_dates'                      => $payDatesFormatted,
+            //            'paid_dates'                     => $paidDataFormatted,
             'links'                          => [
                 [
                     'rel' => 'self',
@@ -235,14 +221,14 @@ class BillTransformer extends AbstractTransformer
         $result       = [];
         foreach ($set as $entry) {
             $array    = [
-                'transaction_group_id'             => (string)$entry->transaction_group_id,
-                'transaction_journal_id'           => (string)$entry->id,
-                'date'                             => $entry->date->format('Y-m-d'),
-                'date_object'                      => $entry->date,
-                'currency_id'                      => $entry->transaction_currency_id,
-                'currency_code'                    => $entry->transaction_currency_code,
-                'currency_decimal_places'          => $entry->transaction_currency_decimal_places,
-                'amount'                           => Steam::bcround($entry->amount, $entry->transaction_currency_decimal_places),
+                'transaction_group_id'    => (string)$entry->transaction_group_id,
+                'transaction_journal_id'  => (string)$entry->id,
+                'date'                    => $entry->date->format('Y-m-d'),
+                'date_object'             => $entry->date,
+                'currency_id'             => $entry->transaction_currency_id,
+                'currency_code'           => $entry->transaction_currency_code,
+                'currency_decimal_places' => $entry->transaction_currency_decimal_places,
+                'amount'                  => Steam::bcround($entry->amount, $entry->transaction_currency_decimal_places),
             ];
             if (null !== $entry->foreign_amount && null !== $entry->foreign_currency_code) {
                 $array['foreign_currency_id']             = $entry->foreign_currency_id;

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-07-30',
-    'build_time'                   => 1753858473,
+    'version'                      => 'develop/2025-07-31',
+    'build_time'                   => 1753936691,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

resources/assets/v2/src/pages/dashboard/budgets.js

@@ -48,9 +48,19 @@ export default () => ({
         }
         this.getFreshData();
     },
+
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            console.log('I heard that! (dashboard/budgets)');
+            this.convertToNative = event.detail;
+            chartData = null;
+            this.loadChart();
+        }
+    },
+
     drawChart(options) {
         if (null !== chart) {
-            chart.data.datasets = options.data.datasets;
+            chart.data = options.data;
             chart.update();
             return;
         }
@@ -59,7 +69,7 @@ export default () => ({
     getFreshData() {
         const start = new Date(window.store.get('start'));
         const end = new Date(window.store.get('end'));
-        const cacheKey = getCacheKey('ds_bdg_chart', {start: start, end: end});
+        const cacheKey = getCacheKey('ds_bdg_chart', {convertToNative: this.convertToNative, start: start, end: end});
         //const cacheValid = window.store.get('cacheValid');
         const cacheValid = false;
         let cachedData = window.store.get(cacheKey);

resources/assets/v2/src/pages/dashboard/categories.js

@@ -33,6 +33,17 @@ let afterPromises = false;
 export default () => ({
     loading: false,
     convertToNative: false,
+
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            console.log('I heard that! (dashboard/categories)');
+            this.convertToNative = event.detail;
+            chartData = null;
+            this.loadChart();
+        }
+    },
+
+
     generateOptions(data) {
         currencies = [];
         let options = getDefaultChartSettings('column');
@@ -43,11 +54,6 @@ export default () => ({
             if (data.hasOwnProperty(i)) {
                 let current = data[i];
                 let code = current.currency_code;
-                // only use native code when doing auto conversion.
-                if (this.convertToNative) {
-                    code = current.native_currency_code;
-                }
-
                 if (!series.hasOwnProperty(code)) {
                     series[code] = {
                         name: code,
@@ -65,9 +71,6 @@ export default () => ({
                 let yAxis = 'y';
                 let current = data[i];
                 let code = current.currency_code;
-                if (this.convertToNative) {
-                    code = current.native_currency_code;
-                }
 
                 // loop series, add 0 if not present or add actual amount.
                 for (const ii in series) {
@@ -77,10 +80,6 @@ export default () => ({
                             // this series' currency matches this column's currency.
                             amount = parseFloat(current.amount);
                             yAxis = 'y' + current.currency_code;
-                            if (this.convertToNative) {
-                                amount = parseFloat(current.native_amount);
-                                yAxis = 'y' + current.native_currency_code;
-                            }
                         }
                         if (series[ii].data.hasOwnProperty(current.label)) {
                             // there is a value for this particular currency. The amount from this column will be added.
@@ -147,7 +146,7 @@ export default () => ({
     getFreshData() {
         const start = new Date(window.store.get('start'));
         const end = new Date(window.store.get('end'));
-        const cacheKey = getCacheKey('ds_ct_chart', {start: start, end: end});
+        const cacheKey = getCacheKey('ds_ct_chart', {convertToNative: this.convertToNative, start: start, end: end});
 
         const cacheValid = window.store.get('cacheValid');
         let cachedData = window.store.get(cacheKey);

resources/assets/v2/src/pages/dashboard/dashboard.js

@@ -71,9 +71,10 @@ let index = function () {
     return {
         convertToNative: false,
         saveNativeSettings(event) {
-            setVariable('convert_to_native', event.currentTarget.checked).then(() => {
-                console.log('Set convert to native to: ', event.currentTarget.checked);
-                this.$dispatch('convert-to-native', event.currentTarget.checked);
+            let target = event.currentTarget || event.target;
+            setVariable('convert_to_native',target.checked).then(() => {
+                console.log('Set convert to native to: ', target.checked);
+                this.$dispatch('convert-to-native', target.checked);
             });
         },
         init() {

resources/assets/v2/src/pages/dashboard/piggies.js

@@ -36,7 +36,7 @@ export default () => ({
         const start = new Date(window.store.get('start'));
         const end = new Date(window.store.get('end'));
         // needs user data.
-        const cacheKey = getCacheKey(PIGGY_CACHE_KEY, {start: start, end: end});
+        const cacheKey = getCacheKey(PIGGY_CACHE_KEY, {convertToNative: this.convertToNative, start: start, end: end});
 
         const cacheValid = window.store.get('cacheValid');
         let cachedData = window.store.get(cacheKey);

resources/assets/v2/src/pages/dashboard/sankey.js

@@ -29,17 +29,16 @@ import i18next from "i18next";
 Chart.register({SankeyController, Flow});
 
 const SANKEY_CACHE_KEY = 'ds_sankey_data';
-let currencies = [];
-let afterPromises = false;
-let chart = null;
-let transactions = [];
-let convertToNative = false;
-let translations = {
+let currencies         = [];
+let afterPromises      = false;
+let chart              = null;
+let transactions       = [];
+let convertToNative    = false;
+let translations       = {
     category: null,
     unknown_category: null,
     in: null,
     out: null,
-    // TODO
     unknown_source: null,
     unknown_dest: null,
     unknown_account: null,
@@ -80,75 +79,97 @@ const getColor = function (key) {
 
 // little helper
 function getObjectName(type, name, direction, code) {
+    if(convertToNative) {
+        return getObjectNameWithoutCurrency(type, name, direction);
+    }
+    return getObjectNameWithCurrency(type, name, direction, code);
 
-    // category 4x
-    if ('category' === type && null !== name && 'in' === direction) {
-        return translations.category + ' "' + name + '" (' + translations.in + (convertToNative ? ', ' + code + ')' : ')');
-    }
-    if ('category' === type && null === name && 'in' === direction) {
-        return translations.unknown_category + ' (' + translations.in + (convertToNative ? ', ' + code + ')' : ')');
-    }
-    if ('category' === type && null !== name && 'out' === direction) {
-        return translations.category + ' "' + name + '" (' + translations.out + (convertToNative ? ', ' + code + ')' : ')');
-    }
-    if ('category' === type && null === name && 'out' === direction) {
-        return translations.unknown_category + ' (' + translations.out + (convertToNative ? ', ' + code + ')' : ')');
-    }
-
-    // account 4x
-    if ('account' === type && null === name && 'in' === direction) {
-        return translations.unknown_source + (convertToNative ? ' (' + code + ')' : '');
-    }
-    if ('account' === type && null !== name && 'in' === direction) {
-        return translations.revenue_account + '"' + name + '"' + (convertToNative ? ' (' + code + ')' : '');
-    }
-    if ('account' === type && null === name && 'out' === direction) {
-        return translations.unknown_dest + (convertToNative ? ' (' + code + ')' : '');
-    }
-    if ('account' === type && null !== name && 'out' === direction) {
-        return translations.expense_account + ' "' + name + '"' + (convertToNative ? ' (' + code + ')' : '');
-    }
-
-    // budget 2x
-    if ('budget' === type && null !== name) {
-        return translations.budget + ' "' + name + '"' + (convertToNative ? ' (' + code + ')' : '');
-    }
-    if ('budget' === type && null === name) {
-        return translations.unknown_budget + (convertToNative ? ' (' + code + ')' : '');
-    }
-    console.error('Cannot handle: type:"' + type + '", dir: "' + direction + '"');
 }
 
-function getLabelName(type, name, code) {
-    // category
-    if ('category' === type && null !== name) {
-        return translations.category + ' "' + name + '"' + (convertToNative ? ' (' + code + ')' : '');
+function getObjectNameWithoutCurrency(type, name, direction) {
+    if('category' === type) {
+        let catName = null === name ? translations.unknown_category : translations.category + ' "' + name + '"';
+        let directionText = 'in' === direction ? translations.in : translations.out;
+        return catName + ' (' + directionText + ')';
     }
-    if ('category' === type && null === name) {
-        return translations.unknown_category + (convertToNative ? ' (' + code + ')' : '');
+    if('account' === type) {
+        let accountName = null === name ? translations.unknown_account : name;
+        let directionText = 'in' === direction ? translations.in : translations.out;
+        let fullAccountName = 'in' === direction ? translations.revenue_account + ' "' + accountName + '"' : translations.expense_account + ' "' + accountName + '"';
+        return fullAccountName + ' (' + directionText + ')';
     }
-    // account
-    if ('account' === type && null === name) {
-        return translations.unknown_account + (convertToNative ? ' (' + code + ')' : '');
+    if('budget' === type) {
+        return null === name ? translations.unknown_budget : translations.budget + ' "' + name + '"';
     }
-    if ('account' === type && null !== name) {
-        return name + (convertToNative ? ' (' + code + ')' : '');
+    console.error('[a] Cannot handle: type:"' + type + '", dir: "' + direction + '"');
+}
+function getObjectNameWithCurrency(type, name, direction, code) {
+    if('category' === type) {
+        let catName = null === name ? translations.unknown_category : translations.category + ' "' + name + '"';
+        let directionText = 'in' === direction ? translations.in : translations.out;
+        return catName + ' (' + directionText + ', ' + code + ')';
     }
-
-    // budget 2x
-    if ('budget' === type && null !== name) {
-        return translations.budget + ' "' + name + '"' + (convertToNative ? ' (' + code + ')' : '');
+    if('account' === type) {
+        let accountName = null === name ? translations.unknown_account : name;
+        let directionText = 'in' === direction ? translations.in : translations.out;
+        let fullAccountName = 'in' === direction ? translations.revenue_account + ' "' + accountName + '"' : translations.expense_account + ' "' + accountName + '"';
+        return fullAccountName + ' (' + directionText + ', ' + code + ')';
     }
-    if ('budget' === type && null === name) {
-        return translations.unknown_budget + (convertToNative ? ' (' + code + ')' : '');
+    if('budget' === type) {
+        return (null === name ? translations.unknown_budget : translations.budget + ' "' + name + '"') + ' (' + code + ')';
     }
-    console.error('Cannot handle: type:"' + type + '"');
+    console.error('[b] Cannot handle: type:"' + type + '", dir: "' + direction + '"');
 }
 
 
+function getLabel(type, name, code) {
+    if(convertToNative) {
+        return getLabelWithoutCurrency(type, name);
+    }
+    return getLabelWithCurrency(type, name, code);
+
+}
+
+function getLabelWithoutCurrency(type, name) {
+    if('category' === type) {
+        return null === name ? translations.unknown_category : translations.category + ' "' + name + '"';
+    }
+    if('account' === type) {
+        return null === name ? translations.unknown_account : name;
+    }
+    if('budget' === type) {
+        return null === name ? translations.unknown_budget : translations.budget + ' "' + name + '"';
+    }
+    console.error('[a] Cannot handle: type:"' + type + '"');
+}
+function getLabelWithCurrency(type, name, code) {
+    if('category' === type) {
+        return (null === name ? translations.unknown_category : translations.category + ' "' + name + '"') + ' ('+ code + ')';
+    }
+    if('account' === type) {
+        return (null === name ? translations.unknown_account : name)  + ' (' + code + ')';
+    }
+    if('budget' === type) {
+        return (null === name ? translations.unknown_budget : translations.budget + ' "' + name + '"')  + ' (' + code + ')';;
+    }
+    console.error('[b] Cannot handle: type:"' + type + '"');
+}
+
 export default () => ({
     loading: false,
     convertToNative: false,
+    processedData: null,
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            console.log('I heard that! (dashboard/sankey)');
+            this.convertToNative = event.detail;
+            convertToNative = event.detail;
+            this.processedData = null;
+            this.loadChart();
+        }
+    },
+
+
     generateOptions() {
         let options = getDefaultChartSettings('sankey');
 
@@ -156,125 +177,22 @@ export default () => ({
         currencies = [];
 
         // variables collected for the sankey chart:
-        let amounts = {};
-        let labels = {};
-        for (let i in transactions) {
-            if (transactions.hasOwnProperty(i)) {
-                let group = transactions[i];
-                for (let ii in group.attributes.transactions) {
-                    if (group.attributes.transactions.hasOwnProperty(ii)) {
-                        // properties of the transaction, used in the generation of the chart:
-                        let transaction = group.attributes.transactions[ii];
-                        let currencyCode = this.convertToNative ? transaction.native_currency_code : transaction.currency_code;
-                        if(this.convertToNative && (!transaction.hasOwnProperty('native_amount') || null === transaction.native_amount)) {
-                            // skip this transaction, it has no native amount.
-                            console.error('No native amount for transaction #' + group.id + ' ('+this.convertToNative+')');
-                            continue;
-                        }
-                        let amount = this.convertToNative ? parseFloat(transaction.native_amount) : parseFloat(transaction.amount);
-                        let flowKey;
-
-                        /*
-                        Two entries in the sankey diagram for deposits:
-                        1. From the revenue account (source) to a category (in).
-                        2. From the category (in) to the big inbox.
-                         */
-                        if ('deposit' === transaction.type) {
-                            // nr 1
-                            let category = getObjectName('category', transaction.category_name, 'in', currencyCode);
-                            let revenueAccount = getObjectName('account', transaction.source_name, 'in', currencyCode);
-                            labels[category] = getLabelName('category', transaction.category_name, currencyCode);
-                            labels[revenueAccount] = getLabelName('account', transaction.source_name, currencyCode);
-                            flowKey = revenueAccount + '-' + category + '-' + currencyCode;
-                            if (!amounts.hasOwnProperty(flowKey)) {
-                                amounts[flowKey] = {
-                                    from: revenueAccount,
-                                    to: category,
-                                    amount: 0
-                                };
-                            }
-                            amounts[flowKey].amount += amount;
-
-                            // nr 2
-                            flowKey = category + '-' + translations.all_money + '-' + currencyCode;
-                            if (!amounts.hasOwnProperty(flowKey)) {
-                                amounts[flowKey] = {
-                                    from: category,
-                                    to: translations.all_money + (this.convertToNative ? ' (' + currencyCode + ')' : ''),
-                                    amount: 0
-                                };
-                            }
-                            amounts[flowKey].amount += amount;
-                        }
-                        /*
-                        Three entries in the sankey diagram for withdrawals:
-                        1. From the big box to a budget.
-                        2. From a budget to a category.
-                        3. From a category to an expense account.
-                         */
-                        if ('withdrawal' === transaction.type) {
-                            // 1.
-                            let budget = getObjectName('budget', transaction.budget_name, 'out', currencyCode);
-                            labels[budget] = getLabelName('budget', transaction.budget_name, currencyCode);
-                            flowKey = translations.all_money + '-' + budget + '-' + currencyCode;
-
-                            if (!amounts.hasOwnProperty(flowKey)) {
-                                amounts[flowKey] = {
-                                    from: translations.all_money + (this.convertToNative ? ' (' + currencyCode + ')' : ''),
-                                    to: budget,
-                                    amount: 0
-                                };
-                            }
-                            amounts[flowKey].amount += amount;
-
-
-                            // 2.
-                            let category = getObjectName('category', transaction.category_name, 'out', currencyCode);
-                            labels[category] = getLabelName('category', transaction.category_name, currencyCode);
-                            flowKey = budget + '-' + category + '-' + currencyCode;
-
-                            if (!amounts.hasOwnProperty(flowKey)) {
-                                amounts[flowKey] = {
-                                    from: budget,
-                                    to: category,
-                                    amount: 0
-                                };
-                            }
-                            amounts[flowKey].amount += amount;
-
-                            // 3.
-                            let expenseAccount = getObjectName('account', transaction.destination_name, 'out', currencyCode);
-                            labels[expenseAccount] = getLabelName('account', transaction.destination_name, currencyCode);
-                            flowKey = category + '-' + expenseAccount + '-' + currencyCode;
-
-                            if (!amounts.hasOwnProperty(flowKey)) {
-                                amounts[flowKey] = {
-                                    from: category,
-                                    to: expenseAccount,
-                                    amount: 0
-                                };
-                            }
-                            amounts[flowKey].amount += amount;
-                        }
-                    }
-                }
-            }
-        }
+        this.parseTransactionGroups(transactions);
 
         let dataSet =
-            // sankey chart has one data set.
-            {
-                label: 'Firefly III dashboard sankey chart',
-                data: [],
-                colorFrom: (c) => getColor(c.dataset.data[c.dataIndex] ? c.dataset.data[c.dataIndex].from : ''),
-                colorTo: (c) => getColor(c.dataset.data[c.dataIndex] ? c.dataset.data[c.dataIndex].to : ''),
-                colorMode: 'gradient', // or 'from' or 'to'
-                labels: labels,
-                size: 'min', // or 'min' if flow overlap is preferred
-            };
-        for (let i in amounts) {
-            if (amounts.hasOwnProperty(i)) {
-                let amount = amounts[i];
+                // sankey chart has one data set.
+                {
+                    label: 'Firefly III dashboard sankey chart',
+                    data: [],
+                    colorFrom: (c) => getColor(c.dataset.data[c.dataIndex] ? c.dataset.data[c.dataIndex].from : ''),
+                    colorTo: (c) => getColor(c.dataset.data[c.dataIndex] ? c.dataset.data[c.dataIndex].to : ''),
+                    colorMode: 'gradient', // or 'from' or 'to'
+                    labels: this.processedData.labels,
+                    size: 'min', // or 'min' if flow overlap is preferred
+                };
+        for (let i in this.processedData.amounts) {
+            if (this.processedData.amounts.hasOwnProperty(i)) {
+                let amount = this.processedData.amounts[i];
                 dataSet.data.push({from: amount.from, to: amount.to, flow: amount.amount});
             }
         }
@@ -282,6 +200,133 @@ export default () => ({
 
         return options;
     },
+    parseTransactionGroups(groups) {
+        this.processedData = {
+            amounts: {},
+            labels: {}
+        };
+        for (let i in groups) {
+            if (groups.hasOwnProperty(i)) {
+                let group = groups[i];
+                this.parseTransactionGroup(group);
+            }
+        }
+    },
+    parseTransactionGroup(group) {
+        for (let ii in group.attributes.transactions) {
+            if (group.attributes.transactions.hasOwnProperty(ii)) {
+                // properties of the transaction, used in the generation of the chart:
+                let transaction = group.attributes.transactions[ii];
+                this.parseTransaction(transaction);
+            }
+        }
+
+    },
+    parseTransaction(transaction) {
+        let currencyCode = transaction.currency_code;
+        let amount       = parseFloat(transaction.amount);
+        let flowKey;
+        if (this.convertToNative) {
+            currencyCode = transaction.native_currency_code;
+            amount       = parseFloat(transaction.native_amount);
+        }
+        if ('deposit' === transaction.type) {
+            this.parseDeposit(transaction, currencyCode, amount);
+            return;
+        }
+
+        if ('withdrawal' === transaction.type) {
+            this.parseWithdrawal(transaction, currencyCode, amount);
+        }
+    },
+    parseWithdrawal(transaction, currencyCode, amount) {
+        /*
+        Three entries in the sankey diagram for withdrawals:
+        1. From the big box to a budget.
+        2. From a budget to a category.
+        3. From a category to an expense account.
+        */
+
+        // first one:
+        let budget                        = getObjectName('budget', transaction.budget_name, 'out', currencyCode);
+        this.processedData.labels[budget] = getLabel('budget', transaction.budget_name, currencyCode);
+        let flowKey                       = translations.all_money + '-' + budget + '-' + currencyCode;
+
+        if (!this.processedData.amounts.hasOwnProperty(flowKey)) {
+            this.processedData.amounts[flowKey] = {
+                from: translations.all_money + (this.convertToNative ? ' (' + currencyCode + ')' : ''),
+                to: budget,
+                amount: 0
+            };
+        }
+        this.processedData.amounts[flowKey].amount += amount;
+
+
+        // second one:
+        let category                        = getObjectName('category', transaction.category_name, 'out', currencyCode);
+        this.processedData.labels[category] = getLabel('category', transaction.category_name, currencyCode);
+        flowKey                             = budget + '-' + category + '-' + currencyCode;
+
+        if (!this.processedData.amounts.hasOwnProperty(flowKey)) {
+            this.processedData.amounts[flowKey] = {
+                from: budget,
+                to: category,
+                amount: 0
+            };
+        }
+        this.processedData.amounts[flowKey].amount += amount;
+
+        // third one:
+        let expenseAccount                        = getObjectName('account', transaction.destination_name, 'out', currencyCode);
+        this.processedData.labels[expenseAccount] = getLabel('account', transaction.destination_name, currencyCode);
+        flowKey                                   = category + '-' + expenseAccount + '-' + currencyCode;
+
+        if (!this.processedData.amounts.hasOwnProperty(flowKey)) {
+            this.processedData.amounts[flowKey] = {
+                from: category,
+                to: expenseAccount,
+                amount: 0
+            };
+        }
+        this.processedData.amounts[flowKey].amount += amount;
+    },
+    parseDeposit(transaction, currencyCode, amount) {
+        /*
+        Two entries in the sankey diagram for deposits:
+        1. From the revenue account (source) to a category (in).
+        2. From the category (in) to the big inbox.
+        */
+
+        // this is the first one:
+        let category                              = getObjectName('category', transaction.category_name, 'in', currencyCode);
+        let revenueAccount                        = getObjectName('account', transaction.source_name, 'in', currencyCode);
+        let flowKey                               = revenueAccount + '-' + category + '-' + currencyCode;
+        this.processedData.labels[category]       = getLabel('category', transaction.category_name, currencyCode);
+        this.processedData.labels[revenueAccount] = getLabel('account', transaction.source_name, currencyCode);
+
+        // create if necessary:
+        if (!this.processedData.amounts.hasOwnProperty(flowKey)) {
+            this.processedData.amounts[flowKey] = {
+                from: revenueAccount,
+                to: category,
+                amount: 0
+            };
+        }
+        this.processedData.amounts[flowKey].amount += amount;
+
+        // this is the second one:
+        flowKey = category + '-' + translations.all_money + '-' + currencyCode;
+        if (!this.processedData.amounts.hasOwnProperty(flowKey)) {
+            this.processedData.amounts[flowKey] = {
+                from: category,
+                to: translations.all_money + (this.convertToNative ? ' (' + currencyCode + ')' : ''),
+                amount: 0
+            };
+        }
+        this.processedData.amounts[flowKey].amount += amount;
+    },
+
+
     drawChart(options) {
         if (null !== chart) {
             chart.data.datasets = options.data.datasets;
@@ -292,12 +337,12 @@ export default () => ({
 
     },
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start    = new Date(window.store.get('start'));
+        const end      = new Date(window.store.get('end'));
         const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {start: start, end: end});
 
         const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(cacheKey);
+        let cachedData   = window.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             transactions = cachedData;
@@ -316,8 +361,8 @@ export default () => ({
         this.downloadTransactions(params);
     },
     downloadTransactions(params) {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start    = new Date(window.store.get('start'));
+        const end      = new Date(window.store.get('end'));
         const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {convertToNative: this.convertToNative, start: start, end: end});
 
         //console.log('Downloading page ' + params.page + '...');
@@ -356,25 +401,25 @@ export default () => ({
         transactions = [];
         Promise.all([getVariable('convert_to_native', false)]).then((values) => {
             this.convertToNative = values[0];
-            convertToNative = values[0];
+            convertToNative      = values[0];
 
-                // some translations:
-                translations.all_money = i18next.t('firefly.all_money');
-                translations.category = i18next.t('firefly.category');
-                translations.in = i18next.t('firefly.money_flowing_in');
-                translations.out = i18next.t('firefly.money_flowing_out');
-                translations.unknown_category = i18next.t('firefly.unknown_category_plain');
-                translations.unknown_source = i18next.t('firefly.unknown_source_plain');
-                translations.unknown_dest = i18next.t('firefly.unknown_dest_plain');
-                translations.unknown_account = i18next.t('firefly.unknown_any_plain');
-                translations.unknown_budget = i18next.t('firefly.unknown_budget_plain');
-                translations.expense_account = i18next.t('firefly.expense_account');
-                translations.revenue_account = i18next.t('firefly.revenue_account');
-                translations.budget = i18next.t('firefly.budget');
+            // some translations:
+            translations.all_money        = i18next.t('firefly.all_money');
+            translations.category         = i18next.t('firefly.category');
+            translations.in               = i18next.t('firefly.money_flowing_in');
+            translations.out              = i18next.t('firefly.money_flowing_out');
+            translations.unknown_category = i18next.t('firefly.unknown_category_plain');
+            translations.unknown_source   = i18next.t('firefly.unknown_source_plain');
+            translations.unknown_dest     = i18next.t('firefly.unknown_dest_plain');
+            translations.unknown_account  = i18next.t('firefly.unknown_any_plain');
+            translations.unknown_budget   = i18next.t('firefly.unknown_budget_plain');
+            translations.expense_account  = i18next.t('firefly.expense_account');
+            translations.revenue_account  = i18next.t('firefly.revenue_account');
+            translations.budget           = i18next.t('firefly.budget');
 
-                // console.log('sankey after promises');
-                afterPromises = true;
-                this.loadChart();
+            // console.log('sankey after promises');
+            afterPromises = true;
+            this.loadChart();
 
         });
         window.store.observe('end', () => {

resources/assets/v2/src/pages/dashboard/subscriptions.js

@@ -163,14 +163,10 @@ function downloadSubscriptions(params) {
                                     currency_code: bill.currency_code,
                                     paid: 0,
                                     unpaid: 0,
-                                    native_currency_code: bill.native_currency_code,
-                                    native_paid: 0,
-                                    //native_unpaid: 0,
                                 };
                             }
 
                             subscriptionData[objectGroupId].payment_info[bill.currency_code].unpaid += totalAmount;
-                            //subscriptionData[objectGroupId].payment_info[bill.currency_code].native_unpaid += totalNativeAmount;
                         }
 
                         if (current.attributes.paid_dates.length > 0) {
@@ -178,8 +174,6 @@ function downloadSubscriptions(params) {
                                 if (current.attributes.paid_dates.hasOwnProperty(ii)) {
                                     // bill is paid!
                                     // since bill is paid, 3 possible currencies:
-                                    // native, currency, foreign currency.
-                                    // foreign currency amount (converted to native or not) will be ignored.
                                     let currentJournal = current.attributes.paid_dates[ii];
                                     // new array for the currency
                                     if (!subscriptionData[objectGroupId].payment_info.hasOwnProperty(currentJournal.currency_code)) {
@@ -187,15 +181,10 @@ function downloadSubscriptions(params) {
                                             currency_code: bill.currency_code,
                                             paid: 0,
                                             unpaid: 0,
-                                            // native_currency_code: bill.native_currency_code,
-                                            // native_paid: 0,
-                                            //native_unpaid: 0,
                                         };
                                     }
                                     const amount = parseFloat(currentJournal.amount) * -1;
-                                    // const nativeAmount = parseFloat(currentJournal.native_amount) * -1;
                                     subscriptionData[objectGroupId].payment_info[currentJournal.currency_code].paid += amount;
-                                    // subscriptionData[objectGroupId].payment_info[currentJournal.currency_code].native_paid += nativeAmount;
                                 }
                             }
                         }
@@ -218,6 +207,17 @@ export default () => ({
     loading: false,
     convertToNative: false,
     subscriptions: [],
+    formatMoney(amount, currencyCode) {
+        return formatMoney(amount, currencyCode);
+    },
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            console.log('I heard that! (dashboard/subscriptions)');
+            this.convertToNative = event.detail;
+            this.startSubscriptions();
+        }
+    },
+
     startSubscriptions() {
         this.loading = true;
         let start = new Date(window.store.get('start'));
@@ -256,6 +256,7 @@ export default () => ({
                     //console.log(group);
                 }
             }
+            console.log('Subscriptions: ', this.subscriptions);
 
             // then assign to this.subscriptions.
             this.loading = false;

resources/lang/en_US/firefly.php

@@ -1864,6 +1864,9 @@ return [
     'remove_budgeted_amount'                                                    => 'Remove budgeted amount in :currency',
 
     // bills:
+    'left_to_pay_lc' => 'left to pay',
+    'less_than_expected' => 'less than expected',
+    'more_than_expected' => 'more than expected',
     'skip_help_text'                                                            => 'Use the skip field to create bi-monthly (skip = 1) or other custom intervals.',
     'subscription'                                                              => 'Subscription',
     'not_expected_period'                                                       => 'Not expected this period',

resources/views/v2/partials/dashboard/budget-chart.blade.php

@@ -1,4 +1,4 @@
-<div class="row mb-2" x-data="budgets">
+<div class="row mb-2" x-data="budgets" x-bind="eventListeners">
     <div class="col">
         <div class="card">
             <div class="card-header">

resources/views/v2/partials/dashboard/category-chart.blade.php

@@ -1,4 +1,4 @@
-<div class="row mb-2" x-data="categories">
+<div class="row mb-2" x-data="categories" x-bind="eventListeners">
     <div class="col">
         <div class="card">
             <div class="card-header">

resources/views/v2/partials/dashboard/piggy-banks.blade.php

@@ -3,10 +3,8 @@
     <template x-for="group in piggies">
         <div class="card mb-2">
             <div class="card-header">
-                <h3 class="card-title"><a href="{{ route('piggy-banks.index')  }}"
-                                          title="{{ __('firefly.go_to_piggies')  }}">{{ __('firefly.piggy_banks') }}
-                        (<span
-                            x-text="group.title"></span>)</a></h3>
+                <h3 class="card-title"><a href="{{ route('piggy-banks.index')  }}" title="{{ __('firefly.go_to_piggies')  }}">{{ __('firefly.piggy_banks') }}
+                        (<span x-text="group.title"></span>)</a></h3>
             </div>
             <ul class="list-group list-group-flush">
                 <template x-for="piggy in group.piggies">

resources/views/v2/partials/dashboard/sankey.blade.php

@@ -6,7 +6,7 @@
                 >{{ __('firefly.income_and_expense') }}</a>
             </h3>
         </div>
-        <div class="card-body" x-data="sankey">
+        <div class="card-body" x-data="sankey" x-bind="eventListeners">
             <canvas id="sankey-chart"></canvas>
         </div>
     </div>

resources/views/v2/partials/dashboard/subscriptions.blade.php

@@ -1,4 +1,4 @@
-<div class="col" x-data="subscriptions">
+<div class="col" x-data="subscriptions" x-bind="eventListeners">
     <template x-for="group in subscriptions">
         <div class="card mb-2">
             <div class="card-header">
@@ -9,18 +9,21 @@
                 </h3>
             </div>
             <div class="card-body">
+                <template x-for="pi in group.payment_info">
                 <div class="row mb-2">
-                    <!--
-                    <template x-for="pie in group.payment_info">
-                        <div :class='group.col_size'>
-                            <canvas :id='"pie_" + group.id + "_" + pie.currency_code'
-                                    :width="group.width"
-                                    x-init="drawPieChart(group.id, group.title, pie)"></canvas>
+                    <div class="col">
+                        <div class="progress" role="progressbar" aria-label="Example with label"
+                             :aria-valuenow="(pi.paid*-1/pi.unpaid)*100" aria-valuemin="0" aria-valuemax="100">
+                            <div class="progress-bar progress-bar-striped" :style="'width: ' + (pi.paid*-1/pi.unpaid)*100 + '%'">
+                                <span x-text="formatMoney(pi.paid*-1,pi.currency_code)"></span>
+                            </div>
                         </div>
-                    </template>
-                    -->
-                    Here was chart.
+                        <p>
+                        <small>~ <span x-text="formatMoney(pi.unpaid, pi.currency_code)"></span> {{ __('firefly.left_to_pay_lc') }}</small>
+                        </p>
+                    </div>
                 </div>
+                </template>
                 <div class="row mb-2">
                     <table class="table table-striped table-hover">
                         <thead>
@@ -33,9 +36,7 @@
                         <template x-for="bill in group.bills">
                             <tr>
                                 <td>
-                                    <a :href="'{{ route('subscriptions.show',[''])  }}/' + bill.id" :title="bill.name">
-                                        <span x-text="bill.name"></span>
-                                    </a>
+                                    <a :href="'{{ route('subscriptions.show',[''])  }}/' + bill.id" :title="bill.name"><span x-text="bill.name"></span></a>
                                     <template x-if="bill.paid">
                                         <small class="text-muted"><br>{{ __('firefly.paid')  }}</small>
                                     </template>
@@ -60,8 +61,17 @@
                                         <ul class="list-unstyled">
                                             <template x-for="transaction in bill.transactions">
                                                 <li>
-                                                    <span x-text="transaction.amount"></span>
-                                                    (<span x-text="transaction.percentage"></span>%)
+                                                    <span :title="transaction.amount" x-text="transaction.amount"></span>
+                                                    <template x-if="transaction.percentage < 0">
+                                                        <span>
+                                                        (<span :title="transaction.percentage + '% {{ __("firefly.less_than_expected") }}'" x-text="transaction.percentage"></span>%)
+                                                        </span>
+                                                    </template>
+                                                    <template x-if="transaction.percentage > 0">
+                                                        <span>
+                                                        (<span :title="transaction.percentage + '% {{ __("firefly.more_than_expected") }}'" x-text="transaction.percentage"></span>%)
+                                                        </span>
+                                                    </template>
                                                 </li>
                                             </template>
                                         </ul>