svn commit: r646250 - in /ofbiz/branches/release4.0/applications: ecommerce/webapp/ecommerce/order/requestreturn.ftl order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh

[bibryam]

Author: bibryam
Date: Wed Apr  9 03:04:10 2008
New Revision: 646250

URL: http://svn.apache.org/viewvc?rev=646250&view=rev
Log:
Applied fix from trunk for revision: 629261

Modified:
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=646250&r1=646249&r2=646250&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl Wed Apr  9 03:04:10 2008
@@ -57,12 +57,14 @@
             <#if returnableItems?has_content>
               <#assign rowCount = 0>
               <#list returnableItems.keySet() as orderItem>
+              <#if !orderItem.orderAdjustmentId?has_content>    <#-- filter orderAdjustments -->
                 <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
                 <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
                 <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
                 <#-- <input type="hidden" name="returnItemType_o_${rowCount}" value="ITEM"/> -->
                 <#assign returnItemType = returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey"))/>
                 <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
+                <input type="hidden" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")}"/>                
 
                 <#-- need some order item information -->
                 <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
@@ -106,6 +108,7 @@
                 </tr>
                 <tr><td colspan="6"><hr class="sepbar"/></td></tr>
                 <#assign rowCount = rowCount + 1>
+              </#if>
               </#list>
               <input type="hidden" name="_rowCount" value="${rowCount}"/>
               <tr>

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh?rev=646250&r1=646249&r2=646250&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh Wed Apr  9 03:04:10 2008
@@ -28,6 +28,10 @@
 if (returnId == null) {
     returnId = request.getAttribute("returnId");
 }
+
+if (returnId == null) {
+    return;
+}
 context.put("returnId", returnId);
 
 orderId = request.getParameter("orderId");