Author: jacopoc
Date: Sat Nov 4 00:48:00 2006
New Revision: 471140
URL: http://svn.apache.org/viewvc?view=rev&rev=471140
Log:
Applied patch from Markus Studer (OFBIZ-396) to fix the adjustments that were
not properly shown in the final checkout review screen
The similar (and omonimous) script in the order component was ok: this is a
good example of scripts that should be shared by the order component and
removed by ecommerce... another task for the future.
Modified:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
Modified:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh?view=diff&rev=471140&r1=471139&r2=471140
==============================================================================
---
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
(original)
+++
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
Sat Nov 4 00:48:00 2006
@@ -27,11 +27,11 @@
cart = session.getAttribute("shoppingCart");
context.put("cart", cart);
-orderAdjustments = cart.makeAllAdjustments();
-context.put("orderAdjustments", orderAdjustments);
-
orderItems = cart.makeOrderItems();
context.put("orderItems", orderItems);
+
+orderAdjustments = cart.makeAllAdjustments();
+context.put("orderAdjustments", orderAdjustments);
workEfforts = cart.makeWorkEfforts(); // if required make workefforts for
rental fixed assets too.
context.put("workEfforts", workEfforts);
