Merge pull request #118 from oallain/fix/pricing-with-catalog-promotion

fix pricing with catalog promotion
SyliusCrafts · Jun 30, 2023 · 3199a8f · 3199a8f
2 parents 28e03c2 + a6a21da
commit 3199a8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/SyliusShopBundle/views/Product/Show/_variantsPricing.html.twig b/SyliusShopBundle/views/Product/Show/_variantsPricing.html.twig
@@ -1,7 +1,11 @@
 {% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
 
 <div id="sylius-variants-pricing" data-unavailable-text="{{ 'sylius.ui.unavailable'|trans }}">
-{% for price in pricing %}
-    <div {% for option, value in price %}data-{{ option }}="{% if option == 'value' %}{{ money.convertAndFormat(value) }}{% else %}{{ value|replace({'\"': '\''}) }}{% endif %}" {{ sylius_test_html_attribute('variant-price') }}{% endfor %}></div>
-{% endfor %}
+    {% for price in pricing %}
+        <div {% for option, value in price %}
+            {% if option != "applied_promotions" %}
+                data-{{ option }}="{% if option == 'value' %}{{ money.convertAndFormat(value) }}{% else %}{{ value|replace({'\"': '\''}) }}{% endif %}" {{ sylius_test_html_attribute('variant-price') }}
+            {% endif %}
+            {% endfor %}></div>
+    {% endfor %}
 </div>
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
             "title": "Sylius Bootstrap Theme"
         },
         "branch-alias": {
-            "dev-master": "0.5-dev"
+            "dev-master": "0.8-dev"
         }
     },
     "config": {