diff --git a/applications/product/template/promo/EditProductPromoRules.ftl b/applications/product/template/promo/EditProductPromoRules.ftl index 757f884bc1..facd7f33f0 100644 --- a/applications/product/template/promo/EditProductPromoRules.ftl +++ b/applications/product/template/promo/EditProductPromoRules.ftl @@ -291,8 +291,14 @@ under the License. <#if (productPromoAction.customMethodId)??> - <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> - <#if productPromoActionCurEnum??>${(productPromoActionCurEnum.get("description",locale))!}<#else>[${(productPromoAction.customMethodId)!}]#if> + <#assign productPromoActionCustomMethod = productPromoAction.getRelatedOne("CustomMethod", true)> + + <#if (productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true))??> + ${(productPromoActionCurEnum.get("description",locale))!} + <#else> + ${(productPromoActionCustomMethod.get("description",locale))!} + #if> + <#elseif (productPromoAction.productPromoActionEnumId)??> <#assign actionEnumeration = productPromoAction.getRelatedOne("ActionEnumeration", true)! /> @@ -317,7 +323,6 @@ under the License. ${uiLabelMap.UseCartQuantity}: <#if (productPromoAction.useCartQuantity)??> - <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> <#if ("Y" == productPromoAction.useCartQuantity)>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}#if> <#else> @@ -392,7 +397,7 @@ under the License. ${(actionProduct.internalName)!} [${actionProductPromoProduct.productId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} - +