svn commit: r447495 - in /incubator/ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/actions/order/orderlist.bsh order/orderheader.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r447495 - in /incubator/ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/actions/order/orderlist.bsh order/orderheader.ftl

sichen
Author: sichen
Date: Mon Sep 18 11:25:10 2006
New Revision: 447495

URL: http://svn.apache.org/viewvc?view=rev&rev=447495
Log:
Sort orders on order list by date instead of orderId, which can be unreliable if there are multiple instances running at the same time

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh?view=diff&rev=447495&r1=447494&r2=447495
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh Mon Sep 18 11:25:10 2006
@@ -145,7 +145,7 @@
     allConditions.add(typeConditionsList);
 }
 queryConditionsList = new EntityConditionList(allConditions, EntityOperator.AND);
-orderHeaderList = delegator.findByCondition("OrderHeader", queryConditionsList, null, UtilMisc.toList("orderId DESC"));
+orderHeaderList = delegator.findByCondition("OrderHeader", queryConditionsList, null, UtilMisc.toList("orderDate DESC"));
 context.put("orderHeaderList", orderHeaderList);
 
 locale = UtilHttp.getLocale(request);

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl?view=diff&rev=447495&r1=447494&r2=447495
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl Mon Sep 18 11:25:10 2006
@@ -365,7 +365,7 @@
                                 (<b>${uiLabelMap.OrderReference}:</b> ${gatewayResponse.referenceNum?if_exists}
                                 <b>${uiLabelMap.OrderAvs}:</b> ${gatewayResponse.gatewayAvsResult?default("N/A")}
                                 <b>${uiLabelMap.OrderScore}:</b> ${gatewayResponse.gatewayScoreResult?default("N/A")})
-                                [<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}">${uiLabelMap.CommonDetails}</a>]
+                                <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
                                 <#if gatewayResponse_has_next><hr /></#if>
                               </#list>
                             </div>