Author: deepak Date: Sat Mar 21 14:00:06 2015 New Revision: 1668271 URL: http://svn.apache.org/r1668271 Log: Applied fix from trunk r#1668270 ============================================================ Applied patch from jira issue OFBIZ-6200 - Order Adjustment details are hidden on order Item section of order entry page.
Thanks Arun Patidar for reporting the issue and thanks Yashwant for providing the patch. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 21 14:00:06 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270 Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy?rev=1668271&r1=1668270&r2=1668271&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy Sat Mar 21 14:00:06 2015 @@ -20,6 +20,7 @@ import org.ofbiz.service.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.*; +import org.ofbiz.order.order.OrderReadHelper; import org.ofbiz.order.shoppingcart.*; import org.ofbiz.party.party.PartyWorker; import org.ofbiz.product.catalog.CatalogWorker; @@ -52,6 +53,25 @@ context.shoppingCart = shoppingCart; context.currencyUomId = shoppingCart.getCurrency(); context.orderType = shoppingCart.getOrderType(); +orderItems = shoppingCart.makeOrderItems(); +orderAdjustments = shoppingCart.makeAllAdjustments(); +orderItemShipGroupInfo = shoppingCart.makeAllShipGroupInfos(); +if (orderItemShipGroupInfo) { + orderItemShipGroupInfo.each { osiInfo -> + if ("OrderAdjustment".equals(osiInfo.getEntityName())) { + // shipping / tax adjustment(s) + orderAdjustments.add(osiInfo); + } + } +} +orderHeaderAdjustments = OrderReadHelper.getOrderHeaderAdjustments(orderAdjustments, null); +orderSubTotal = OrderReadHelper.getOrderItemsSubTotal(orderItems, orderAdjustments); +shippingAmount = OrderReadHelper.getAllOrderItemsAdjustmentsTotal(orderItems, orderAdjustments, false, false, true); +shippingAmount = shippingAmount.add(OrderReadHelper.calcOrderAdjustments(orderHeaderAdjustments, orderSubTotal, false, false, true)); +context.orderShippingTotal = shippingAmount; +taxAmount = OrderReadHelper.getOrderTaxByTaxAuthGeoAndParty(orderAdjustments).taxGrandTotal; +context.orderTaxTotal = taxAmount; + // get all the possible gift wrap options allgiftWraps = from("ProductFeature").where("productFeatureTypeId", "GIFT_WRAP").orderBy("defaultSequenceNum").queryList(); context.allgiftWraps = allgiftWraps; Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1668271&r1=1668270&r2=1668271&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat Mar 21 14:00:06 2015 @@ -306,17 +306,31 @@ under the License. </tr> <#list shoppingCart.getAdjustments() as cartAdjustment> <#assign adjustmentType = cartAdjustment.getRelatedOne("OrderAdjustmentType", true)> + <#if adjustmentType.get("orderAdjustmentTypeId",locale) != 'SHIPPING_CHARGES'> + <tr> + <td colspan="4" nowrap="nowrap" align="right"> + <div> + <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)!} + <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>: + </div> + </td> + <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td> + <td> </td> + </tr> + </#if> + </#list> + <#if orderShippingTotal != 0> <tr> - <td colspan="4" nowrap="nowrap" align="right"> - <div> - <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)!} - <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>: - </div> - </td> - <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td> - <td> </td> + <td align="right" colspan="4"><div>${uiLabelMap.FacilityShippingAndHandling}</div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></div></td> </tr> - </#list> + </#if> + <#if orderTaxTotal != 0> + <tr> + <td align="right" colspan="4"><div>${uiLabelMap.OrderSalesTax}</div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></div></td> + </tr> + </#if> </#if> <tr>