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

Widget: Do not declare products "FREE" if they have mandatory addons (#3041)

Browse Source
This commit is contained in:
Raphael Michel
2023-01-20 09:15:14 +01:00
committed by GitHub
parent 6c3e745d5d
commit 56d928d5ec
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/presale/views/widget.py
View File

@@ -272,6 +272,7 @@ class WidgetAPIProductList(EventListMixin, View):
'min_price': item.min_price if item.has_variations else None,
'max_price': item.max_price if item.has_variations else None,
'allow_waitinglist': item.allow_waitinglist,
'mandatory_priced_addons': item.mandatory_priced_addons,
'free_price': item.free_price,
'avail': [
item.cached_availability[0],

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

@@ -307,7 +307,8 @@ Vue.component('pricebox', {
price: Object,
free_price: Boolean,
field_name: String,
original_price: String
original_price: String,
mandatory_priced_addons: Boolean,
},
computed: {
display_price: function () {
@@ -329,6 +330,9 @@ Vue.component('pricebox', {
},
priceline: function () {
if (this.price.gross === "0.00") {
if (this.mandatory_priced_addons) {
return "\xA0"; // nbsp, because an empty string would cause the HTML element to collapse
}
return strings.free;
} else {
return this.$root.currency + " " + this.display_price;
@@ -375,7 +379,8 @@ Vue.component('variation', {
// Price
+ '<div class="pretix-widget-item-price-col">'
+ '<pricebox :price="variation.price" :free_price="item.free_price" :original_price="orig_price"'
+ '<pricebox :price="variation.price" :free_price="item.free_price" :original_price="orig_price" '
+ ' :mandatory_priced_addons="item.mandatory_priced_addons"'
+ ' :field_name="\'price_\' + item.id + \'_\' + variation.id" v-if="$root.showPrices">'
+ '</pricebox>'
+ '<span v-if="!$root.showPrices">&nbsp;</span>'
@@ -432,6 +437,7 @@ Vue.component('item', {
// Price
+ '<div class="pretix-widget-item-price-col">'
+ '<pricebox :price="item.price" :free_price="item.free_price" v-if="!item.has_variations && $root.showPrices"'
+ ' :mandatory_priced_addons="item.mandatory_priced_addons"'
+ ' :field_name="\'price_\' + item.id" :original_price="item.original_price">'
+ '</pricebox>'
+ '<div class="pretix-widget-pricebox" v-if="item.has_variations && $root.showPrices">{{ pricerange }}</div>'
@@ -500,6 +506,9 @@ Vue.component('item', {
return this.$root.currency + " " + floatformat(this.item.min_price, 2) + " – "
+ floatformat(this.item.max_price, 2);
} else if (this.item.min_price === "0.00" && this.item.max_price === "0.00") {
if (this.item.mandatory_priced_addons) {
return "\xA0"; // nbsp, because an empty string would cause the HTML element to collapse
}
return strings.free;
} else {
return this.$root.currency + " " + floatformat(this.item.min_price, 2);

6
src/tests/presale/test_widget.py
View File

@@ -185,6 +185,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
"picture": None,
"has_variations": 0,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
"description": None,
"min_price": None,
"avail": [100, None],
@@ -203,6 +204,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
"picture": None,
"has_variations": 4,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
"description": None,
"min_price": "12.00",
"avail": None,
@@ -263,6 +265,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
"picture": None,
"has_variations": 0,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
"description": None,
"min_price": None,
"avail": [100, None],
@@ -307,6 +310,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
"picture": None,
"has_variations": 4,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
"description": None,
"min_price": "12.00",
"avail": None,
@@ -365,6 +369,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
"picture": None,
"has_variations": 0,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
"description": None,
"min_price": None,
"avail": [100, None],
@@ -417,6 +422,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
'description': None,
'has_variations': 2,
"allow_waitinglist": True,
"mandatory_priced_addons": False,
'require_voucher': False,
'order_min': None,
'order_max': None,