Merge pull request #1668 from ramundomario/bugfix/cart-price-rule-label

[FrontendBundle] Print cart price rule label instead name if available
coreshop · Jul 7, 2021 · d5ffd13 · d5ffd13
2 parents d4f21f0 + 7ecc1d7
commit d5ffd13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Checkout/steps/summary/_rules.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Checkout/steps/summary/_rules.html.twig
@@ -4,12 +4,12 @@
     {% for priceRule in cart.getPriceRuleItems %}
         <tr>
             <td colspan="2" class="text-left">
-                {{ priceRule.cartPriceRule.getName }}
+                {{ priceRule.cartPriceRule.label ?: priceRule.cartPriceRule.name }}
             </td>
             <td class="text-center"></td>
             <td class="text-right" colspan="2">
                 {{ currency.convertAndFormat(priceRule.getDiscount(true)) }}
             </td>
         </tr>
     {% endfor %}
-{% endif %}
+{% endif %}
diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Common/order_detail.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Common/order_detail.html.twig
@@ -111,7 +111,7 @@
                 {% for priceRule in order.getPriceRuleItems %}
                     <tr>
                         <td colspan="2" class="text-center">
-                            {{ priceRule.cartPriceRule.getName }}
+                            {{ priceRule.cartPriceRule.label ?: priceRule.cartPriceRule.name }}
                         </td>
                         <td class="text-center">
 

diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Quote/show.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Quote/show.html.twig
@@ -67,7 +67,7 @@
                 {% for priceRule in quote.getPriceRuleItems %}
                     <tr>
                         <td colspan="2" class="text-center">
-                            {{ priceRule.cartPriceRule.getName }}
+                            {{ priceRule.cartPriceRule.label ?: priceRule.cartPriceRule.name }}
                         </td>
                         <td class="text-center">
 
@@ -199,4 +199,4 @@
     {% else %}
         <p>{{ 'coreshop.ui.quote_empty'|trans }}</p>
     {% endif %}
-{% endblock %}
+{% endblock %}