Author: hansbak
Date: Fri Jul 3 03:19:07 2009
New Revision: 790783
URL: http://svn.apache.org/viewvc?rev=790783&view=rev
Log:
forgot a gift text showing up when the option is set to 'n'
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=790783&r1=790782&r2=790783&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
Fri Jul 3 03:19:07 2009
@@ -132,7 +132,7 @@
</tr>
</#if>
<tr><td colspan="7"><hr/></td></tr>
- <#if orderType != "PURCHASE_ORDER">
+ <#if orderType != "PURCHASE_ORDER" && giftEnable != "N">
<#-- gift settings -->
<tr>
<td align="right" valign="top" width="15%">
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=790783&r1=790782&r2=790783&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Fri Jul 3 03:19:07 2009
@@ -220,7 +220,7 @@
<actions>
<set field="stepTitleId" value="OrderOrderConfirmation"/>
<set field="stepLabelId" value="OrderReviewOrder"/>
-
+ <property-to-field resource="order"
property="orderPreference.giftEnable" field="giftEnable" default="Y"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy"/>
</actions>
<widgets>
