You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/11/20 10:58:06 UTC
svn commit: r1543747 - in /ofbiz/branches/release13.07: ./
specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
Author: jleroux
Date: Wed Nov 20 09:58:06 2013
New Revision: 1543747
URL: http://svn.apache.org/r1543747
Log:
"Applied fix from trunk for revision: 1543744"
------------------------------------------------------------------------
r1543744 | jleroux | 2013-11-20 10:54:03 +0100 (mer. 20 nov. 2013) | 1 ligne
Fixes a wrong rendered info in case of promotion
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1543744
Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1543747&r1=1543746&r2=1543747&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Wed Nov 20 09:58:06 2013
@@ -248,8 +248,8 @@ under the License.
<#list itemAdjustments as orderItemAdjustment>
<tr>
<td>
- ${uiLabelMap.EcommerceAdjustment}: ${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}
- <#if orderItemAdjustment.description?has_content>: ${orderItemAdjustment.description}</#if>
+ ${uiLabelMap.EcommerceAdjustment}: ${StringUtil.wrapString(localOrderReadHelper.getAdjustmentType(orderItemAdjustment))}
+ <#if orderItemAdjustment.description?has_content>: ${StringUtil.wrapString(orderItemAdjustment.description)}</#if>
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>