Allow to skip questions during check-in (#84)

* Allow to skip questions during check-in * Update subrepo
pretix · Feb 14, 2024 · 68b604c · 68b604c
1 parent b0bca8a
commit 68b604c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/AppConfig.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/AppConfig.kt
@@ -332,6 +332,9 @@ class AppConfig(ctx: Context) : ConfigStore {
     val hideNames: Boolean
         get() = default_prefs.getBoolean(PREFS_KEY_HIDE_NAMES, false)
 
+    val ignoreQuestions: Boolean
+        get() = default_prefs.getBoolean(PREFS_KEY_IGNORE_QUESTIONS, false)
+
     var sounds: Boolean
         get() = default_prefs.getBoolean(PREFS_KEY_SOUNDS, true)
         set(value) = default_prefs.edit().putBoolean(PREFS_KEY_SOUNDS, value).apply()
@@ -430,6 +433,7 @@ class AppConfig(ctx: Context) : ConfigStore {
         val PREFS_KEY_PRINTBADGESTWICE = "pref_print_badges_twice"
         val PREFS_KEY_AUTOPRINTBADGES = "pref_auto_print_badges"
         val PREFS_KEY_UNPAID_ASK = "pref_unpaid_ask"
+        val PREFS_KEY_IGNORE_QUESTIONS = "pref_ignore_questions"
         val PREFS_KEY_SCAN_TYPE = "pref_scan_type"
         val PREFS_KEY_SOUNDS = "pref_sounds"
         val PREFS_KEY_HIDE_NAMES = "pref_hide_names"

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt
@@ -1014,7 +1014,7 @@ class MainActivity : AppCompatActivity(), ReloadableActivity, ZXingScannerView.R
                 checkResult = provider.check(conf.eventSelectionToMap(), result, "barcode", answers, ignore_unpaid, conf.printBadges, when (conf.scanType) {
                     "exit" -> TicketCheckProvider.CheckInType.EXIT
                     else -> TicketCheckProvider.CheckInType.ENTRY
-                })
+                }, allowQuestions = !conf.ignoreQuestions)
                 if (provider is OnlineCheckProvider) {
                     if (checkResult?.type == TicketCheckProvider.CheckResult.Type.ERROR) {
                         (application as PretixScan).connectivityHelper.recordError()

diff --git a/pretixscan/app/src/main/res/values-de/strings.xml b/pretixscan/app/src/main/res/values-de/strings.xml
@@ -115,6 +115,7 @@
     <string name="settings_label_badges">Badges</string>
     <string name="preference_badges_twice">Jedes Badge doppelt drucken</string>
     <string name="pref_unpaid_ask">Abfrage beim Check-in unbezahlter Bestellungen</string>
+    <string name="pref_ignore_questions">Keine Fragen beim Check-in stellen</string>
     <string name="pref_unpaid_ask_summary">Wenn die Check-in-Liste unbezahlte Bestellungen enthält, steuert diese Einstellung ob vor dem Einchecken dieser ein Bestätigungsdialog erscheint.</string>
     <string name="already_scanned">bereits gescannt</string>
     <string name="total_tickets_sold">Tickets (gesamt)</string>

diff --git a/pretixscan/app/src/main/res/values/strings.xml b/pretixscan/app/src/main/res/values/strings.xml
@@ -113,6 +113,7 @@
     <string name="preference_badges_twice">Print every badge twice</string>
     <string name="settings_label_details">Details</string>
     <string name="pref_unpaid_ask">Ask before checking in unpaid tickets</string>
+    <string name="pref_ignore_questions">Do not ask questions during check-in</string>
     <string name="pref_unpaid_ask_summary">When the check-in list is set to include pending orders, this setting controls whether you will be asked before they are being checked in.</string>
     <string name="question_validation_error">Some of your input could not be validated.</string>
     <string name="question_input_required">This field is required.</string>

diff --git a/pretixscan/app/src/main/res/xml/preferences.xml b/pretixscan/app/src/main/res/xml/preferences.xml
@@ -72,6 +72,10 @@
             android:key="pref_unpaid_ask"
             android:summary="@string/pref_unpaid_ask_summary"
             android:title="@string/pref_unpaid_ask" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_ignore_questions"
+            android:title="@string/pref_ignore_questions" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/settings_label_covid_check">
         <CheckBoxPreference

diff --git a/pretixscan/libpretixsync-repo b/pretixscan/libpretixsync-repo
+9 −9		libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PretixApi.kt
+84 −9		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/AsyncCheckProvider.kt
+4 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/OnlineCheckProvider.kt
+3 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/ProxyCheckProvider.kt
+1 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/TicketCheckProvider.kt
+2 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/db/QuestionLike.java
+2 −2		libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncManager.java
+51 −0		libpretixsync/src/main/java/eu/pretix/libpretixsync/utils/EmailValidator.kt
+8 −0		libpretixsync/src/test/java/eu/pretix/libpretixsync/check/AsyncCheckProviderTest.kt
+4 −2		libpretixsync/src/test/java/eu/pretix/libpretixsync/db/QuestionAnswerValidationTest.kt
+4 −2		libpretixsync/src/test/java/eu/pretix/libpretixsync/test/FakePretixApi.kt
+82 −0		libpretixsync/src/test/java/eu/pretix/libpretixsync/utils/EmailValidatorTests.kt