You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2013/11/20 12:22:25 UTC
Re: svn commit: r1543744 -
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
I just spotted that the 1st change I committed
ie 1st line:
${StringUtil.wrapString(localOrderReadHelper.getAdjustmentType(orderItemAdjustment))}
is useless (I typed there wrongly 1st)
But I have not the courage to change that back again notably related to backporting (no effects anyway, just an useless StringUtil.wrapString, can't hurt)
Jacques
On Wednesday, November 20, 2013 10:54 AM jleroux@apache.org <jl...@apache.org> wrote:
> Author: jleroux
> Date: Wed Nov 20 09:54:03 2013
> New Revision: 1543744
>
> URL: http://svn.apache.org/r1543744
> Log:
> Fixes a wrong rendered info in case of promotion
>
> Modified:
> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
>
> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1543744&r1=1543743&r2=1543744&view=diff
> ============================================================================== ---
> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++
> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Wed Nov 20 09:54:03 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)/>