Merge pull request #10401 from firefly-iii/release-1748835078

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -34,7 +34,6 @@ use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -73,26 +72,24 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
         app('log')->debug('Now in update routine for transaction group');
-        $data             = $request->getAll();
-        $oldAmount        = $this->groupRepository->getTotalAmount($transactionGroup);
-        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
-        $newAmount        = $this->groupRepository->getTotalAmount($transactionGroup);
-        $manager          = $this->getManager();
-
-        Log::debug(sprintf('Old amount: %s, new amount: %s', $oldAmount, $newAmount));
+        $data              = $request->getAll();
+        $oldHash           = $this->groupRepository->getCompareHash($transactionGroup);
+        $transactionGroup  = $this->groupRepository->update($transactionGroup, $data);
+        $newHash           = $this->groupRepository->getCompareHash($transactionGroup);
+        $manager           = $this->getManager();
 
         app('preferences')->mark();
-        $applyRules       = $data['apply_rules'] ?? true;
-        $fireWebhooks     = $data['fire_webhooks'] ?? true;
-        $amountChanged    = 0 !== bccomp($oldAmount, $newAmount);
-        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $amountChanged));
+        $applyRules        = $data['apply_rules'] ?? true;
+        $fireWebhooks      = $data['fire_webhooks'] ?? true;
+        $runRecalculations = $oldHash !== $newHash;
+        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $runRecalculations));
 
         /** @var User $admin */
-        $admin            = auth()->user();
+        $admin             = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector        = app(GroupCollectorInterface::class);
+        $collector         = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
             // filter on transaction group.
@@ -101,20 +98,20 @@ class UpdateController extends Controller
             ->withAPIInformation()
         ;
 
-        $selectedGroup    = $collector->getGroups()->first();
+        $selectedGroup     = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new NotFoundHttpException();
         }
 
         // enrich
-        $enrichment       = new TransactionGroupEnrichment();
+        $enrichment        = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
-        $selectedGroup    = $enrichment->enrichSingle($selectedGroup);
+        $selectedGroup     = $enrichment->enrichSingle($selectedGroup);
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer      = app(TransactionGroupTransformer::class);
+        $transformer       = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource         = new Item($selectedGroup, $transformer, 'transactions');
+        $resource          = new Item($selectedGroup, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

app/Api/V2/Controllers/Model/Transaction/UpdateController.php

@@ -65,29 +65,29 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
         app('log')->debug('Now in update routine for transaction group [v2]!');
-        $data             = $request->getAll();
-        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
-        $applyRules       = $data['apply_rules'] ?? true;
-        $fireWebhooks     = $data['fire_webhooks'] ?? true;
-        $amountChanged    = true;
+        $data              = $request->getAll();
+        $transactionGroup  = $this->groupRepository->update($transactionGroup, $data);
+        $applyRules        = $data['apply_rules'] ?? true;
+        $fireWebhooks      = $data['fire_webhooks'] ?? true;
+        $runRecalculations = true;
 
-        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $amountChanged));
+        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks, $runRecalculations));
         app('preferences')->mark();
 
         /** @var User $admin */
-        $admin            = auth()->user();
+        $admin             = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector        = app(GroupCollectorInterface::class);
+        $collector         = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setTransactionGroup($transactionGroup);
 
-        $selectedGroup    = $collector->getGroups()->first();
+        $selectedGroup     = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
 
-        $transformer      = new TransactionGroupTransformer();
+        $transformer       = new TransactionGroupTransformer();
         $transformer->setParameters($this->parameters);
 
         return response()->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))->header('Content-Type', self::CONTENT_TYPE);

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -58,6 +58,7 @@ class CorrectsGroupAccounts extends Command
         $handler = new UpdatedGroupEventHandler();
         foreach ($groups as $groupId) {
             $group = TransactionGroup::find($groupId);
+            // TODO in theory the "unifyAccounts" method could lead to the need for run recalculations.
             $event = new UpdatedTransactionGroup($group, true, true, false);
             $handler->unifyAccounts($event);
         }

app/Events/UpdatedTransactionGroup.php

@@ -37,5 +37,5 @@ class UpdatedTransactionGroup extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public TransactionGroup $transactionGroup, public bool $applyRules, public bool $fireWebhooks, public bool $amountChanged) {}
+    public function __construct(public TransactionGroup $transactionGroup, public bool $applyRules, public bool $fireWebhooks, public bool $runRecalculations) {}
 }

app/Http/Controllers/Transaction/ConvertController.php

@@ -292,7 +292,7 @@ class ConvertController extends Controller
         $group->refresh();
 
         session()->flash('success', (string) trans('firefly.converted_to_'.$destinationType->type));
