svn commit: r797069 - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/order/OrderServices.java webapp/ordermgr/order/ordershippinginfo.ftl

[mor-2]

Author: mor
Date: Thu Jul 23 13:36:47 2009
New Revision: 797069

URL: http://svn.apache.org/viewvc?rev=797069&view=rev
Log:
Added the ability to change the order to a gift if the user does not selected Gift option during checkout. User have to click on Add link and this will open a text area to
enter the gift message, on saving this text the order will become a gift order.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=797069&r1=797068&r2=797069&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Thu Jul 23 13:36:47 2009
@@ -5293,6 +5293,7 @@
         try {
             GenericValue orderItemShipGroup = EntityUtil.getFirst(delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", orderId,"shipGroupSeqId",shipGroupSeqId)));
             orderItemShipGroup.set("giftMessage", giftMessage);
+            orderItemShipGroup.set("isGift", "Y");
             orderItemShipGroup.store();
         } catch (GenericEntityException e) {
             Debug.logError(e, module);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=797069&r1=797068&r2=797069&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu Jul 23 13:36:47 2009
@@ -495,19 +495,6 @@
         </tr>
 
         <#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
-          <tr><td colspan="3"><hr/></td></tr>
-          <tr>
-            <td align="right" valign="top" width="15%">
-              <span class="label">&nbsp;${uiLabelMap.OrderGift}</span>
-            </td>
-            <td width="5">&nbsp;</td>
-            <td valign="top" width="80%">
-              <#if shipGroup.isGift?upper_case == "N">
-                ${uiLabelMap.OrderThisOrderNotGift}<#else>${uiLabelMap.OrderThisOrderGift}</#if>
-            </td>
-          </tr>
-        </#if>
-        <#if shipGroup.isGift?upper_case == "Y">
           <form name="setGiftMessageForm" method="post" action="<@ofbizUrl>setGiftMessage</@ofbizUrl>">
             <input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
             <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>