Discounts (#2510)

src/pretix/static/pretixcontrol/js/ui/main.js

@@ -355,7 +355,7 @@ var form_handlers = function (el) {
         var dependent = $(this),
             dependency = $($(this).attr("data-display-dependency")),
             update = function (ev) {
-                var enabled = dependency.toArray().some(function(d) {return (d.type === 'checkbox' || d.type === 'radio') ? d.checked : !!d.value;});
+                var enabled = dependency.toArray().some(function(d) {return (d.type === 'checkbox' || d.type === 'radio') ? d.checked : (!!d.value && !d.value.match(/^0\.?0*$/g))});
                 if (dependent.is("[data-inverse]")) {
                     enabled = !enabled;
                 }

src/pretix/static/pretixcontrol/scss/_forms.scss

@@ -849,6 +849,7 @@ details {
     text-decoration: line-through;
   }
 }
+
 .select2-container [aria-multiselectable] .select2-results__option span span::before {
   content: "";
   font-family: FontAwesome;
@@ -860,3 +861,46 @@ details {
 .select2-container [aria-multiselectable] .select2-results__option[aria-selected=true] span span::before {
   content: ""
 }
+
+.form-alternatives {
+  div .control-label {
+    text-align: left;
+  }
+}
+.condition-or {
+  .sepText {
+    width: 75px;
+    background: #FFFFFF;
+    margin: -15px 0 0 -38px;
+    padding: 5px 0;
+    position: absolute;
+    top: 50%;
+    text-align: center;
+  }
+
+  .hr {
+    width:2px;
+    height:64px;
+    background-color: #DDDDDD;
+    position:inherit;
+    top:12px;
+    left:50%;
+    z-index:10;
+  }
+}
+
+@media (max-width: $screen-sm-max) {
+  .condition-or {
+    .hr {
+      width: 100%;
+      height: 2px;
+      left: 0px;
+      top: 4px;
+      margin: 15px 0 15px 0;
+    }
+
+    .sepText {
+      left: 50%;
+    }
+  }
+}