add support for encoded codes csv

ajungg · ajungg · commit 8cf198ebfc84 · 2019-01-16T14:05:34.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "gradle.plugin.gmazzo:sqlite-plugin:0.2"
diff --git a/core/src/androidTest/assets/testDb_1_16_encodingUnits.sqlite3 b/core/src/androidTest/assets/testDb_1_16_encodingUnits.sqlite3
diff --git a/core/src/androidTest/java/io/snabble/sdk/EncodedCodesGeneratorTest.java b/core/src/androidTest/java/io/snabble/sdk/EncodedCodesGeneratorTest.java
@@ -351,5 +351,34 @@ public void testExpensiveItemsSortedToBottom() throws IOException, Snabble.Snabb
         Assert.assertEquals(1, codes.size());
         Assert.assertEquals("8715700421698;4008400301020", codes.get(0));
     }
+
+    @Test
+    @UiThreadTest
+    public void testCSVFormat() throws IOException, Snabble.SnabbleException {
+        withDb("demoDb_1_11.sqlite3");
+
+        EncodedCodesOptions options = new EncodedCodesOptions.Builder()
+                .prefix("snabble;\n")
+                .separator("\n")
+                .suffix("")
+                .repeatCodes(false)
+                .countSeparator(";")
+                .maxCodes(100)
+                .build();
+
+        EncodedCodesGenerator generator = new EncodedCodesGenerator(options);
+
+        Product duplo = project.getProductDatabase().findBySku("49");
+        project.getShoppingCart().add(duplo, 7, ScannableCode.parse(project, "4008400301020"));
+
+        Product heinz = project.getProductDatabase().findBySku("42");
+        project.getShoppingCart().add(heinz, 1000, ScannableCode.parse(project, "8715700421698"));
+        generator.add(project.getShoppingCart());
+
+        ArrayList<String> codes = generator.generate();
+        Assert.assertEquals(1, codes.size());
+        Assert.assertEquals("snabble;\n1000;8715700421698\n7;4008400301020", codes.get(0));
+    }
+
 }
 
diff --git a/core/src/main/java/io/snabble/sdk/PaymentMethod.java b/core/src/main/java/io/snabble/sdk/PaymentMethod.java
@@ -9,6 +9,8 @@ public enum PaymentMethod {
     QRCODE_POS(false, false),
     @SerializedName("encodedCodes")
     ENCODED_CODES(true, false),
+    @SerializedName("encodedCodesCSV")
+    ENCODED_CODES_CSV(true, false),
     @SerializedName("teleCashDeDirectDebit")
     TELECASH_DIRECT_DEBIT(false, true);
 
diff --git a/core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java b/core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java
@@ -130,13 +130,23 @@ public int compare(ProductInfo p1, ProductInfo p2) {
                         code.replace(7, 12, embeddedWeight.toString());
                         code.setCharAt(6, Character.forDigit(EAN13.internalChecksum(code.toString()), 10));
                         code.setCharAt(12, Character.forDigit(EAN13.checksum(code.substring(0, 12)), 10));
-                        addScannableCode(code.toString(), ageRestricted);
+
+                        if (options.repeatCodes) {
+                            addScannableCode(code.toString(), ageRestricted);
+                        } else {
+                            addScannableCode("1" + options.countSeparator + code.toString(), ageRestricted);
+                        }
                     }
                 }
             } else {
                 int q = productInfo.quantity;
-                for (int j = 0; j < q; j++) {
-                    addScannableCode(productInfo.product.getTransmissionCode(productInfo.scannedCode), ageRestricted);
+                String transmissionCode = productInfo.product.getTransmissionCode(productInfo.scannedCode);
+                if (options.repeatCodes) {
+                    for (int j = 0; j < q; j++) {
+                        addScannableCode(transmissionCode, ageRestricted);
+                    }
+                } else {
+                    addScannableCode(q + options.countSeparator + transmissionCode, ageRestricted);
                 }
             }
         }