-        event(new UpdatedTransactionGroup($group, true, true, false));
+        event(new UpdatedTransactionGroup($group, true, true, true));
 
         return redirect(route('transactions.show', [$group->id]));
     }

app/Http/Controllers/Transaction/MassController.php

@@ -191,15 +191,15 @@ class MassController extends Controller
      */
     private function updateJournal(int $journalId, MassEditJournalRequest $request): void
     {
-        $journal       = $this->repository->find($journalId);
+        $journal           = $this->repository->find($journalId);
         if (!$journal instanceof TransactionJournal) {
             throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
         }
-        $service       = app(JournalUpdateService::class);
+        $service           = app(JournalUpdateService::class);
         // for each field, call the update service.
         $service->setTransactionJournal($journal);
 
-        $data          = [
+        $data              = [
             'date'             => $this->getDateFromRequest($request, $journal->id, 'date'),
             'description'      => $this->getStringFromRequest($request, $journal->id, 'description'),
             'source_id'        => $this->getIntFromRequest($request, $journal->id, 'source_id'),
@@ -217,8 +217,8 @@ class MassController extends Controller
         $service->setData($data);
         $service->update();
         // trigger rules
-        $amountChanged = $service->isAmountChanged();
-        event(new UpdatedTransactionGroup($journal->transactionGroup, true, true, $amountChanged));
+        $runRecalculations = $service->isCompareHashChanged();
+        event(new UpdatedTransactionGroup($journal->transactionGroup, true, true, $runRecalculations));
     }
 
     private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -217,7 +217,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
                     'link'           => $entry->outward,
                     'group'          => $entry->destination->transaction_group_id,
                     'description'    => $entry->destination->description,
-                    'editable'       => 1 === (int) $entry->editable,
+                    'editable'       => 1 === (int)$entry->editable,
                     'amount'         => $amount,
                     'foreign_amount' => $foreignAmount,
                 ];
@@ -230,7 +230,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
                     'link'           => $entry->inward,
                     'group'          => $entry->source->transaction_group_id,
                     'description'    => $entry->source->description,
-                    'editable'       => 1 === (int) $entry->editable,
+                    'editable'       => 1 === (int)$entry->editable,
                     'amount'         => $amount,
                     'foreign_amount' => $foreignAmount,
                 ];
@@ -264,7 +264,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         if (null === $transaction->foreign_amount || '' === $transaction->foreign_amount) {
             return '';
         }
-        if (0 === bccomp('0', (string) $transaction->foreign_amount)) {
+        if (0 === bccomp('0', (string)$transaction->foreign_amount)) {
             return '';
         }
         $currency    = $transaction->foreignCurrency;
@@ -305,7 +305,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         $return = [];
 
         foreach ($query as $row) {
-            $return[$row->name] = new Carbon(json_decode((string) $row->data, true, 512, JSON_THROW_ON_ERROR));
+            $return[$row->name] = new Carbon(json_decode((string)$row->data, true, 512, JSON_THROW_ON_ERROR));
         }
 
         return new NullArrayObject($return);
@@ -325,7 +325,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         $return = [];
 
         foreach ($query as $row) {
-            $return[$row->name] = json_decode((string) $row->data);
+            $return[$row->name] = json_decode((string)$row->data);
         }
 
         return new NullArrayObject($return);
@@ -433,20 +433,22 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         return $service->update($transactionGroup, $data);
     }
 
-    public function getTotalAmount(TransactionGroup $group): string
+    public function getCompareHash(TransactionGroup $group): string
     {
-        $sum = '0';
+        $sum   = '0';
+        $names = '';
 
         /** @var TransactionJournal $journal */
         foreach ($group->transactionJournals as $journal) {
             /** @var Transaction $transaction */
             foreach ($journal->transactions as $transaction) {
-                if (-1 === bccomp('0', (string) $transaction->amount)) {
-                    $sum = bcadd($sum, $transaction->amount);
+                if (-1 === bccomp('0', (string)$transaction->amount)) {
+                    $sum   = bcadd($sum, $transaction->amount);
+                    $names = sprintf('%s%s', $names, $transaction->account->name);
                 }
             }
         }
 
-        return $sum;
+        return hash('sha256', sprintf('%s-%s', $names, $sum));
     }
 }

app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php

@@ -49,7 +49,10 @@ interface TransactionGroupRepositoryInterface
 {
     public function countAttachments(int $journalId): int;
 
-    public function getTotalAmount(TransactionGroup $group): string;
+    /**
+     * Small method that returns a hash that can be used to compare two transaction groups.
+     */
+    public function getCompareHash(TransactionGroup $group): string;
 
     public function destroy(TransactionGroup $group): void;
 

app/Services/Internal/Update/JournalUpdateService.php

@@ -43,6 +43,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
 use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\NullArrayObject;
@@ -60,6 +61,7 @@ class JournalUpdateService
 
     private BillRepositoryInterface $billRepository;
     private CurrencyRepositoryInterface $currencyRepository;
+    private TransactionGroupRepositoryInterface $transactionGroupRepository;
     private array $data;
     private ?Account $destinationAccount;
     private ?Transaction $destinationTransaction;
@@ -69,26 +71,27 @@ class JournalUpdateService
     private ?Transaction $sourceTransaction;
     private ?TransactionGroup $transactionGroup;
     private ?TransactionJournal $transactionJournal;
-    private bool $amountChanged = false;
+    private string $startCompareHash = '';
 
     /**
      * JournalUpdateService constructor.
      */
     public function __construct()
     {
-        $this->destinationAccount     = null;
-        $this->destinationTransaction = null;
-        $this->sourceAccount          = null;
-        $this->sourceTransaction      = null;
-        $this->transactionGroup       = null;
-        $this->transactionJournal     = null;
-        $this->billRepository         = app(BillRepositoryInterface::class);
-        $this->categoryRepository     = app(CategoryRepositoryInterface::class);
-        $this->budgetRepository       = app(BudgetRepositoryInterface::class);
-        $this->tagFactory             = app(TagFactory::class);
-        $this->accountRepository      = app(AccountRepositoryInterface::class);
-        $this->currencyRepository     = app(CurrencyRepositoryInterface::class);
-        $this->metaString             = [
+        $this->destinationAccount         = null;
+        $this->destinationTransaction     = null;
+        $this->sourceAccount              = null;
+        $this->sourceTransaction          = null;
+        $this->transactionGroup           = null;
+        $this->transactionJournal         = null;
+        $this->billRepository             = app(BillRepositoryInterface::class);
+        $this->categoryRepository         = app(CategoryRepositoryInterface::class);
+        $this->budgetRepository           = app(BudgetRepositoryInterface::class);
+        $this->tagFactory                 = app(TagFactory::class);
+        $this->accountRepository          = app(AccountRepositoryInterface::class);
+        $this->currencyRepository         = app(CurrencyRepositoryInterface::class);
+        $this->transactionGroupRepository = app(TransactionGroupRepositoryInterface::class);
+        $this->metaString                 = [
             'sepa_cc',
             'sepa_ct_op',
             'sepa_ct_id',
@@ -103,7 +106,7 @@ class JournalUpdateService
             'external_id',
             'external_url',
         ];
-        $this->metaDate               = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date',
+        $this->metaDate                   = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date',
             'invoice_date', ];
     }
 
@@ -120,10 +123,12 @@ class JournalUpdateService
         $this->budgetRepository->setUser($transactionGroup->user);
         $this->tagFactory->setUser($transactionGroup->user);
         $this->accountRepository->setUser($transactionGroup->user);
+        $this->transactionGroupRepository->setUser($transactionGroup->user);
         $this->destinationAccount     = null;
         $this->destinationTransaction = null;
         $this->sourceAccount          = null;
         $this->sourceTransaction      = null;
+        $this->startCompareHash       = $this->transactionGroupRepository->getCompareHash($transactionGroup);
     }
 
     public function setTransactionJournal(TransactionJournal $transactionJournal): void
@@ -675,7 +680,6 @@ class JournalUpdateService
             return;
         }
         $origSourceTransaction                = $this->getSourceTransaction();
-        $this->amountChanged                  = 0 !== bccomp($origSourceTransaction->amount, app('steam')->negative($amount));
         $origSourceTransaction->amount        = app('steam')->negative($amount);
         $origSourceTransaction->balance_dirty = true;
         $origSourceTransaction->save();
@@ -818,8 +822,13 @@ class JournalUpdateService
         return false;
     }
 
-    public function isAmountChanged(): bool
+    public function isCompareHashChanged(): bool
     {
-        return $this->amountChanged;
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        $compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionGroup);
+        Log::debug(sprintf('Compare hash is       "%s".', $compareHash));
+        Log::debug(sprintf('Start compare hash is "%s".', $this->startCompareHash));
+
+        return $compareHash !== $this->startCompareHash;
     }
 }

app/Support/Cronjobs/RecurringCronjob.php

@@ -28,6 +28,8 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Jobs\CreateRecurringTransactions;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class RecurringCronjob
@@ -39,34 +41,34 @@ class RecurringCronjob extends AbstractCronjob
      */
     public function fire(): void
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
 
         /** @var Configuration $config */
-        $config        = app('fireflyconfig')->get('last_rt_job', 0);
+        $config        = FireflyConfig::get('last_rt_job', 0);
         $lastTime      = (int) $config->data;
         $diff          = Carbon::now()->getTimestamp() - $lastTime;
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
 
         if (0 === $lastTime) {
-            app('log')->info('Recurring transactions cron-job has never fired before.');
+            Log::info('Recurring transactions cron-job has never fired before.');
         }
         // less than half a day ago:
         if ($lastTime > 0 && $diff <= 43200) {
-            app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired.', $diffForHumans));
+            Log::info(sprintf('It has been "%s" since the recurring transactions cron-job has fired.', $diffForHumans));
             if (false === $this->force) {
-                app('log')->info('The cron-job will not fire now.');
-                $this->message      = sprintf('It has been %s since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans);
+                Log::info('The cron-job will not fire now.');
+                $this->message      = sprintf('It has been "%s" since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans);
                 $this->jobFired     = false;
                 $this->jobErrored   = false;
                 $this->jobSucceeded = false;
 
                 return;
             }
-            app('log')->info('Execution of the recurring transaction cron-job has been FORCED.');
+            Log::info('Execution of the recurring transaction cron-job has been FORCED.');
         }
 
         if ($lastTime > 0 && $diff > 43200) {
-            app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans));
+            Log::info(sprintf('It has been "%s" since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans));
         }
 
         $this->fireRecurring();
@@ -76,7 +78,7 @@ class RecurringCronjob extends AbstractCronjob
 
     private function fireRecurring(): void
     {
-        app('log')->info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
+        Log::info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
 
         $job                = new CreateRecurringTransactions($this->date);
         $job->setForce($this->force);
@@ -88,8 +90,8 @@ class RecurringCronjob extends AbstractCronjob
         $this->jobSucceeded = true;
         $this->message      = 'Recurring transactions cron job fired successfully.';
 
-        app('fireflyconfig')->set('last_rt_job', (int) $this->date->format('U'));
-        app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
-        app('log')->info('Done with recurring cron job task.');
+        FireflyConfig::set('last_rt_job', (int) $this->date->format('U'));
+        Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
+        Log::info('Done with recurring cron job task.');
     }
 }

app/Support/FireflyConfig.php

@@ -39,7 +39,7 @@ class FireflyConfig
 {
     public function delete(string $name): void
     {
-        $fullName = 'ff-config-'.$name;
+        $fullName = 'ff3-config-'.$name;
         if (Cache::has($fullName)) {
             Cache::forget($fullName);
         }
@@ -81,7 +81,7 @@ class FireflyConfig
      */
     public function get(string $name, mixed $default = null): ?Configuration
     {
-        $fullName = 'ff-config-'.$name;
+        $fullName = 'ff3-config-'.$name;
         if (Cache::has($fullName)) {
             return Cache::get($fullName);
         }

app/Support/Http/Controllers/GetConfigurationData.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Support\Http\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -205,7 +206,7 @@ trait GetConfigurationData
 
     protected function verifyRecurringCronJob(): void
     {
-        $config   = app('fireflyconfig')->get('last_rt_job', 0);
+        $config   = FireflyConfig::get('last_rt_job', 0);
         $lastTime = (int) $config?->data;
         $now      = Carbon::now()->getTimestamp();
         app('log')->debug(sprintf('verifyRecurringCronJob: last time is %d ("%s"), now is %d', $lastTime, $config?->data, $now));

composer.lock

@@ -5747,20 +5747,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.6",
+            "version": "4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -5769,26 +5769,23 @@
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "captainhook/captainhook": "^5.10",
+                "captainhook/captainhook": "^5.25",
                 "captainhook/plugin-composer": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.8",
-                "ergebnis/composer-normalize": "^2.15",
-                "mockery/mockery": "^1.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "ergebnis/composer-normalize": "^2.47",
+                "mockery/mockery": "^1.6",
                 "paragonie/random-lib": "^2",
-                "php-mock/php-mock": "^2.2",
-                "php-mock/php-mock-mockery": "^1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpbench/phpbench": "^1.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9",
-                "ramsey/composer-repl": "^1.4",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.9"
+                "php-mock/php-mock": "^2.6",
+                "php-mock/php-mock-mockery": "^1.5",
+                "php-parallel-lint/php-parallel-lint": "^1.4.0",
+                "phpbench/phpbench": "^1.2.14",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "slevomat/coding-standard": "^8.18",
+                "squizlabs/php_codesniffer": "^3.13"
             },
             "suggest": {
                 "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@@ -5823,19 +5820,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
+                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-27T21:32:50+00:00"
+            "time": "2025-06-01T06:28:46+00:00"
         },
         {
             "name": "rcrowe/twigbridge",
@@ -10784,16 +10771,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.4.0",
+            "version": "v5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
                 "shasum": ""
             },
             "require": {
@@ -10836,9 +10823,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
             },
-            "time": "2024-12-30T11:07:19+00:00"
+            "time": "2025-05-31T08:24:38+00:00"
         },
         {
             "name": "phar-io/manifest",

config/firefly.php

@@ -78,7 +78,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-05-31',
+    'version'                      => 'develop/2025-06-02',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

resources/assets/v1/src/locales/zh-tw.json

@@ -183,6 +183,6 @@
     },
     "config": {
         "html_language": "zh-tw",
-        "date_time_fns": "yyyy\u5e74 M\u6708 D\u65e5 dddd \u65bc HH:mm:ss"
+        "date_time_fns": "yyyy\u5e74 M\u6708 d\u65e5 \u65bc HH:mm:ss"
     }
 }

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

@@ -490,7 +490,6 @@ let transactions = function () {
                 // addedSplit, is called from the HTML
                 // for source account
                 const renderAccount = function (item, b, c) {
-                    console.log('render account');
                     return item.name_with_balance + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.type) + '</small>';
                 };
                 console.log('here we are in');
@@ -499,7 +498,7 @@ let transactions = function () {
                     serverUrl: urls.account,
                     onRenderItem: renderAccount,
                     valueField: 'id',
-                    labelField: 'title',
+                    labelField: 'name_with_balance',
                     onChange: changeSourceAccount,
                     onSelectItem: selectSourceAccount,
                     hiddenValue: this.entries[count].source_account.alpine_name
@@ -509,7 +508,7 @@ let transactions = function () {
                     serverUrl: urls.account,
                     account_types: this.filters.destination,
                     valueField: 'id',
-                    labelField: 'title',
+                    labelField: 'name_with_balance',
                     onRenderItem: renderAccount,
                     onChange: changeDestinationAccount,
                     onSelectItem: selectDestinationAccount

resources/assets/v2/src/pages/transactions/shared/add-autocomplete.js

@@ -45,7 +45,7 @@ export function addAutocomplete(options) {
         liveServer: true,
     };
     if (typeof options.account_types !== 'undefined' && options.account_types.length > 0) {
-        params.serverParams['filter[account_types]'] = options.account_types;
+        params.serverParams['types'] = options.account_types;
     }
     if (typeof options.onRenderItem !== 'undefined' && null !== options.onRenderItem) {
         console.log('overrule onRenderItem.');

resources/assets/v2/src/pages/transactions/shared/autocomplete-functions.js

@@ -55,7 +55,7 @@ export function changeDestinationAccount(item, ac) {
 export function selectDestinationAccount(item, ac) {
     const index = parseInt(ac._searchInput.attributes['data-index'].value);
     document.querySelector('#form')._x_dataStack[0].$data.entries[index].destination_account = {
-        id: item.id, name: item.title, alpine_name: item.title, type: item.meta.type, currency_code: item.meta.currency_code,
+        id: item.id, name: item.name, alpine_name: item.name, type: item.type, currency_code: item.currency_code,
     };
     document.querySelector('#form')._x_dataStack[0].changedDestinationAccount();
 }
@@ -78,7 +78,7 @@ export function changeSourceAccount(item, ac) {
 export function selectSourceAccount(item, ac) {
     const index = parseInt(ac._searchInput.attributes['data-index'].value);
     document.querySelector('#form')._x_dataStack[0].$data.entries[index].source_account = {
-        id: item.id, name: item.title, alpine_name: item.title, type: item.meta.type, currency_code: item.meta.currency_code,
+        id: item.id, name: item.name, alpine_name: item.name, type: item.type, currency_code: item.currency_code,
     };
     document.querySelector('#form')._x_dataStack[0].changedSourceAccount();
 }

resources/assets/v2/vite.config.js

@@ -36,8 +36,8 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
     let https = null;
     if (command === 'serve') {
         https = {
-            key: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.key`),
-            cert: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.crt`),
+            key: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.key`),
+            cert: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.crt`),
         };
     }
 
@@ -83,7 +83,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
 
         server: {
             cors: true,
-            origin: 'https://localhost:5173',
+            origin: 'https://192.168.96.154:5173',
             watch: {
                 usePolling: true,
             },