Skip to content

Commit bdc5573

Browse files
Re-order barcode scanning priority (#693)
* Re-order barcode scanning priority - Closes #692 * dart format * Try with removed line * Try without pythonscript * just pub get * try with fvm * Remove fvm * set working dir * try just pub get * Install python first * Updates * Use fvm * Adjust CI
1 parent d237a0e commit bdc5573

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
with:
3131
submodules: recursive
3232

33+
- name: Install Python
34+
uses: actions/setup-python@v4
35+
with:
36+
python-version: 3.9
37+
3338
- name: Setup Java
3439
uses: actions/setup-java@v3
3540
with:
@@ -53,20 +58,18 @@ jobs:
5358
- name: Collect Translation Files
5459
run: |
5560
cd lib/l10n
56-
python3 collect_translations.py
61+
python collect_translations.py
5762
5863
- name: Static Analysis Tests
64+
working-directory: .
5965
run: |
60-
python3 find_dart_files.py
61-
flutter pub get
62-
flutter analyze
66+
python ./find_dart_files.py
67+
dart pub global activate fvm
68+
fvm install
69+
fvm flutter pub get
70+
fvm flutter analyze
6371
dart format --output=none --set-exit-if-changed .
6472
65-
- name: Install Python
66-
uses: actions/setup-python@v4
67-
with:
68-
python-version: 3.9
69-
7073
- name: Start InvenTree Server
7174
run: |
7275
sudo apt-get install python3-dev python3-pip python3-venv python3-wheel g++
@@ -82,7 +85,7 @@ jobs:
8285
8386
- name: Unit Tests
8487
run: |
85-
flutter test --coverage
88+
fvm flutter test --coverage
8689
8790
- name: Coveralls
8891
uses: coverallsapp/github-action@master

assets/release_notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 0.19.3 - September 2025
2+
---
3+
4+
- Fixes incorrect priority of barcode scanner results
5+
16
### 0.19.2 - August 2025
27
---
38

find_dart_files.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
if __name__ == "__main__":
1414
dart_files = Path("lib").rglob("*.dart")
1515

16+
print("Discovering dart files...");
17+
1618
with open("test/coverage_helper_test.dart", "w") as f:
1719
f.write("// ignore_for_file: unused_import\n\n")
1820
f.write("// dart format off\n\n")

lib/barcode/barcode.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,12 @@ class BarcodeScanHandler extends BarcodeHandler {
250250

251251
// The following model types can be matched with barcodes
252252
List<String> validModels = [
253-
InvenTreePart.MODEL_TYPE,
254-
InvenTreeCompany.MODEL_TYPE,
255253
InvenTreeStockItem.MODEL_TYPE,
256-
InvenTreeStockLocation.MODEL_TYPE,
257254
InvenTreeSupplierPart.MODEL_TYPE,
258255
InvenTreeManufacturerPart.MODEL_TYPE,
256+
InvenTreePart.MODEL_TYPE,
257+
InvenTreeStockLocation.MODEL_TYPE,
258+
InvenTreeCompany.MODEL_TYPE,
259259
];
260260

261261
if (InvenTreeAPI().supportsOrderBarcodes) {

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: inventree
22
description: InvenTree stock management
33

4-
version: 0.19.2+101
4+
version: 0.19.3+102
55

66
environment:
77
sdk: ^3.8.1

0 commit comments

Comments
 (0)