diff --git a/core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesOptions.java b/core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesOptions.java
@@ -9,9 +9,12 @@ public class EncodedCodesOptions {
     public final String finalCode;
     public final String nextCode;
     public final String nextCodeWithCheck;
+    public final boolean repeatCodes;
+    public final String countSeparator;
 
     private EncodedCodesOptions(String prefix, String separator, String suffix, int maxChars,
-                                int maxCodes, String finalCode, String nextCode, String nextCodeWithCheck) {
+                                int maxCodes, String finalCode, String nextCode,
+                                String nextCodeWithCheck, boolean repeatCodes, String countSeparator) {
         this.prefix = prefix;
         this.separator = separator;
         this.suffix = suffix;
@@ -20,6 +23,8 @@ private EncodedCodesOptions(String prefix, String separator, String suffix, int
         this.finalCode = finalCode;
         this.nextCode = nextCode;
         this.nextCodeWithCheck = nextCodeWithCheck;
+        this.repeatCodes = repeatCodes;
+        this.countSeparator = countSeparator;
     }
 
     public static class Builder {
@@ -31,6 +36,8 @@ public static class Builder {
         private String nextCode = "";
         private String nextCodeWithCheck = "";
         private int maxCodes = 100;
+        private boolean repeatCodes = true;
+        private String countSeparator = ";";
 
         public Builder prefix(String prefix) {
             this.prefix = prefix;
@@ -72,9 +79,19 @@ public Builder nextCodeWithCheck(String nextCodeWithCheck) {
             return this;
         }
 
+        public Builder repeatCodes(boolean repeatCodes) {
+            this.repeatCodes = repeatCodes;
+            return this;
+        }
+
+        public Builder countSeparator(String countSeparator) {
+            this.countSeparator = countSeparator;
+            return this;
+        }
+
         public EncodedCodesOptions build() {
             return new EncodedCodesOptions(prefix, separator, suffix, maxChars, maxCodes,
-                    finalCode, nextCode, nextCodeWithCheck);
+                    finalCode, nextCode, nextCodeWithCheck, repeatCodes, countSeparator);
         }
     }
 }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java
@@ -20,6 +20,7 @@
 import io.snabble.sdk.Project;
 import io.snabble.sdk.encodedcodes.EncodedCodesGenerator;
 import io.snabble.sdk.PriceFormatter;
+import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.SnabbleUICallback;
@@ -37,27 +38,25 @@ class CheckoutEncodedCodesView extends FrameLayout implements View.OnLayoutChang
 
     public CheckoutEncodedCodesView(Context context) {
         super(context);
-        inflateView();
-    }
 
-    public CheckoutEncodedCodesView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        inflateView();
+        project = SnabbleUI.getProject();
+        inflateView(project.getEncodedCodesOptions());
     }
 
-    public CheckoutEncodedCodesView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        inflateView();
+    public CheckoutEncodedCodesView(Context context, EncodedCodesOptions options) {
+        super(context);
+
+        project = SnabbleUI.getProject();
+        inflateView(options);
     }
 
-    private void inflateView() {
+    private void inflateView(EncodedCodesOptions options) {
         inflate(getContext(), R.layout.view_checkout_encodedcodes, this);
 
         scrollContainer = findViewById(R.id.scroll_container);
         scrollView = findViewById(R.id.scroll_view);
 
-        project = SnabbleUI.getProject();
-        encodedCodesGenerator = new EncodedCodesGenerator(project.getEncodedCodesOptions());
+        encodedCodesGenerator = new EncodedCodesGenerator(options);
 
         Button paidButton = findViewById(R.id.paid);
         paidButton.setOnClickListener(new OnClickListener() {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutView.java
@@ -18,6 +18,7 @@
 import io.snabble.sdk.Checkout;
 import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.Snabble;
+import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
 import io.snabble.sdk.ui.KeyguardHandler;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
@@ -157,6 +158,18 @@ public void onKeyguardResult(int resultCode) {
             case ENCODED_CODES:
                 displayView(new CheckoutEncodedCodesView(getContext()));
                 break;
+            case ENCODED_CODES_CSV:
+                EncodedCodesOptions options = new EncodedCodesOptions.Builder()
+                        .prefix("snabble;\n")
+                        .separator("\n")
+                        .suffix("")
+                        .repeatCodes(false)
+                        .countSeparator(";")
+                        .maxCodes(100)
+                        .build();
+
+                displayView(new CheckoutEncodedCodesView(getContext(), options));
+                break;
         }
     }
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentMethodView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentMethodView.java
@@ -43,6 +43,7 @@ class PaymentMethodView extends FrameLayout implements PaymentCredentialsStore.C
         icons.put(PaymentMethod.TELECASH_DIRECT_DEBIT, R.drawable.ic_pm_sepa);
         icons.put(PaymentMethod.QRCODE_POS, R.drawable.ic_pm_checkstand);
         icons.put(PaymentMethod.ENCODED_CODES, R.drawable.ic_pm_checkstand);
+        icons.put(PaymentMethod.ENCODED_CODES_CSV, R.drawable.ic_pm_checkstand);
     }
 
     private Checkout checkout;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`12`	`+ classpath 'com.android.tools.build:gradle:3.3.0'`
`13`	`13`	`classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'`
`14`	`14`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`15`	`15`	`classpath "gradle.plugin.gmazzo:sqlite-plugin:0.2"`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,23 @@ public int compare(ProductInfo p1, ProductInfo p2) {`
`130`	`130`	`code.replace(7, 12, embeddedWeight.toString());`
`131`	`131`	`code.setCharAt(6, Character.forDigit(EAN13.internalChecksum(code.toString()), 10));`
`132`	`132`	`code.setCharAt(12, Character.forDigit(EAN13.checksum(code.substring(0, 12)), 10));`
`133`		`- addScannableCode(code.toString(), ageRestricted);`
	`133`	`+`
	`134`	`+ if (options.repeatCodes) {`
	`135`	`+ addScannableCode(code.toString(), ageRestricted);`
	`136`	`+ } else {`
	`137`	`+ addScannableCode("1" + options.countSeparator + code.toString(), ageRestricted);`
	`138`	`+ }`
`134`	`139`	`}`
`135`	`140`	`}`
`136`	`141`	`} else {`
`137`	`142`	`int q = productInfo.quantity;`
`138`		`- for (int j = 0; j < q; j++) {`
`139`		`- addScannableCode(productInfo.product.getTransmissionCode(productInfo.scannedCode), ageRestricted);`
	`143`	`+ String transmissionCode = productInfo.product.getTransmissionCode(productInfo.scannedCode);`
	`144`	`+ if (options.repeatCodes) {`
	`145`	`+ for (int j = 0; j < q; j++) {`
	`146`	`+ addScannableCode(transmissionCode, ageRestricted);`
	`147`	`+ }`
	`148`	`+ } else {`
	`149`	`+ addScannableCode(q + options.countSeparator + transmissionCode, ageRestricted);`
`140`	`150`	`}`
`141`	`151`	`}`
`142`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ class PaymentMethodView extends FrameLayout implements PaymentCredentialsStore.C`
`43`	`43`	`icons.put(PaymentMethod.TELECASH_DIRECT_DEBIT, R.drawable.ic_pm_sepa);`
`44`	`44`	`icons.put(PaymentMethod.QRCODE_POS, R.drawable.ic_pm_checkstand);`
`45`	`45`	`icons.put(PaymentMethod.ENCODED_CODES, R.drawable.ic_pm_checkstand);`
	`46`	`+ icons.put(PaymentMethod.ENCODED_CODES_CSV, R.drawable.ic_pm_checkstand);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`private Checkout checkout;`