Author: jleroux
Date: Fri Dec 17 08:30:11 2010
New Revision: 1050313
URL: http://svn.apache.org/viewvc?rev=1050313&view=rev
Log:
Properly fix "Order manager order entry show cart.ftl problem probably caused
by jquery update" (https://issues.apache.org/jira/browse/OFBIZ-4064) -
OFBIZ-4064
Dukian fix was not complete (I guess because it was not properly moved during
jQuery merge).
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=1050313&r1=1050312&r2=1050313&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Fri
Dec 17 08:30:11 2010
@@ -110,7 +110,10 @@ under the License.
<td
align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
<td>
<div>
- <@htmlTemplate.renderDateTimeField
name="itemDesiredDeliveryDate" value="${defaultDesiredDeliveryDate!''}"
className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25"
maxlength="30" id="item1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <#if useAsDefaultDesiredDeliveryDate?exists>
+ <#assign value = defaultDesiredDeliveryDate>
+ </#if>
+ <@htmlTemplate.renderDateTimeField
name="itemDesiredDeliveryDate" value="${value!''}" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1"
dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="checkbox"
name="useAsDefaultDesiredDeliveryDate" value="true"<#if
useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/>
${uiLabelMap.OrderUseDefaultDesiredDeliveryDate}
</div>
