[Opentaps-crmcommits] r618 - in versions/1.0/trunk: config src/com/opensourcestrategies/crmsfa/orders webapp/crmsfa/orders

[<cli...@gr...>]

Author: cliberty
Date: 2007-04-20 10:27:18 -0700 (Fri, 20 Apr 2007)
New Revision: 618

Modified:
   versions/1.0/trunk/config/CRMSFAUiLabels.properties
   versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/orders/CrmsfaOrderServices.java
   versions/1.0/trunk/webapp/crmsfa/orders/manageOrderQueue.ftl
Log:
Adding a Back-Ordered column to the order queue screen, and fixing the alt tags for the images.

Modified: versions/1.0/trunk/config/CRMSFAUiLabels.properties
===================================================================
--- versions/1.0/trunk/config/CRMSFAUiLabels.properties	2007-04-20 00:16:35 UTC (rev 617)
+++ versions/1.0/trunk/config/CRMSFAUiLabels.properties	2007-04-20 17:27:18 UTC (rev 618)
@@ -235,9 +235,11 @@
 CrmOpportunityHistory = Opportunity History
 CrmOpportunityName = Opportunity Name
 CrmOpportunity = Opportunity
+CrmOrderBackOrdered = Back-Ordered
 CrmOrderCarrier=Carrier
 CrmOrderCarrierAndShipmentMethod=Carrier/Shipment Method
 CrmOrderEstimatedShipDate=Estimated Ship Date
+CrmOrderEstimatedShipDateAbbr=Est. Ship Date
 CrmOrderIsGift = Gift
 CrmOrderItem = Order Item
 CrmOrderItemQty = Qty
@@ -247,6 +249,8 @@
 CrmOrderPaymentSettings = Select Payment Method
 CrmOrderQueue=Order Queue
 CrmOrderQueuePriority=Priority
+CrmOrderQueuePriorityDecrease=Decrease Priority
+CrmOrderQueuePriorityIncrease=Increase Priority
 CrmOrderQueueManageOrders=Manage Open Orders
 CrmOrderQueueSaveRefresh=Save and Refresh
 CrmOrderSetShipping = Set Shipping

Modified: versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/orders/CrmsfaOrderServices.java
===================================================================
--- versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/orders/CrmsfaOrderServices.java	2007-04-20 00:16:35 UTC (rev 617)
+++ versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/orders/CrmsfaOrderServices.java	2007-04-20 17:27:18 UTC (rev 618)
@@ -98,6 +98,22 @@
                 }
                 gvMap.put("estimatedShipDate", estShipDate);
                 
+                // Get the back-ordered quantity from the inventory reservations
+                double backOrderedQuantity = 0;
+                List oisgirs = orderItemShipGroup.getRelated("OrderItemShipGrpInvRes");
+                if (UtilValidate.isNotEmpty(oisgirs)) {
+                    Iterator oisgirit = oisgirs.iterator();
+                    while (oisgirit.hasNext()) {
+                        GenericValue oisgir = (GenericValue) oisgirit.next();
+                        Double qtyNotAvailable = oisgir.getDouble("quantityNotAvailable");
+                        if (UtilValidate.isNotEmpty(qtyNotAvailable)) {
+                            backOrderedQuantity += qtyNotAvailable.doubleValue();
+                        }
+                        
+                    }
+                }
+                gvMap.put("backOrderedQuantity", new Double(backOrderedQuantity));
+                
                 jsonObjects.add(JSONObject.fromMap(gvMap));
             }
             osgpit.close();

Modified: versions/1.0/trunk/webapp/crmsfa/orders/manageOrderQueue.ftl
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/orders/manageOrderQueue.ftl	2007-04-20 00:16:35 UTC (rev 617)
+++ versions/1.0/trunk/webapp/crmsfa/orders/manageOrderQueue.ftl	2007-04-20 17:27:18 UTC (rev 618)
@@ -99,7 +99,8 @@
                 cellCarrierAndMethod = rowCells[3];                
                 cellShipByDate = rowCells[4];                
                 cellEstimatedShipDate = rowCells[5];                
-                cellUpDownLinks = rowCells[6];                
+                cellBackOrders = rowCells[6];                
+                cellUpDownLinks = rowCells[7];                
                 
                 <#-- OrderId/ShipGroupSeqId Link -->
                 var link = dojo.html.createNodesFromText('<a href="<@ofbizUrl>orderview</@ofbizUrl>?orderId=' + orderId + '">' + orderId + ' / ' + shipGroupSeqId + '</a>')[0];
@@ -139,7 +140,7 @@
                 shipByDateInput.name = 'shipByDate_' + orderId + '_' + shipGroupSeqId;
                 shipByDateInput.id = 'shipByDate_' + orderId + '_' + shipGroupSeqId;
                 cellShipByDate.appendChild(shipByDateInput);
-                var calendarImage = dojo.html.createNodesFromText('<img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar">')[0];
+                var calendarImage = dojo.html.createNodesFromText('<img src="/images/cal.gif" width="16" height="16" border="0" alt="${uiLabelMap.CommonViewCalendar?js_string}">')[0];
                 dojo.event.connect(calendarImage, "onclick",
                     function (){
                         call_cal_notime(shipByDateInput, shipByDate);
@@ -156,14 +157,20 @@
                     cellEstimatedShipDate.appendChild(estimatedShipDateText);
                 }
 
+                <#-- Back orders -->
+                if (dataObject.backOrderedQuantity != null && dataObject.backOrderedQuantity > 0) {
+                    var backOrderedText = dojo.html.createNodesFromText('\u2713')[0]; // A checkbox
+                    cellBackOrders.appendChild(backOrderedText);
+                }
+
                 <#-- + and - anchors with handlers to move rows up and down -->            
-                var upLink = dojo.html.createNodesFromText('<img src="/opentaps_images/buttons/glass_buttons_lumen_desi_01_plus_24x24.png" border="0" alt="Calendar">')[0];
+                var upLink = dojo.html.createNodesFromText('<img src="/opentaps_images/buttons/glass_buttons_lumen_desi_01_plus_24x24.png" border="0" alt="${uiLabelMap.CrmOrderQueuePriorityIncrease?js_string}">')[0];
                 dojo.event.connect(upLink, "onclick",
                     function (){
                         changeRowPriority(child.rowIndex, true);
                     }
                 );
-                var downLink = dojo.html.createNodesFromText('<img src="/opentaps_images/buttons/glass_buttons_lumen_desi_01_minus_24x24.png" border="0" alt="Calendar">')[0];
+                var downLink = dojo.html.createNodesFromText('<img src="/opentaps_images/buttons/glass_buttons_lumen_desi_01_minus_24x24.png" border="0" alt="${uiLabelMap.CrmOrderQueuePriorityDecrease?js_string}">')[0];
                 dojo.event.connect(downLink, "onclick",
                     function (){
                         changeRowPriority(child.rowIndex, false);
@@ -235,7 +242,8 @@
                 <th field="shippingAddress" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderShippingAddress}</th>
                 <th field="carrierNameAndShipmentMethod" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderCarrierAndShipmentMethod}</th>
                 <th field="shipGroupShipByDate" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderShipByDate}</th>
-                <th field="shipGroupEstimatedShipDate" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderEstimatedShipDate}</th>
+                <th field="shipGroupEstimatedShipDate" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderEstimatedShipDateAbbr}</th>
+                <th field="backOrdered" dataType="String" noSort="true" align="center">${uiLabelMap.CrmOrderBackOrdered}</th>
                 <th field="upDownLinks" dataType="Element" noSort="true" align="center"></th>
             </tr>
         </thead>