Skip to content

Commit 325922a

Browse files
committed
fixed additional codes in encoded codes csv format
1 parent f01b46d commit 325922a

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [0.13.4]
5+
6+
### Fixed
7+
- Additional codes now also get prefixed with count in encoded codes csv generation
8+
49
## [0.13.3]
510

611
### Changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ allprojects {
2323
}
2424

2525
project.ext {
26-
sdkVersion='0.13.3'
26+
sdkVersion='0.13.4'
2727
versionCode=1
2828

2929
compileSdkVersion=28

core/src/androidTest/java/io/snabble/sdk/EncodedCodesGeneratorTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,12 @@ public void testCSVFormat() {
352352

353353
Product heinz = project.getProductDatabase().findBySku("42");
354354
addToCart(heinz, 1000, ScannedCode.parseDefault(project, "8715700421698"));
355+
generator.add("asdf123");
355356
generator.add(project.getShoppingCart());
356357

357358
ArrayList<String> codes = generator.generate();
358359
Assert.assertEquals(1, codes.size());
359-
Assert.assertEquals("snabble;\n1000;8715700421698\n7;4008400301020", codes.get(0));
360+
Assert.assertEquals("snabble;\n1;asdf123\n1000;8715700421698\n7;4008400301020", codes.get(0));
360361
}
361362

362363
private void addToCart(Product product, int quantity, ScannedCode scannedCode) {

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public EncodedCodesGenerator(EncodedCodesOptions encodedCodesOptions) {
2626
}
2727

2828
public void add(String code) {
29-
addScannableCode(code, false);
29+
if (options.repeatCodes) {
30+
addScannableCode(code, false);
31+
} else {
32+
addScannableCode("1" + options.countSeparator + code, false);
33+
}
3034
}
3135

3236
public void add(ShoppingCart shoppingCart) {

0 commit comments

Comments
 (0)