Auto commit for release 'develop' on 2024-05-18

# Conflicts:
#	app/Support/Models/AccountBalanceCalculator.php

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -19,6 +19,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
 $current = __DIR__;
 
 $paths = [
@@ -35,6 +37,7 @@ $finder = PhpCsFixer\Finder::create()
 
 
 $config = new PhpCsFixer\Config();
+$config->setParallelConfig(ParallelConfigFactory::detect());
 return $config->setRules(
     [
         // rule sets

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.1.1
+      - uses: github/command@v1.2.0
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/release.yml

@@ -67,6 +67,15 @@ jobs:
         env:
           FIREFLY_III_ROOT: /github/workspace
           GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
+      - name: "Create THANKS.md"
+        id: thank-you
+        uses: JC5/firefly-iii-dev@main
+        with:
+          action: 'ff3:thank-you'
+          output: ''
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ''
       - name: Extract changelog
         id: extract-changelog
         uses: JC5/firefly-iii-dev@main

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -63,7 +63,7 @@ class StoreRequest extends FormRequest
             'order'                   => $this->convertInteger('order'),
             'currency_code'           => $this->convertString('currency_code'),
             'virtual_balance'         => $this->convertString('virtual_balance'),
-            'iban'                    => $this->convertString('iban'),
+            'iban'                    => $this->convertIban('iban'),
             'BIC'                     => $this->convertString('bic'),
             'account_number'          => $this->convertString('account_number'),
             'account_role'            => $this->convertString('account_role'),

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -51,7 +51,7 @@ class UpdateRequest extends FormRequest
             'include_net_worth'       => ['include_net_worth', 'boolean'],
             'account_type_name'       => ['type', 'convertString'],
             'virtual_balance'         => ['virtual_balance', 'convertString'],
-            'iban'                    => ['iban', 'convertString'],
+            'iban'                    => ['iban', 'convertIban'],
             'BIC'                     => ['bic', 'convertString'],
             'account_number'          => ['account_number', 'convertString'],
             'account_role'            => ['account_role', 'convertString'],

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -103,14 +103,14 @@ class StoreRequest extends FormRequest
                 // source of transaction. If everything is null, assume cash account.
                 'source_id'             => $this->integerFromValue((string)$object['source_id']),
                 'source_name'           => $this->clearString((string)$object['source_name']),
-                'source_iban'           => $this->clearString((string)$object['source_iban']),
+                'source_iban'           => $this->clearIban((string)$object['source_iban']),
                 'source_number'         => $this->clearString((string)$object['source_number']),
                 'source_bic'            => $this->clearString((string)$object['source_bic']),
 
                 // destination of transaction. If everything is null, assume cash account.
                 'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
                 'destination_name'      => $this->clearString((string)$object['destination_name']),
-                'destination_iban'      => $this->clearString((string)$object['destination_iban']),
+                'destination_iban'      => $this->clearIban((string)$object['destination_iban']),
                 'destination_number'    => $this->clearString((string)$object['destination_number']),
                 'destination_bic'       => $this->clearString((string)$object['destination_bic']),
 

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -29,24 +29,20 @@ use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountBalance;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountController
  */
 class AccountController extends Controller
 {
-    //    use AccountFilter;
-    private AdminAccountRepositoryInterface $adminRepository;
-    private TransactionCurrency             $default;
-    private ExchangeRateConverter           $converter;
-
-    //    private array                           $balanceTypes;
-    //    private AccountRepositoryInterface      $repository;
+    private AccountRepositoryInterface $repository;
+    private TransactionCurrency        $default;
+    private ExchangeRateConverter      $converter;
 
     /**
      * AccountController constructor.
@@ -56,20 +52,15 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                // new way of user group validation
-                $userGroup             = $this->validateUserGroup($request);
-                $this->adminRepository = app(AdminAccountRepositoryInterface::class);
-                $this->adminRepository->setUserGroup($userGroup);
-                $this->default         = app('amount')->getDefaultCurrency();
-                $this->converter       = app(ExchangeRateConverter::class);
-
-                //                $this->repository      = app(AccountRepositoryInterface::class);
-                //                $this->adminRepository->setUserGroup($this->validateUserGroup($request));
+                $userGroup        = $this->validateUserGroup($request);
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUserGroup($userGroup);
+                $this->default    = app('amount')->getDefaultCurrency();
+                $this->converter  = app(ExchangeRateConverter::class);
 
                 return $next($request);
             }
         );
-        //        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
     }
 
     /**
@@ -80,13 +71,11 @@ class AccountController extends Controller
      * 3. Request includes user_group_id
      * 4. Endpoint is documented.
      * 5. Collector uses user_group_id
-     *
-     * @throws FireflyException
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
         $queryParameters = $request->getParameters();
-        $result          = $this->adminRepository->searchAccount((string) $queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']);
+        $result          = $this->repository->searchAccount((string) $queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']);
         $return          = [];
 
         /** @var Account $account */
@@ -99,7 +88,7 @@ class AccountController extends Controller
 
     private function parseAccount(Account $account): array
     {
-        $currency = $this->adminRepository->getAccountCurrency($account);
+        $currency = $this->repository->getAccountCurrency($account);
 
         return [
             'id'    => (string) $account->id,
@@ -118,16 +107,23 @@ class AccountController extends Controller
     private function getAccountBalances(Account $account): array
     {
         $return   = [];
-        $balances = $this->adminRepository->getAccountBalances($account);
+        $balances = $this->repository->getAccountBalances($account);
 
         /** @var AccountBalance $balance */
         foreach ($balances as $balance) {
-            $return[] = $this->parseAccountBalance($balance);
+            try {
+                $return[] = $this->parseAccountBalance($balance);
+            } catch (FireflyException $e) {
+                Log::error(sprintf('Could not parse convert account balance: %s', $e->getMessage()));
+            }
         }
 
         return $return;
     }
 
+    /**
+     * @throws FireflyException
+     */
     private function parseAccountBalance(AccountBalance $balance): array
     {
         $currency = $balance->transactionCurrency;

app/Api/V2/Controllers/Autocomplete/CategoryController.php

@@ -63,13 +63,14 @@ class CategoryController extends Controller
      */
     public function categories(AutocompleteRequest $request): JsonResponse
     {
-        $data     = $request->getData();
-        $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
-        $filtered = $result->map(
+        $queryParameters = $request->getParameters();
+        $result          = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']);
+        $filtered        = $result->map(
             static function (Category $item) {
                 return [
-                    'id'   => (string)$item->id,
-                    'name' => $item->name,
+                    'id'    => (string)$item->id,
+                    'title' => $item->name,
+                    'meta'  => [],
                 ];
             }
         );

app/Api/V2/Controllers/Autocomplete/TagController.php

@@ -63,15 +63,16 @@ class TagController extends Controller
      */
     public function tags(AutocompleteRequest $request): JsonResponse
     {
-        $data     = $request->getData();
-        $result   = $this->repository->searchTag($data['query'], $data['limit']);
-        $filtered = $result->map(
+        $queryParameters = $request->getParameters();
+        $result          = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']);
+        $filtered        = $result->map(
             static function (Tag $item) {
                 return [
-                    'id'    => (string)$item->id,
-                    'name'  => $item->tag,
-                    'value' => (string)$item->id,
+                    'id'    => (string) $item->id,
+                    'title' => $item->tag,
+                    'value' => (string) $item->id,
                     'label' => $item->tag,
+                    'meta'  => [],
                 ];
             }
         );

app/Api/V2/Controllers/Autocomplete/TransactionController.php

@@ -63,20 +63,21 @@ class TransactionController extends Controller
      */
     public function transactionDescriptions(AutocompleteRequest $request): JsonResponse
     {
-        $data     = $request->getData();
-        $result   = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+        $queryParameters = $request->getParameters();
+        $result          = $this->repository->searchJournalDescriptions($queryParameters['query'], $queryParameters['size']);
 
         // limit and unique
-        $filtered = $result->unique('description');
-        $array    = [];
+        $filtered        = $result->unique('description');
+        $array           = [];
 
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
             $array[] = [
-                'id'                   => (string)$journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
-                'name'                 => $journal->description,
-                'description'          => $journal->description,
+                'id'    => (string) $journal->id,
+                'title' => $journal->description,
+                'meta'  => [
+                    'transaction_group_id' => (string) $journal->transaction_group_id,
+                ],
             ];
         }
 

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -73,27 +73,28 @@ class AutocompleteRequest extends FormRequest
         ];
     }
 
-    public function getData(): array
-    {
-        return [];
-        $types = $this->convertString('types');
-        $array = [];
-        if ('' !== $types) {
-            $array = explode(',', $types);
-        }
-        $limit = $this->convertInteger('limit');
-        $limit = 0 === $limit ? 10 : $limit;
-
-        // remove 'initial balance' and another from allowed types. its internal
-        $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
-
-        return [
-            'types' => $array,
-            'query' => $this->convertString('query'),
-            'date'  => $this->getCarbonDate('date'),
-            'limit' => $limit,
-        ];
-    }
+    //    public function getData(): array
+    //    {
+    //
+    //        return [];
+    //        $types = $this->convertString('types');
+    //        $array = [];
+    //        if ('' !== $types) {
+    //            $array = explode(',', $types);
+    //        }
+    //        $limit = $this->convertInteger('limit');
+    //        $limit = 0 === $limit ? 10 : $limit;
+    //
+    //        // remove 'initial balance' and another from allowed types. its internal
+    //        $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
+    //
+    //        return [
+    //            'types' => $array,
+    //            'query' => $this->convertString('query'),
+    //            'date'  => $this->getCarbonDate('date'),
+    //            'limit' => $limit,
+    //        ];
+    //    }
 
     public function rules(): array
     {

app/Console/Commands/Correction/CorrectAccountBalance.php

@@ -27,6 +27,6 @@ class CorrectAccountBalance extends Command
 
     private function correctBalanceAmounts(): void
     {
-        AccountBalanceCalculator::recalculate(null, null);
+        AccountBalanceCalculator::recalculateAll();
     }
 }

app/Console/Commands/Correction/FixIbans.php

@@ -60,15 +60,13 @@ class FixIbans extends Command
     {
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $iban = $account->iban;
-            if (str_contains($iban, ' ')) {
-                $iban = app('steam')->filterSpaces((string)$account->iban);
-                if ('' !== $iban) {
-                    $account->iban = $iban;
-                    $account->save();
-                    $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
-                    ++$this->count;
-                }
+            $iban    = (string) $account->iban;
+            $newIban = app('steam')->filterSpaces($iban);
+            if ('' !== $iban && $iban !== $newIban) {
+                $account->iban = $newIban;
+                $account->save();
+                $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                ++$this->count;
             }
         }
     }
@@ -81,7 +79,7 @@ class FixIbans extends Command
         foreach ($accounts as $account) {
             $userId = $account->user_id;
             $set[$userId] ??= [];
-            $iban   = (string)$account->iban;
+            $iban   = (string) $account->iban;
             if ('' === $iban) {
                 continue;
             }

app/Handlers/Observer/TransactionObserver.php

@@ -40,12 +40,12 @@ class TransactionObserver
     public function updated(Transaction $transaction): void
     {
         app('log')->debug('Observe "updated" of a transaction.');
-        AccountBalanceCalculator::recalculateForAccount($transaction->account);
+        AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
     }
 
     public function created(Transaction $transaction): void
     {
         app('log')->debug('Observe "created" of a transaction.');
-        AccountBalanceCalculator::recalculateForAccount($transaction->account);
+        AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
     }
 }

app/Http/Requests/AccountFormRequest.php

@@ -57,7 +57,7 @@ class AccountFormRequest extends FormRequest
             'account_type_name'       => $this->convertString('objectType'),
             'currency_id'             => $this->convertInteger('currency_id'),
             'virtual_balance'         => $this->convertString('virtual_balance'),
-            'iban'                    => $this->convertString('iban'),
+            'iban'                    => $this->convertIban('iban'),
             'BIC'                     => $this->convertString('BIC'),
             'account_number'          => $this->convertString('account_number'),
             'account_role'            => $this->convertString('account_role'),

app/Repositories/Account/AccountRepository.php

@@ -37,6 +37,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -123,6 +124,7 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function findByIbanNull(string $iban, array $types): ?Account
     {
+        $iban  = Steam::filterSpaces($iban);
         $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
         if (0 !== count($types)) {

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
@@ -80,6 +81,7 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function findByIbanNull(string $iban, array $types): ?Account
     {
+        $iban  = Steam::filterSpaces($iban);
         $query = $this->userGroup->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
         if (0 !== count($types)) {

app/Rules/UniqueIban.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Rules;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Contracts\Validation\ValidationRule;
 
 /**
@@ -95,6 +96,9 @@ class UniqueIban implements ValidationRule
         $maxCounts = $this->getMaxOccurrences();
 
         foreach ($maxCounts as $type => $max) {
+            // make sure to trim the value of $value so all spaces are removed.
+            $value = Steam::filterSpaces($value);
+
             $count = $this->countHits($type, $value);
             app('log')->debug(sprintf('Count for "%s" and IBAN "%s" is %d', $type, $value, $count));
             if ($count > $max) {

app/Support/Models/AccountBalanceCalculator.php

@@ -31,38 +31,34 @@ use Illuminate\Support\Facades\Log;
 
 class AccountBalanceCalculator
 {
+    private function __construct()
+    {
+        // no-op
+    }
+
     /**
      * Recalculate all balances for a given account.
      *
      * Je moet toch altijd wel alles doen want je weet niet waar een transaction journal invloed op heeft.
      * Dus dit aantikken per transaction journal is zinloos, beide accounts moeten gedaan worden.
      */
-    public static function recalculateForAccount(Account $account): void
+    public static function recalculateAll(): void
     {
-        self::recalculate($account);
+        $object = new self();
+        $object->recalculateLatest(null);
+        // $object->recalculateJournals(null, null);
     }
 
-    public static function recalculateForTransactionJournal(TransactionJournal $transactionJournal): void
+    public static function recalculateForJournal(TransactionJournal $transactionJournal): void
     {
+        $object = new self();
         foreach ($transactionJournal->transactions as $transaction) {
-            self::recalculateForAccount($transaction->account);
+            $object->recalculateLatest($transaction->account);
+            // $object->recalculateJournals($transaction->account, $transactionJournal);
         }
     }
 
-    /**
-     * select account_id, transaction_currency_id, foreign_currency_id, sum(amount), sum(foreign_amount) from
-     * transactions group by account_id, transaction_currency_id, foreign_currency_id
-     */
-    public static function recalculate(?Account $account): void
-    {
-        self::recalculateLatest($account);
-        // loop all transaction journals and set those amounts too.
-        self::recalculateJournals($account);
-
-        // loop all dates and set those amounts too.
-    }
-
-    private static function getAccountBalanceByAccount(int $account, int $currency): AccountBalance
+    private function getAccountBalanceByAccount(int $account, int $currency): AccountBalance
     {
         $query                          = AccountBalance::where('title', 'balance')->where('account_id', $account)->where('transaction_currency_id', $currency);
 
@@ -83,7 +79,7 @@ class AccountBalanceCalculator
         return $entry;
     }
 
-    private static function getAccountBalanceByJournal(string $title, int $account, int $journal, int $currency): AccountBalance
+    private function getAccountBalanceByJournal(string $title, int $account, int $journal, int $currency): AccountBalance
     {
         $query                          = AccountBalance::where('title', $title)->where('account_id', $account)->where('transaction_journal_id', $journal)->where('transaction_currency_id', $currency);
 
@@ -102,7 +98,7 @@ class AccountBalanceCalculator
         return $entry;
     }
 
-    private static function recalculateLatest(?Account $account): void
+    private function recalculateLatest(?Account $account): void
     {
         $query  = Transaction::groupBy(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']);
 
@@ -112,7 +108,7 @@ class AccountBalanceCalculator
         $result = $query->get(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]);
 
         // reset account balances:
-        self::resetAccountBalancesByAccount('balance', $account);
+        $this->resetAccountBalancesByAccount('balance', $account);
 
         /** @var \stdClass $row */
         foreach ($result as $row) {
@@ -123,52 +119,57 @@ class AccountBalanceCalculator
             $sumForeignAmount    = $row->sum_foreign_amount;
 
             // first create for normal currency:
-            $entry               = self::getAccountBalanceByAccount($account, $transactionCurrency);
+            $entry               = $this->getAccountBalanceByAccount($account, $transactionCurrency);
             $entry->balance      = bcadd($entry->balance, $sumAmount);
             $entry->save();
-            //            Log::debug(sprintf('Set balance entry  #%d ("balance") to amount %s', $entry->id, $entry->balance));
 
             // then do foreign amount, if present:
             if ($foreignCurrency > 0) {
-                $entry          = self::getAccountBalanceByAccount($account, $foreignCurrency);
+                $entry          = $this->getAccountBalanceByAccount($account, $foreignCurrency);
                 $entry->balance = bcadd($entry->balance, $sumForeignAmount);
                 $entry->save();
-                //                Log::debug(sprintf('Set balance entry  #%d ("balance") to amount %s', $entry->id, $entry->balance));
             }
         }
+        Log::debug(sprintf('Recalculated %d account balance(s)', $result->count()));
     }
 
-    private static function resetAccountBalancesByAccount(string $title, ?Account $account): void
+    private function resetAccountBalancesByAccount(string $title, ?Account $account): void
     {
         if (null === $account) {
-            AccountBalance::whereNotNull('updated_at')->where('title', $title)->update(['balance' => '0']);
-            Log::debug('Set ALL balances to zero.');
+            $count = AccountBalance::whereNotNull('updated_at')->where('title', $title)->update(['balance' => '0']);
+            Log::debug(sprintf('Set %d account balance(s) to zero.', $count));
 
             return;
         }
-        AccountBalance::where('account_id', $account->id)->where('title', $title)->update(['balance' => '0']);
-        Log::debug(sprintf('Set balances of account #%d to zero.', $account->id));
+        $count = AccountBalance::where('account_id', $account->id)->where('title', $title)->update(['balance' => '0']);
+        Log::debug(sprintf('Set %d account balance(s) of account #%d to zero.', $count, $account->id));
     }
 
-    public static function recalculateByJournal(TransactionJournal $transactionJournal): void
-    {
-        Log::debug(sprintf('Recalculate balance after journal #%d', $transactionJournal->id));
-        // update both account balances, but limit to this transaction or earlier.
-        foreach ($transactionJournal->transactions as $transaction) {
-            self::recalculate($transaction->account, $transactionJournal);
-        }
-    }
-
-    private static function recalculateJournals(?Account $account): void
+    /**
+     * Als je alles opnieuw doet, verzamel je alle transactions en het bedrag en zet je dat neer als "balance after journal".
+     * Dat betekent, netjes op volgorde van datum en doorrekenen.
+     *
+     * Zodra je een transaction journal verplaatst (datum) moet je dat journal en alle latere journals opnieuw doen.
+     * Maar dan moet je van de account wel een beginnetje hebben, namelijk de balance tot en met dat moment.
+     *
+     *  1. Dus dan search je eerst naar die SUM, som alle transactions eerder dan (niet inclusief) de journal.
+     *  2. En vanaf daar pak je alle journals op of na de journal (dus ook de journal zelf) en begin je door te tellen.
+     *  3. Elke voorbij gaande journal entry "balance_after_journal" geef je een update of voeg je toe.
+     */
+    private function recalculateJournals(?Account $account, ?TransactionJournal $transactionJournal): void
     {
         $query   = Transaction::groupBy(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']);
         $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id');
         $query->orderBy('transaction_journals.date', 'asc');
+        $amounts = [];
         if (null !== $account) {
             $query->where('transactions.account_id', $account->id);
         }
+        if (null !== $account && null !== $transactionJournal) {
+            $query->where('transaction_journals.date', '>=', $transactionJournal->date);
+            $amounts = $this->getStartAmounts($account, $transactionJournal);
+        }
         $result  = $query->get(['transactions.account_id', 'transaction_journals.id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', \DB::raw('SUM(transactions.amount) as sum_amount'), \DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]);
-        $amounts = [];
 
         /** @var \stdClass $row */
         foreach ($result as $row) {
@@ -205,4 +206,11 @@ class AccountBalanceCalculator
         // group by account_id, transaction_journals.id, transaction_currency_id, foreign_currency_id
         // order by transaction_journals.date desc
     }
+
+    private function getStartAmounts(Account $account, TransactionJournal $journal): array
+    {
+        exit('here we are');
+
+        return [];
+    }
 }

app/Support/Request/ConvertsDataTypes.php

@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
 
 /**
@@ -114,6 +115,11 @@ trait ConvertsDataTypes
         return (string)$this->clearString((string)$entry);
     }
 
+    public function convertIban(string $field): string
+    {
+        return Steam::filterSpaces($this->convertString($field));
+    }
+
     public function clearString(?string $string): ?string
     {
         $string = $this->clearStringKeepNewlines($string);
@@ -131,6 +137,13 @@ trait ConvertsDataTypes
         return trim($string);
     }
 
+    public function clearIban(?string $string): ?string
+    {
+        $string = $this->clearString($string);
+
+        return Steam::filterSpaces($string);
+    }
+
     public function clearStringKeepNewlines(?string $string): ?string
     {
         if (null === $string) {

app/Support/Steam.php

@@ -681,11 +681,13 @@ class Steam
             "\u{202F}", // narrow no-break space
             "\u{3000}", // ideographic space
             "\u{FEFF}", // zero width no -break space
-            "\x20", // plain old normal space
+            "\x20", // plain old normal space,
+            ' ',
         ];
 
         // clear zalgo text
         $string = preg_replace('/(\pM{2})\pM+/u', '\1', $string);
+        $string = preg_replace('/\s+/', '', $string);
 
         return str_replace($search, '', $string);
     }

app/Validation/FireflyValidator.php

@@ -170,6 +170,7 @@ class FireflyValidator extends Validator
             "\u{202F}", // narrow no-break space
             "\u{3000}", // ideographic space
             "\u{FEFF}", // zero width no -break space
+            ' ',
             '-',
             '?',
         ];

composer.lock

@@ -10420,16 +10420,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.11",
+            "version": "1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                 "shasum": ""
             },
             "require": {
@@ -10499,7 +10499,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-03-21T18:34:15+00:00"
+            "time": "2024-05-16T03:13:13+00:00"
         },
         {
             "name": "myclabs/deep-copy",

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-05-16',
+    'version'                      => 'develop/2024-05-18',
     'api_version'                  => '2.0.14',
     'db_version'                   => 24,
 

package-lock.json

@@ -4020,9 +4020,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001618",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001618.tgz",
-            "integrity": "sha512-p407+D1tIkDvsEAPS22lJxLQQaG8OTBEqo0KhzfABGk0TU4juBNDSfH0hyAp/HRyx+M8L17z/ltyhxh27FTfQg==",
+            "version": "1.0.30001620",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz",
+            "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==",
             "dev": true,
             "funding": [
                 {
@@ -4065,9 +4065,9 @@
             }
         },
         "node_modules/chart.js": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
-            "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.3.tgz",
+            "integrity": "sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==",
             "dependencies": {
                 "@kurkle/color": "^0.3.0"
             },
@@ -5095,9 +5095,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.772",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.772.tgz",
-            "integrity": "sha512-jFfEbxR/abTTJA3ci+2ok1NTuOBBtB4jH+UT6PUmRN+DY3WSD4FFRsgoVQ+QNIJ0T7wrXwzsWCI2WKC46b++2A==",
+            "version": "1.4.774",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz",
+            "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==",
             "dev": true
         },
         "node_modules/elliptic": {
@@ -5213,9 +5213,9 @@
             }
         },
         "node_modules/es-module-lexer": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
-            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
+            "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
             "dev": true
         },
         "node_modules/esbuild": {
@@ -6305,9 +6305,9 @@
             }
         },
         "node_modules/i18next-http-backend": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.1.tgz",
-            "integrity": "sha512-+rNX1tghdVxdfjfPt0bI1sNg5ahGW9kA7OboG7b4t03Fp69NdDlRIze6yXhIbN8rbHxJ8IP4dzRm/okZ15lkQg==",
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.2.tgz",
+            "integrity": "sha512-+K8HbDfrvc1/2X8jpb7RLhI9ZxBDpx3xogYkQwGKlWAUXLSEGXzgdt3EcUjLlBCdMwdQY+K+EUF6oh8oB6rwHw==",
             "dependencies": {
                 "cross-fetch": "4.0.0"
             }
@@ -6945,9 +6945,9 @@
             }
         },
         "node_modules/laravel-vite-plugin": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz",
-            "integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==",
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.4.tgz",
+            "integrity": "sha512-dEj8Q/Fsn0kKbOQ55bl/NmyJL+dD6OxnVaM/nNByw5XV4b00ky6FzXKVuHLDr4BvSJKH1y6oaOcEG5wKpCZ5+A==",
             "dev": true,
             "dependencies": {
                 "picocolors": "^1.0.0",
@@ -9074,9 +9074,9 @@
             "dev": true
         },
         "node_modules/sass": {
-            "version": "1.77.1",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.1.tgz",
-            "integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==",
+            "version": "1.77.2",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz",
+            "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",
@@ -10922,7 +10922,7 @@
                 "alpinejs": "^3.13.7",
                 "bootstrap": "^5.3.0",
                 "bootstrap5-autocomplete": "^1.1.22",
-                "bootstrap5-tags": "^1.6.15",
+                "bootstrap5-tags": "^1.7",
                 "chart.js": "^4.4.0",
                 "chartjs-adapter-date-fns": "^3.0.0",
                 "chartjs-chart-sankey": "^0.12.1",

resources/assets/v2/package.json

@@ -26,7 +26,7 @@
         "alpinejs": "^3.13.7",
         "bootstrap": "^5.3.0",
         "bootstrap5-autocomplete": "^1.1.22",
-        "bootstrap5-tags": "^1.6.15",
+        "bootstrap5-tags": "^1.7",
         "chart.js": "^4.4.0",
         "chartjs-adapter-date-fns": "^3.0.0",
         "chartjs-chart-sankey": "^0.12.1",

resources/assets/v2/src/pages/transactions/create.js

@@ -470,7 +470,11 @@ let transactions = function () {
                     server: urls.tag,
                     liveServer: true,
                     clearEnd: true,
+                    labelField: 'title',
+                    valueField: 'id',
+                    queryParam: 'filter[query]',
                     allowNew: true,
+                    serverDataKey: 'data',
                     notFoundMessage: i18next.t('firefly.nothing_found'),
                     noCache: true,
                     fetchOptions: {
@@ -491,7 +495,6 @@ let transactions = function () {
                 addAutocomplete({
                     selector: 'input.ac-source',
                     serverUrl: urls.account,
-                    // filters: this.filters.source,
                     onRenderItem: renderAccount,
                     valueField: 'id',
                     labelField: 'title',
@@ -513,7 +516,7 @@ let transactions = function () {
                     selector: 'input.ac-category',
                     serverUrl: urls.category,
                     valueField: 'id',
-                    labelField: 'name',
+                    labelField: 'title',
                     onChange: changeCategory,
                     onSelectItem: changeCategory
                 });
@@ -521,7 +524,7 @@ let transactions = function () {
                     selector: 'input.ac-description',
                     serverUrl: urls.description,
                     valueField: 'id',
-                    labelField: 'description',
+                    labelField: 'title',
                     onChange: changeDescription,
                     onSelectItem: changeDescription,
                 });

resources/assets/v2/src/pages/transactions/edit.js

@@ -216,6 +216,8 @@ let transactions = function () {
                 addAutocomplete({
                     selector: 'input.ac-dest',
                     serverUrl: urls.account,
+                    valueField: 'id',
+                    labelField: 'title',
                     account_types: this.filters.destination,
                     onRenderItem: renderAccount,
                     onChange: changeDestinationAccount,
@@ -233,7 +235,7 @@ let transactions = function () {
                     selector: 'input.ac-description',
                     serverUrl: urls.description,
                     valueField: 'id',
-                    labelField: 'description',
+                    labelField: 'title',
                     onChange: changeDescription,
                     onSelectItem: changeDescription,
                 });
@@ -304,6 +306,9 @@ let transactions = function () {
                         liveServer: true,
                         clearEnd: true,
                         allowNew: true,
+                        labelField: 'title',
+                        valueField: 'id',
+                        queryParam: 'filter[query]',
                         notFoundMessage: i18next.t('firefly.nothing_found'),
                         noCache: true,
                         fetchOptions: {

resources/lang/pt_BR/firefly.php

@@ -2157,7 +2157,7 @@ return [
     'logout'                                              => 'Desconectar',
     'logout_other_sessions'                               => 'Sair de todas as outras sessões',
     'toggleNavigation'                                    => 'Alternar navegação',
-    'toggle_dropdown'                                     => 'Toggle dropdown',
+    'toggle_dropdown'                                     => 'Ativar/Desativar Menu Suspenso',
     'searchPlaceholder'                                   => 'Pesquisar...',
     'version'                                             => 'Versão',
     'dashboard'                                           => 'Painel de Controle',

routes/api.php

@@ -39,9 +39,9 @@ Route::group(
     static function (): void {
         // Auto complete routes
         Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']);
-        Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
         Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
         Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);
+        Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
     }
 );