Merge pull request #11705 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

app/Http/Controllers/Transaction/IndexController.php

@@ -103,10 +103,11 @@ class IndexController extends Controller
         $firstJournal  = $this->repository->firstNull();
         $startPeriod   = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
         $endPeriod     = clone $end;
-
-        // limit to 3 years for the time being.
-        if (now()->diffInYears($startPeriod, true) > 3) {
-            $startPeriod = now()->subYears(3);
+        $endPeriod->endOfDay();
+        // limit to 6 years for the time being.
+        $max           = 6;
+        if (now()->diffInYears($startPeriod, true) > $max) {
+            $startPeriod = now()->subYears($max);
         }
 
         $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);

app/Listeners/System/RecalculatesPrimaryCurrencyAmounts.php

@@ -149,12 +149,10 @@ class RecalculatesPrimaryCurrencyAmounts
             ->join('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->where('transaction_journals.user_group_id', $userGroup->id)
             ->where(static function (Builder $q): void {
-                $q
-                    ->whereNotNull('native_amount')
-                    ->orWhereNotNull('native_foreign_amount')
-                    ->orWhere('native_amount', '!=', '')
-                    ->orWhere('native_foreign_amount', '!=', '')
-                ;
+                $q->whereNotNull('native_amount')->orWhereNotNull('native_foreign_amount');
+                if ('pgsql' !== config('database.default')) {
+                    $q->orWhere('native_amount', '!=', '')->orWhere('native_foreign_amount', '!=', '');
+                }
             })
             ->update(['native_amount'         => null, 'native_foreign_amount' => null])
         ;

app/Repositories/PeriodStatistic/PeriodStatisticRepository.php

@@ -49,6 +49,9 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface, U
     #[Override]
     public function allInRangeForPrefix(string $prefix, Carbon $start, Carbon $end): Collection
     {
+        Log::debug(sprintf('Collect all statistics where type starts with "%s"', $prefix));
+        Log::debug(sprintf('Between %s and %s', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+
         return $this->userGroup
             ->periodStatistics()
             ->where('type', 'LIKE', sprintf('%s%%', $prefix))
@@ -156,6 +159,7 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface, U
         int $count,
         string $amount
     ): PeriodStatistic {
+        Log::debug(sprintf('Store as type "%s"', sprintf('%s_%s', $prefix, $type)));
         $stat                          = new PeriodStatistic();
         $stat->transaction_currency_id = $currencyId;
         $stat->user_group_id           = $this->getUserGroup()->id;

app/Services/Internal/Support/JournalServiceTrait.php

@@ -37,6 +37,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\NullArrayObject;
+use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Support\Facades\Log;
 use Safe\Exceptions\JsonException;
 
@@ -227,7 +228,12 @@ trait JournalServiceTrait
         $set = array_unique($set);
         Log::debug('End of loop.');
         Log::debug(sprintf('Total nr. of tags: %d', count($tags)), $tags);
-        $journal->tags()->sync($set);
+
+        try {
+            $journal->tags()->sync($set);
+        } catch (UniqueConstraintViolationException $e) {
+            Log::error(sprintf('Firefly III could not sync tags: %s', $e->getMessage()));
+        }
     }
 
     /**

app/Support/Calendar/Calculator.php

@@ -49,6 +49,9 @@ class Calculator
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private static array $intervals               = [];
 
     public function isAvailablePeriodicity(Periodicity $periodicity): bool

app/Support/Export/ExportDataGenerator.php

@@ -116,6 +116,12 @@ class ExportDataGenerator
 
     // @phpstan-ignore-line
 
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
     public function __construct()
     {
         $this->accounts = new Collection();

app/Support/Http/Controllers/PeriodOverview.php

@@ -37,7 +37,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\Steam;
@@ -80,47 +79,8 @@ trait PeriodOverview
     protected TagRepositoryInterface $tagRepository;
     protected JournalRepositoryInterface $journalRepos;
     protected PeriodStatisticRepositoryInterface $periodStatisticRepo;
-    private Collection $statistics; // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    // temp data holder
-    private array $transactions; // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
-
-    // temp data holder
+    private Collection $statistics;
+    private array $transactions;
 
     /**
      * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
@@ -181,6 +141,34 @@ trait PeriodOverview
         return $entries;
     }
 
+    protected function getGenericPeriod(string $type, string $period, Carbon $start, Carbon $end): array
+    {
+        $return             = [
+            'title'              => Navigation::periodShow($start, $period),
+            'route'              => route('transactions.index', [$type, $start->format('Y-m-d'), $end->format('Y-m-d')]),
+            'total_transactions' => 0,
+        ];
+        $setTypes           = [
+            'withdrawal' => 'spent',
+            'expenses'   => 'spent',
+            'deposit'    => 'earned',
+            'revenue'    => 'earned',
+            'transfer'   => 'transferred',
+            'transfers'  => 'transferred',
+        ];
+        if (!array_key_exists($type, $setTypes)) {
+            throw new FireflyException(sprintf('[c] Cannot deal with type "%s"', $type));
+        }
+        $setType            = $setTypes[$type];
+
+        $this->transactions = [];
+        $set                = $this->getSingleGenericPeriodByType($start, $end, $type);
+        $return['total_transactions'] += $set['count'];
+        $return[$setType]   = $set;
+
+        return $return;
+    }
+
     /**
      * Same as above, but for lists that involve transactions without a budget.
      *
@@ -266,60 +254,18 @@ trait PeriodOverview
      */
     protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array
     {
-        $range         = Navigation::getViewRange(true);
-        $types         = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));
-        [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
-
-        // properties for cache
-        $cache         = new CacheProperties();
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('transactions-period-entries');
-        $cache->addProperty($transactionType);
-        if ($cache->has()) {
-            return $cache->get();
-        }
+        $this->periodStatisticRepo = app(PeriodStatisticRepositoryInterface::class);
+        $range                     = Navigation::getViewRange(true);
+        [$start, $end]             = $end < $start ? [$end, $start] : [$start, $end];
 
         /** @var array $dates */
-        $dates         = Navigation::blockPeriods($start, $end, $range);
-        $entries       = [];
-        $spent         = [];
-        $earned        = [];
-        $transferred   = [];
-        // collect all journals in this period (regardless of type)
-        $collector     = app(GroupCollectorInterface::class);
-        $collector->setTypes($types)->setRange($start, $end);
-        $genericSet    = $collector->getExtractedJournals();
-        $loops         = 0;
+        $dates                     = Navigation::blockPeriods($start, $end, $range);
+        $entries                   = [];
+        $this->statistics          = $this->periodStatisticRepo->allInRangeForPrefix('all_', $start, $end);
+        Log::debug(sprintf('Collected %d statistics', $this->statistics->count()));
 
         foreach ($dates as $currentDate) {
-            $title     = Navigation::periodShow($currentDate['end'], $currentDate['period']);
-
-            if ($loops < 10) {
-                // set to correct array
-                if ('expenses' === $transactionType || 'withdrawal' === $transactionType) {
-                    $spent = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-                }
-                if ('revenue' === $transactionType || 'deposit' === $transactionType) {
-                    $earned = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-                }
-                if ('transfer' === $transactionType || 'transfers' === $transactionType) {
-                    $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-                }
-            }
-            $entries[] = [
-                'title'              => $title,
-                'route'              => route('transactions.index', [
-                    $transactionType,
-                    $currentDate['start']->format('Y-m-d'),
-                    $currentDate['end']->format('Y-m-d'),
-                ]),
-                'total_transactions' => count($spent) + count($earned) + count($transferred),
-                'spent'              => $this->groupByCurrency($spent),
-                'earned'             => $this->groupByCurrency($earned),
-                'transferred'        => $this->groupByCurrency($transferred),
-            ];
-            ++$loops;
+            $entries[] = $this->getGenericPeriod($transactionType, $currentDate['period'], $currentDate['start'], $currentDate['end']);
         }
 
         return $entries;
@@ -366,10 +312,11 @@ trait PeriodOverview
 
             return new Collection();
         }
+        Log::debug(sprintf('Now in filterStatistics("%s")', $type));
 
-        return $this->statistics->filter(
-            static fn (PeriodStatistic $statistic): bool => $statistic->start->eq($start) && $statistic->end->eq($end) && $statistic->type === $type
-        );
+        return $this->statistics->filter(static function (PeriodStatistic $statistic) use ($start, $end, $type): bool {
+            return $statistic->start->isSameSecond($start) && $statistic->end->isSameSecond($end) && $statistic->type === $type;
+        });
     }
 
     private function filterTransactionsByType(TransactionTypeEnum $type, Carbon $start, Carbon $end): array
@@ -431,21 +378,63 @@ trait PeriodOverview
         return [$start, $end];
     }
 
+    private function getSingleGenericPeriodByType(Carbon $start, Carbon $end, string $type): array
+    {
+        $filterType = sprintf('all_%s', $type);
+        $statistics = $this->filterStatistics($start, $end, $filterType);
+        $types      = config(sprintf('firefly.transactionTypesByType.%s', $type));
+        // nothing found, regenerate them.
+        if (0 === $statistics->count()) {
+            if (0 === count($this->transactions)) {
+                // get collection!
+                // collect all journals in this period (regardless of type)
+                $collector          = app(GroupCollectorInterface::class);
+                $collector->setTypes($types)->setRange($start, $end);
+                $this->transactions = $collector->getExtractedJournals();
+                Log::debug(sprintf('Going to group %d found journal(s)', count($types)));
+            }
+
+            $grouped = $this->groupByCurrency($this->filterJournalsByDate($this->transactions, $start, $end));
+            $this->saveGroupedForPrefix('all', $start, $end, $type, $grouped);
+
+            return $grouped;
+        }
+        $grouped    = ['count' => 0];
+
+        /** @var PeriodStatistic $statistic */
+        foreach ($statistics as $statistic) {
+            $id           = (int) $statistic->transaction_currency_id;
+            $currency     = Amount::getTransactionCurrencyById($id);
+            $grouped[$id] = [
+                'amount'                  => (string) $statistic->amount,
+                'count'                   => (int) $statistic->count,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+            $grouped['count'] += (int) $statistic->count;
+        }
+
+        return $grouped;
+    }
+
     private function getSingleModelPeriodByType(Model $model, Carbon $start, Carbon $end, string $type): array
     {
         Log::debug(sprintf(
             'Now in getSingleModelPeriodByType(%s #%d, %s %s, %s)',
             $model::class,
             $model->id,
-            $start->format('Y-m-d'),
-            $end->format('Y-m-d'),
+            $start->format('Y-m-d H:i:s.u'),
+            $end->format('Y-m-d H:i:s.u'),
             $type
         ));
         $statistics = $this->filterStatistics($start, $end, $type);
 
         // nothing found, regenerate them.
         if (0 === $statistics->count()) {
-            Log::debug(sprintf('Found nothing in this period for type "%s"', $type));
+            Log::debug(sprintf('Found nothing between %s and %s for type "%s"', $start->format('Y-m-d H:i:s.u'), $end->format('Y-m-d H:i:s.u'), $type));
             if (0 === count($this->transactions)) {
                 switch ($model::class) {
                     default:
@@ -470,7 +459,7 @@ trait PeriodOverview
 
             switch ($type) {
                 default:
-                    throw new FireflyException(sprintf('Cannot deal with category period type %s', $type));
+                    throw new FireflyException(sprintf('Cannot deal with type %s', $type));
 
                 case 'spent':
                     $result = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $start, $end);
@@ -532,7 +521,7 @@ trait PeriodOverview
 
             switch ($model) {
                 default:
-                    throw new FireflyException(sprintf('Cannot deal with model of type "%s"', $model));
+                    throw new FireflyException(sprintf('[b] Cannot deal with model of type "%s"', $model));
 
                 case 'budget':
                     // get all expenses without a budget.

app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php

@@ -54,6 +54,9 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private readonly bool $convertToPrimary; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -68,6 +71,9 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies            = [];
     private array $currencyIds           = [];
     private array $ids                   = [];

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -54,6 +54,9 @@ class BudgetLimitEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $currencies  = [];
     private array $currencyIds = [];
     private Carbon $end;

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -56,6 +56,9 @@ class PiggyBankEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accounts      = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -70,6 +73,9 @@ class PiggyBankEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $amounts       = [];
     private Collection $collection;
     private array $currencies    = [];

app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php

@@ -51,6 +51,9 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $accountIds        = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -65,6 +68,9 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private Collection $collection;
     private array $currencies        = [];
     private array $groupIds          = [];

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -60,6 +60,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private readonly bool $convertToPrimary;
     private ?Carbon $end             = null;
     private array   $mappedObjects   = [];

app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php

@@ -81,6 +81,12 @@ class TransactionGroupEnrichment implements EnrichmentInterface
 
     // @phpstan-ignore-line
 
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
     public function __construct()
     {
         $this->dateFields      = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];

app/Support/JsonApi/Enrichments/WebhookEnrichment.php

@@ -56,6 +56,9 @@ class WebhookEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $ids               = []; // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
@@ -70,6 +73,9 @@ class WebhookEnrichment implements EnrichmentInterface
     // @phpstan-ignore-line
     // @phpstan-ignore-line
     // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
     private array $responses         = [];
     private array $triggers          = [];
     private array $webhookDeliveries = [];

changelog.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.4.19
+
+### Added
+- The ability to undo the recording of a database migration, which may help with database issues. [See the docs](https://docs.firefly-iii.org/references/faq/firefly-iii/using/#i-get-errors-about-missing-tables-how-do-i-fix-this)
+- Added debug logs to file permission checks
+
+### Fixed
+- View range issue for subscription overview
+- Amount log entries were recorded for the transaction group, not the journal
+- Subscriptions were not being renamed in rules when their names were changed
+- [Issue 11688](https://github.com/firefly-iii/firefly-iii/issues/11688) (Token endpoints returning 401 unauthorized) reported by @molnarti
+- [Issue 11694](https://github.com/firefly-iii/firefly-iii/issues/11694) (Foreign currency amount is always positive in transfers) reported by @SledgehammerPL
+- [Issue 11684](https://github.com/firefly-iii/firefly-iii/issues/11684) (Transaction summary duplicated after more than 10 rows) reported by @jkmf
+- [Issue 11700](https://github.com/firefly-iii/firefly-iii/issues/11700) (Duplicate entry for key 'tag_transaction_journal_tag_id_transaction_journal_id_unique') reported by @beatbesmer
+- [Issue 11702](https://github.com/firefly-iii/firefly-iii/issues/11702) (Can't enable displaying primary currency when using Postgres) reported by @absdjfh
+
 ## v6.4.18
 
 ### Fixed

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-02-13',
-    'build_time'                           => 1770965855,
+    'version'                              => '6.4.19',
+    'build_time'                           => 1771069977,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

package-lock.json

@@ -7118,9 +7118,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.8.6",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.6.tgz",
-            "integrity": "sha512-HsS6p2yr/Vo5EPljWuBJ9OxKVFok2Q/Oa6PvFTpv2bMcDt2sQMOnKDQ7FTDDdME+3d1YULQjKj7aVSZP1bCouQ==",
+            "version": "25.8.7",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.7.tgz",
+            "integrity": "sha512-ttxxc5+67S/0hhoeVdEgc1lRklZhdfcUSEPp1//uUG2NB88X3667gRsDar+ZWQFdysnOsnb32bcoMsa4mtzhkQ==",
             "funding": [
                 {
                     "type": "individual",

resources/assets/v1/src/locales/es.json

@@ -107,18 +107,18 @@
         "multi_account_warning_withdrawal": "Tenga en cuenta que la cuenta de origen de las divisiones posteriores ser\u00e1 anulada por lo que se defina en la primera divisi\u00f3n del gasto.",
         "multi_account_warning_deposit": "Tenga en cuenta que la cuenta de destino de las divisiones posteriores ser\u00e1 anulada por lo que se defina en la primera divisi\u00f3n del retiro.",
         "multi_account_warning_transfer": "Tenga en cuenta que la cuenta de origen + destino de divisiones posteriores ser\u00e1 anulada por lo que se defina en la primera divisi\u00f3n de la transferencia.",
-        "webhook_trigger_ANY": "After any event",
+        "webhook_trigger_ANY": "Despu\u00e9s de cualquier evento",
         "webhook_trigger_STORE_TRANSACTION": "Despu\u00e9s de crear la transacci\u00f3n",
         "webhook_trigger_UPDATE_TRANSACTION": "Despu\u00e9s de actualizar la transacci\u00f3n",
         "webhook_trigger_DESTROY_TRANSACTION": "Despu\u00e9s de eliminar la transacci\u00f3n",
-        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_STORE_BUDGET": "Despu\u00e9s de crear un presupuesto",
         "webhook_trigger_UPDATE_BUDGET": "After budget update",
         "webhook_trigger_DESTROY_BUDGET": "After budget delete",
         "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "Detalles de la transacci\u00f3n",
         "webhook_response_RELEVANT": "Relevant details",
         "webhook_response_ACCOUNTS": "Detalles de la cuenta",
-        "webhook_response_NONE": "No details",
+        "webhook_response_NONE": "Sin detalles",
         "webhook_delivery_JSON": "JSON",
         "actions": "Acciones",
         "meta_data": "Meta Datos",

resources/views/list/groups.twig

@@ -184,11 +184,14 @@
                                 {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                             {% endif %}
                             {% if transaction.source_account_id != account.id %}
-                            {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                                {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                             {% endif %}
 
                             {# foreign amount of transfer #}
-                            {% if null != transaction.foreign_amount %}
+                            {% if null != transaction.foreign_amount and transaction.source_account_id == account.id %}
+                                ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                            {% endif %}
+                            {% if null != transaction.foreign_amount and transaction.source_account_id != account.id %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             {% endif %}