svn commit: r562843 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: jonesde
Date: Sun Aug 5 02:41:52 2007 New Revision: 562843 URL: http://svn.apache.org/viewvc?view=rev&rev=562843 Log: Fixed bug where ProductStore.headerApprovedStatus wasn't working because the check item status service was always setting it to approved; not sure when how this happened, but it seems to be related to a weird way of setting the order header status to approved by setting all item statuses; changed the orderdetail page in the order manager to use changeOrderStatus instead of changeOrderItemStatus, and also changed changeOrderStatus to support setting item statuses first if parameter for that is passed; this fixes the ProductStore.headerApprovedStatus problem, and hopefully won't have an impact on other areas; in the check order item status there is only a small reason why it won't auto approve the header, mainly for the headerApprovedStatus case and it checks specifically for that Modified: ofbiz/trunk/applications/order/servicedef/services.xml ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Modified: ofbiz/trunk/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?view=diff&rev=562843&r1=562842&r2=562843 ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services.xml Sun Aug 5 02:41:52 2007 @@ -250,6 +250,7 @@ <description>Change the status of an existing order</description> <attribute name="orderId" type="String" mode="IN"/> <attribute name="statusId" type="String" mode="IN"/> + <attribute name="setItemStatus" type="String" mode="IN" optional="true"/> <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/> <attribute name="orderStatusId" type="String" mode="OUT" optional="true"/> <attribute name="orderTypeId" type="String" mode="OUT" optional="true"/> 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?view=diff&rev=562843&r1=562842&r2=562843 ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Sun Aug 5 02:41:52 2007 @@ -1592,6 +1592,8 @@ return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemGettingOrderItemRecords", locale)); } + String orderHeaderStatusId = orderHeader.getString("statusId"); + boolean allCanceled = true; boolean allComplete = true; boolean allApproved = true; @@ -1623,7 +1625,39 @@ } else if (allComplete) { newStatus = "ORDER_COMPLETED"; } else if (allApproved) { - if (!"ORDER_SENT".equals(orderHeader.getString("statusId"))) { + boolean changeToApprove = true; + + // NOTE DEJ20070805 I'm not sure why we would want to auto-approve the header... adding at least this one exeption so that we don't have to add processing, held, etc statuses to the item status list + // NOTE2 related to the above: appears this was a weird way to set the order header status by setting all order item statuses... changing that to be less weird and more direct + // this is a bit of a pain: if the current statusId = ProductStore.headerApprovedStatus and we don't have that status in the history then we don't want to change it on approving the items + if (UtilValidate.isNotEmpty(orderHeader.getString("productStoreId"))) { + try { + GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", orderHeader.getString("productStoreId"))); + if (productStore != null) { + String headerApprovedStatus = productStore.getString("headerApprovedStatus"); + if (UtilValidate.isNotEmpty(headerApprovedStatus)) { + if (headerApprovedStatus.equals(orderHeaderStatusId)) { + Map orderStatusCheckMap = UtilMisc.toMap("orderId", orderId, "statusId", headerApprovedStatus, "orderItemSeqId", null); + List orderStatusList = delegator.findByAnd("OrderStatus", orderStatusCheckMap); + // should be 1 in the history, but just in case accept 0 too + if (orderStatusList.size() <= 1) { + changeToApprove = false; + } + } + } + } + } catch (GenericEntityException e) { + String errMsg = "Database error checking if we should change order header status to approved: " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + } + + if ("ORDER_SENT".equals(orderHeaderStatusId)) changeToApprove = false; + if ("ORDER_COMPLETED".equals(orderHeaderStatusId)) changeToApprove = false; + if ("ORDER_CANCELLED".equals(orderHeaderStatusId)) changeToApprove = false; + + if (changeToApprove) { newStatus = "ORDER_APPROVED"; } } @@ -1866,6 +1900,7 @@ /** Service for changing the status on an order header */ public static Map setOrderStatus(DispatchContext ctx, Map context) { + LocalDispatcher dispatcher = ctx.getDispatcher(); GenericDelegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String orderId = (String) context.get("orderId"); @@ -1883,8 +1918,33 @@ } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorCannotGetOrderRoleEntity", locale) + e.getMessage()); } - if (placingCustomer == null) + if (placingCustomer == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + } + } + + if ("Y".equals(context.get("setItemStatus"))) { + String newItemStatusId = null; + if ("ORDER_APPROVED".equals(statusId)) { + newItemStatusId = "ITEM_APPROVED"; + } else if ("ORDER_COMPLETE".equals(statusId)) { + newItemStatusId = "ITEM_COMPLETE"; + } else if ("ORDER_CANCELLED".equals(statusId)) { + newItemStatusId = "ITEM_CANCELLED"; + } + + if (newItemStatusId != null) { + try { + Map resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", userLogin)); + if (ServiceUtil.isError(resp)) { + return ServiceUtil.returnError("Error changing item status to " + newItemStatusId, null, null, resp); + } + } catch (GenericServiceException e) { + String errMsg = "Error changing item status to " + newItemStatusId + ": " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + } } try { @@ -2909,7 +2969,7 @@ } else if ("FULFILLMENT_EXTSYNC".equals(fulfillmentType)) { Map resp = dispatcher.runSync(fulfillmentService, serviceCtx); if (ServiceUtil.isError(resp)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resp)); + return ServiceUtil.returnError("Error running external fulfillment service", null, null, resp); } } } catch (GenericServiceException e) { @@ -3490,7 +3550,7 @@ } if (ServiceUtil.isError(paymentResp)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(paymentResp)); + return ServiceUtil.returnError("Error processing payments: ", null, null, paymentResp); } } return ServiceUtil.returnSuccess(); @@ -3652,7 +3712,7 @@ return ServiceUtil.returnError(e.getMessage()); } if (ServiceUtil.isError(resp)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resp)); + return ServiceUtil.returnError("Error changing order item status: ", null, null, resp); } } return ServiceUtil.returnSuccess(); @@ -3716,7 +3776,7 @@ return ServiceUtil.returnError(e.getMessage()); } if (ServiceUtil.isError(resp)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resp)); + return ServiceUtil.returnError("Error creating picklist from orders: ", null, null, resp); } } @@ -4204,7 +4264,7 @@ return ServiceUtil.returnError(e.getMessage()); } if (ServiceUtil.isError(payResp)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(payResp)); + return ServiceUtil.returnError("Error processing order payments: ", null, null, payResp); } } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=562843&r1=562842&r2=562843 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sun Aug 5 02:41:52 2007 @@ -26,11 +26,11 @@ <li class="head3"> ${uiLabelMap.OrderOrder} #<a href="<@ofbizUrl>/orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} ${uiLabelMap.CommonInformation} [ <a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a> ]</li> <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> - <li><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li> + <li><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_APPROVED&setItemStatus=Y&${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li> <#elseif currentStatus.statusId == "ORDER_APPROVED"> <li><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_HOLD&${paramString}</@ofbizUrl>">${uiLabelMap.OrderHold}</a></li> <#elseif currentStatus.statusId == "ORDER_HOLD"> - <li><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li> + <li><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_APPROVED&setItemStatus=Y&${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li> </#if> <#if setOrderCompleteOption> <li><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>">${uiLabelMap.OrderCompleteOrder}</a></li> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |