Merge pull request #11241 from firefly-iii/dependabot/composer/develop/bacon/bacon-qr-code-3.0.2

Bump bacon/bacon-qr-code from 3.0.1 to 3.0.2
Merge branch 'develop' into dependabot/composer/develop/bacon/bacon-qr-code-3.0.2
2025-11-17 07:08:19 +00:00 · 2025-11-17 06:48:36 +01:00 · 2025-11-17 05:47:38 +00:00 · 2025-11-17 06:46:55 +01:00 · 2025-11-17 03:30:51 +00:00 · 2025-11-17 03:30:49 +00:00
7 changed files with 51 additions and 40 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -2675,5 +2675,5 @@
    "prefer-lowest": false,
    "platform": {},
    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.4.9 - 2025-11-xx
+
+### Fixed
+
+- [Discussion 11211](https://github.com/orgs/firefly-iii/discussions/11211) (question about Transaction journal ID) started by @zhiiwg
+
 ## 6.4.8 - 2025-11-14

 ### Fixed
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f"
+                "reference": "fe259c55425b8178f77fb6d1f84ba2473e21ed55"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f",
-                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/fe259c55425b8178f77fb6d1f84ba2473e21ed55",
+                "reference": "fe259c55425b8178f77fb6d1f84ba2473e21ed55",
                "shasum": ""
            },
            "require": {
@@ -27,8 +27,9 @@
            },
            "require-dev": {
                "phly/keep-a-changelog": "^2.12",
-                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "phpunit/phpunit": "^10.5.11 || ^11.0.4",
                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "spatie/pixelmatch-php": "^1.2.0",
                "squizlabs/php_codesniffer": "^3.9"
            },
            "suggest": {
@@ -56,9 +57,9 @@
            "homepage": "https://github.com/Bacon/BaconQrCode",
            "support": {
                "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.2"
            },
-            "time": "2024-10-01T13:55:55+00:00"
+            "time": "2025-11-16T22:59:48+00:00"
        },
        {
            "name": "beberlei/assert",
@@ -12011,16 +12012,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.4.2",
+            "version": "12.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a94ea4d26d865875803b23aaf78c3c2c670ea2ea"
+                "reference": "d8f644d8d9bb904867f7a0aeb1bd306e0d966949"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a94ea4d26d865875803b23aaf78c3c2c670ea2ea",
-                "reference": "a94ea4d26d865875803b23aaf78c3c2c670ea2ea",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d8f644d8d9bb904867f7a0aeb1bd306e0d966949",
+                "reference": "d8f644d8d9bb904867f7a0aeb1bd306e0d966949",
                "shasum": ""
            },
            "require": {
@@ -12088,7 +12089,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.4.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.4.3"
            },
            "funding": [
                {
@@ -12112,7 +12113,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-30T08:41:39+00:00"
+            "time": "2025-11-13T07:20:26+00:00"
        },
        {
            "name": "rector/rector",
@@ -13183,16 +13184,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
                "shasum": ""
            },
            "require": {
@@ -13221,7 +13222,7 @@
            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
            "support": {
                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.0"
            },
            "funding": [
                {
@@ -13229,7 +13230,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2025-11-13T13:44:09+00:00"
        },
        {
            "name": "webmozart/assert",
@@ -13314,5 +13315,5 @@
        "ext-xmlwriter": "*"
    },
    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                              => '6.4.8',
-    'build_time'                           => 1763008810,
+    'version'                              => 'develop/2025-11-17',
+    'build_time'                           => 1763350067,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
@@ -3776,9 +3776,9 @@
            }
        },
        "node_modules/alpinejs": {
-            "version": "3.15.1",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.1.tgz",
-            "integrity": "sha512-HLO1TtiE92VajFHtLLPK8BWaK1YepV/uj31UrfoGnQ00lyFOJZ+oVY3F0DghPAwvg8sLU79pmjGQSytERa2gEg==",
+            "version": "3.15.2",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.2.tgz",
+            "integrity": "sha512-2kYF2aG+DTFkE6p0rHG5XmN4VEb6sO9b02aOdU4+i8QN6rL0DbRZQiypDE1gBcGO65yDcqMz5KKYUYgMUxgNkw==",
            "license": "MIT",
            "dependencies": {
                "@vue/reactivity": "~3.1.1"
@@ -4075,9 +4075,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.8.27",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.27.tgz",
-            "integrity": "sha512-2CXFpkjVnY2FT+B6GrSYxzYf65BJWEqz5tIRHCvNsZZ2F3CmsCB37h8SpYgKG7y9C4YAeTipIPWG7EmFmhAeXA==",
+            "version": "2.8.28",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.28.tgz",
+            "integrity": "sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
@@ -4521,9 +4521,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001754",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001754.tgz",
-            "integrity": "sha512-x6OeBXueoAceOmotzx3PO4Zpt4rzpeIFsSr6AAePTZxSkXiYDUmpypEl7e2+8NCd9bD7bXjqyef8CJYPC1jfxg==",
+            "version": "1.0.30001755",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001755.tgz",
+            "integrity": "sha512-44V+Jm6ctPj7R52Na4TLi3Zri4dWUljJd+RDm+j8LtNCc/ihLCT+X1TzoOAkRETEWqjuLnh9581Tl80FvK7jVA==",
            "dev": true,
            "funding": [
                {
@@ -5365,9 +5365,9 @@
            }
        },
        "node_modules/csstype": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.2.tgz",
+            "integrity": "sha512-D80T+tiqkd/8B0xNlbstWDG4x6aqVfO52+OlSUNIdkTvmNw0uQpJLeos2J/2XvpyidAFuTPmpad+tUxLndwj6g==",
            "dev": true,
            "license": "MIT"
        },
@@ -5736,9 +5736,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.250",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.250.tgz",
-            "integrity": "sha512-/5UMj9IiGDMOFBnN4i7/Ry5onJrAGSbOGo3s9FEKmwobGq6xw832ccET0CE3CkkMBZ8GJSlUIesZofpyurqDXw==",
+            "version": "1.5.254",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.254.tgz",
+            "integrity": "sha512-DcUsWpVhv9svsKRxnSCZ86SjD+sp32SGidNB37KpqXJncp1mfUgKbHvBomE89WJDbfVKw1mdv5+ikrvd43r+Bg==",
            "dev": true,
            "license": "ISC"
        },
@@ -12507,7 +12507,7 @@
                "@fortawesome/fontawesome-free": "^7",
                "@popperjs/core": "^2.11.8",
                "admin-lte": "^4.0.0-rc4",
-                "alpinejs": "^3.13.7",
+                "alpinejs": "^3.15.2",
                "bootstrap": "^5",
                "bootstrap5-autocomplete": "^1",
                "bootstrap5-tags": "^1",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -19,7 +19,7 @@
        "@fortawesome/fontawesome-free": "^7",
        "@popperjs/core": "^2.11.8",
        "admin-lte": "^4.0.0-rc4",
-        "alpinejs": "^3.13.7",
+        "alpinejs": "^3.15.2",
        "bootstrap": "^5",
        "bootstrap5-autocomplete": "^1",
        "bootstrap5-tags": "^1",
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -62,6 +62,10 @@
                <div class="box-body no-padding">
                    <table class="table table-hover">
                        <tbody>
+                        <tr>
+                            <td style="width:40%;">{{ trans('list.id') }}</td>
+                            <td>#{{ transactionGroup.id }}</td>
+                        </tr>
                        <tr>
                            <td style="width:40%;">{{ trans('list.type') }}</td>
                            <td>{{ first.transaction_type_type|_ }}</td>
Author	SHA1	Message	Date
James Cole	a8fffc25c0	Merge pull request #11241 from firefly-iii/dependabot/composer/develop/bacon/bacon-qr-code-3.0.2 Bump bacon/bacon-qr-code from 3.0.1 to 3.0.2	2025-11-17 06:48:36 +01:00
mergify[bot]	d0dab136b1	Merge branch 'develop' into dependabot/composer/develop/bacon/bacon-qr-code-3.0.2	2025-11-17 05:47:38 +00:00
James Cole	91184489da	Merge pull request #11242 from firefly-iii/dependabot/npm_and_yarn/develop/alpinejs-3.15.2 Bump alpinejs from 3.15.1 to 3.15.2	2025-11-17 06:46:55 +01:00
mergify[bot]	e4e6cc71c3	Merge branch 'develop' into dependabot/composer/develop/bacon/bacon-qr-code-3.0.2	2025-11-17 03:30:51 +00:00
mergify[bot]	33d637e618	Merge branch 'develop' into dependabot/npm_and_yarn/develop/alpinejs-3.15.2	2025-11-17 03:30:49 +00:00
github-actions[bot]	42eb4410f8	Merge pull request #11243 from firefly-iii/release-1763350179 🤖 Automatically merge the PR into the develop branch.	2025-11-17 04:29:45 +01:00
JC5	5f6b345c79	🤖 Auto commit for release 'develop' on 2025-11-17	2025-11-17 04:29:39 +01:00
dependabot[bot]	30b48a479c	Bump alpinejs from 3.15.1 to 3.15.2 Bumps [alpinejs](https://github.com/alpinejs/alpine/tree/HEAD/packages/alpinejs) from 3.15.1 to 3.15.2. - [Release notes](https://github.com/alpinejs/alpine/releases) - [Commits](https://github.com/alpinejs/alpine/commits/v3.15.2/packages/alpinejs) --- updated-dependencies: - dependency-name: alpinejs dependency-version: 3.15.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-17 03:01:12 +00:00
dependabot[bot]	55d23af802	Bump bacon/bacon-qr-code from 3.0.1 to 3.0.2 Bumps [bacon/bacon-qr-code](https://github.com/Bacon/BaconQrCode) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/Bacon/BaconQrCode/releases) - [Changelog](https://github.com/Bacon/BaconQrCode/blob/main/CHANGELOG.md) - [Commits](https://github.com/Bacon/BaconQrCode/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: bacon/bacon-qr-code dependency-version: 3.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-17 03:00:53 +00:00
James Cole	34bfeba63a	Fix #11211	2025-11-13 20:32:02 +01:00
github-actions[bot]	761c20b670	Merge pull request #11234 from firefly-iii/release-1763009724 🤖 Automatically merge the PR into the develop branch.	2025-11-13 05:55:30 +01:00
JC5	d756977ee0	🤖 Auto commit for release 'develop' on 2025-11-13	2025-11-13 05:55:24 +01:00