fix previousValue calc

doc/api/resources/index.rst

@@ -18,6 +18,7 @@ at :ref:`plugin-docs`.
    item_variations
    item_bundles
    item_add-ons
+   item_meta_properties
    questions
    question_options
    quotas

pyproject.toml

@@ -77,7 +77,6 @@ dependencies = [
   "PyJWT==2.6.*",
   "phonenumberslite==8.13.*",
   "Pillow==9.5.*",
-  "pretix-plugin-build",
   "protobuf==4.23.*",
   "psycopg2-binary",
   "pycountry",

setup.py

@@ -29,6 +29,7 @@ sys.path.append(str(Path.cwd() / 'src'))
 
 
 def _CustomBuild(*args, **kwargs):
+    print(sys.path)
     from pretix._build import CustomBuild
     return CustomBuild(*args, **kwargs)
 

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "4.20.2"
+__version__ = "4.21.0.dev0"

src/pretix/_base_settings.py

@@ -80,6 +80,7 @@ ALL_LANGUAGES = [
     ('de-informal', _('German (informal)')),
     ('ar', _('Arabic')),
     ('zh-hans', _('Chinese (simplified)')),
+    ('zh-hant', _('Chinese (traditional)')),
     ('cs', _('Czech')),
     ('da', _('Danish')),
     ('nl', _('Dutch')),

src/pretix/_build.py

@@ -45,10 +45,6 @@ def npm_install():
 
 class CustomBuild(build):
     def run(self):
-        if "src" not in os.listdir(".") or "pretix" not in os.listdir("src"):
-            # Only run this command on the pretix module, not on other modules even if it's registered globally
-            # in some cases
-            return build.run(self)
         if "PRETIX_DOCKER_BUILD" in os.environ:
             return  # this is a hack to allow calling this file early in our docker build to make use of caching
         os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix._build_settings")
@@ -72,10 +68,6 @@ class CustomBuild(build):
 
 class CustomBuildExt(build_ext):
     def run(self):
-        if "src" not in os.listdir(".") or "pretix" not in os.listdir("src"):
-            # Only run this command on the pretix module, not on other modules even if it's registered globally
-            # in some cases
-            return build_ext.run(self)
         if "PRETIX_DOCKER_BUILD" in os.environ:
             return  # this is a hack to allow calling this file early in our docker build to make use of caching
         npm_install()

src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html

@@ -335,7 +335,7 @@
                                         id="cp_{{ form.pos.pk }}_item_{{ item.id }}"
                                         aria-label="{% blocktrans with item=item.name %}Quantity of {{ item }} to order{% endblocktrans %}"
                                         {% if item.description %} aria-describedby="cp-{{ form.pos.pk }}-item-{{ item.id }}-description"{% endif %}>
-                                    <button type="button" data-step="1" data-controls="cp_{{ form.pos.pk }}_item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Increase quantity" %}">+</button>
+                                    <button type="button" data-step="1" data-controls="cp_{{ form.pos.pk }}_item_{{ item.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}">+</button>
                                 </div>
                             {% endif %}
                         </div>

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -21,7 +21,7 @@
     </div>
     <div role="rowgroup" class="firstchild-in-panel">
     {% for line in cart.positions %}
-        <div role="row" class="row cart-row {% if hide_prices %}hide-prices{% endif %} {% if download %}has-downloads{% endif %}{% if editable %}editable{% endif %}">
+        <div role="row" class="row cart-row {% if hide_prices %}hide-prices{% endif %} {% if download %}has-downloads{% endif %}{% if editable %}editable{% endif %}" data-item="{{ line.item.id }}" data-count="{{ line.count }}">
             <div role="cell" class="product">
                 <p>
                 {% if line.addon_to %}

src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html

@@ -344,6 +344,7 @@
                                     <button type="button" data-step="-1" data-controls="item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}"
                                         {% if not ev.presale_is_running %}disabled{% endif %}>-</button>
                                     <input type="number" class="form-control input-item-count" placeholder="0" min="0"
+                                           {% if item.min_per_order and item.min_per_order > 1 %}data-min="{{ item.min_per_order }}"{% endif %}
                                            {% if not ev.presale_is_running %}disabled{% endif %}
                                            {% if itemnum == 1 %}value="1"{% endif %}
                                             {% if item.free_price %}

src/pretix/presale/templates/pretixpresale/event/voucher.html

@@ -257,6 +257,7 @@
                                                             <div class="input-item-count-group">
                                                                 <button type="button" data-step="-1" data-controls="variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                                                 <input type="number" class="form-control input-item-count" placeholder="0" min="0"
+                                                                    {% if item.min_per_order and item.min_per_order > 1 %}data-min="{{ item.min_per_order }}"{% endif %}
                                                                     max="{{ var.order_max }}"
                                                                     id="variation_{{ item.id }}_{{ var.id }}"
                                                                     name="variation_{{ item.id }}_{{ var.id }}"
@@ -400,6 +401,7 @@
                                                     <button type="button" data-step="-1" data-controls="item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                                     <input type="number" class="form-control input-item-count"
                                                        placeholder="0" min="0"
+                                                       {% if item.min_per_order and item.min_per_order > 1 %}data-min="{{ item.min_per_order }}"{% endif %}
                                                        max="{{ item.order_max }}"
                                                        id="item_{{ item.id }}"
                                                        name="item_{{ item.id }}"

src/pretix/settings.py

@@ -176,13 +176,13 @@ if SITE_URL.endswith('/'):
 
 CSRF_TRUSTED_ORIGINS = [urlparse(SITE_URL).hostname]
 
-TRUST_X_FORWARDED_FOR = config.getboolean('pretix', 'trust_x_forwarded_for', fallback=False)
-USE_X_FORWARDED_HOST = config.getboolean('pretix', 'trust_x_forwarded_host', fallback=False)
+TRUST_X_FORWARDED_FOR = config.get('pretix', 'trust_x_forwarded_for', fallback=False)
+USE_X_FORWARDED_HOST = config.get('pretix', 'trust_x_forwarded_host', fallback=False)
 
 
 REQUEST_ID_HEADER = config.get('pretix', 'request_id_header', fallback=False)
 
-if config.getboolean('pretix', 'trust_x_forwarded_proto', fallback=False):
+if config.get('pretix', 'trust_x_forwarded_proto', fallback=False):
     SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
 PRETIX_PLUGINS_DEFAULT = config.get('pretix', 'plugins_default',

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

@@ -121,10 +121,26 @@ var form_handlers = function (el) {
         e.preventDefault();
         var step = parseFloat(this.getAttribute("data-step"));
         var controls = document.getElementById(this.getAttribute("data-controls"));
-        var currentValue = parseFloat(controls.value);
+        var currentValue = parseFloat(controls.value) || 0;
         controls.value = Math.max(controls.min, Math.min(controls.max || Number.MAX_SAFE_INTEGER, (currentValue || 0) + step));
         controls.dispatchEvent(new Event("change"));
     });
+    el.find("input[data-min]").each(function(i) {
+        this.previousValue = parseFloat(this.value) || 0;
+    }).on("change", function(e) {
+        var currentValue = parseFloat(this.value) || 0;
+        var itemOrderMin = parseFloat(this.getAttribute("data-min")) || 0;
+        if (itemOrderMin) {
+            document.querySelectorAll(".cart-row[data-item='"+this.id.substring(5)+"']").forEach(function(row) {
+                itemOrderMin -= (parseFloat(row.getAttribute("data-count")) || 1)
+            });
+            if (itemOrderMin < 0) itemOrderMin = 0;
+        }
+        if (currentValue && currentValue < itemOrderMin) {
+            this.value = this.previousValue > currentValue ? 0 : itemOrderMin;
+        }
+        this.previousValue = this.value;
+    });
 
     el.find("script[data-replace-with-qr]").each(function () {
         var $div = $("<div>");