CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Do not hide "free" if there is an original price

Browse Source
This commit is contained in:
Raphael Michel
2023-02-17 10:43:49 +01:00
parent 50f9cfd402
commit b58546c3c8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html
View File

@@ -144,7 +144,7 @@
</div> </div>
<p> <p>
{% elif not var.display_price.gross %} {% elif not var.display_price.gross %}
{% if not item.mandatory_priced_addons %} {% if not item.mandatory_priced_addons or var.original_price %}
<span class="text-uppercase">{% trans "free" context "price" %}</span> <span class="text-uppercase">{% trans "free" context "price" %}</span>
{% endif %} {% endif %}
{% elif event.settings.display_net_prices %} {% elif event.settings.display_net_prices %}
@@ -278,7 +278,7 @@
</div> </div>
<p> <p>
{% elif not item.display_price.gross %} {% elif not item.display_price.gross %}
{% if not item.mandatory_priced_addons %} {% if not item.mandatory_priced_addons or item.original_price %}
<span class="text-uppercase">{% trans "free" context "price" %}</span> <span class="text-uppercase">{% trans "free" context "price" %}</span>
{% endif %} {% endif %}
{% elif event.settings.display_net_prices %} {% elif event.settings.display_net_prices %}

4
src/pretix/presale/templates/pretixpresale/event/voucher.html
View File

@@ -207,7 +207,7 @@
</div> </div>
<p> <p>
{% elif not var.display_price.gross %} {% elif not var.display_price.gross %}
{% if not item.mandatory_priced_addons %} {% if not item.mandatory_priced_addons or var.original_price %}
<span class="text-uppercase">{% trans "free" context "price" %}</span> <span class="text-uppercase">{% trans "free" context "price" %}</span>
{% endif %} {% endif %}
{% elif event.settings.display_net_prices %} {% elif event.settings.display_net_prices %}
@@ -341,7 +341,7 @@
</div> </div>
<p> <p>
{% elif not item.display_price.gross %} {% elif not item.display_price.gross %}
{% if not item.mandatory_priced_addons %} {% if not item.mandatory_priced_addons or item.original_price %}
<span class="text-uppercase">{% trans "free" context "price" %}</span> <span class="text-uppercase">{% trans "free" context "price" %}</span>
{% endif %} {% endif %}
{% elif event.settings.display_net_prices %} {% elif event.settings.display_net_prices %}

2
src/pretix/static/pretixpresale/js/widget/widget.js
View File

@@ -330,7 +330,7 @@ Vue.component('pricebox', {
}, },
priceline: function () { priceline: function () {
if (this.price.gross === "0.00") { if (this.price.gross === "0.00") {
if (this.mandatory_priced_addons) { if (this.mandatory_priced_addons && !this.original_price) {
return "\xA0"; // nbsp, because an empty string would cause the HTML element to collapse return "\xA0"; // nbsp, because an empty string would cause the HTML element to collapse
} }
return strings.free; return strings.free;