From c3cd1dc8722da88f18e37f97dcdf62f554055c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Mon, 24 Mar 2025 16:00:29 +0100 Subject: [PATCH] feat: remove discount option addresses #8698d0h7c --- ...x_epproducts_domain_model_groupspriceoption.php | 2 +- .../Assets/js/components/GroupsPriceCalculator.vue | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceoption.php b/public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceoption.php index d00dee5e..705e2ed7 100644 --- a/public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceoption.php +++ b/public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceoption.php @@ -29,7 +29,7 @@ return [ ], ], 'palettes' => [ - 'priceconfig' => ['showitem' => 'price, price_chf, type, ignore_with_board'], + 'priceconfig' => ['showitem' => 'price, price_chf, type'], ], 'columns' => [ diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/GroupsPriceCalculator.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/GroupsPriceCalculator.vue index 3b1d4076..b371aa22 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/GroupsPriceCalculator.vue +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/GroupsPriceCalculator.vue @@ -95,7 +95,7 @@ {{ selectedOption.title }} - {{ formatCurrency(optionPrice(selectedOption)) }} + {{ formatCurrency(selectedOption.price) }} @@ -381,14 +381,6 @@ export default { return ` (${this.formatCurrency(option.price)})` }, - optionPrice(option) { - let factor = (true === option.ignoreWithBoard && this.selectedBoard) ? 0 : 1 - - return { - EUR: option.price.EUR * factor, - CHF: option.price.CHF * factor, - } - }, initSelectableRanges() { let enabledDates = []; for (let config of this.configs) { @@ -525,10 +517,6 @@ export default { for (let option of this.selectedOptions) { let optionPriceEUR = option.price.EUR let optionPriceCHF = option.price.CHF - if (true === option.ignoreWithBoard && this.selectedBoard) { - optionPriceEUR = 0 - optionPriceCHF = 0 - } if (1 === option.type) { price.EUR += optionPriceEUR; price.CHF += optionPriceCHF;