[OFBiz] SVN: r7797 - in trunk/applications/order: config webapp/ordermgr/entry webapp/ordermgr/entry/cart

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-06-15 05:58:06 -0500 (Thu, 15 Jun 2006)
New Revision: 7797

Modified:
   trunk/applications/order/config/OrderUiLabels.properties
   trunk/applications/order/config/OrderUiLabels_it.properties
   trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
   trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
Log:
Added checkboxes to remove shoppingcart items.

Modified: trunk/applications/order/config/OrderUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels.properties	2006-06-15 08:12:23 UTC (rev 7796)
+++ trunk/applications/order/config/OrderUiLabels.properties	2006-06-15 10:58:06 UTC (rev 7797)
@@ -321,6 +321,7 @@
 OrderRelease=Release Hold
 OrderRemaining = Remaining
 OrderRemainingSubTotal = Remaining SubTotal
+OrderRemoveSelected=Remove Selected
 OrderReports=Order Reports
 OrderReportPurchasesByOrganization=Purchases by Organization Report
 OrderReportPurchasesByPaymentMethod=Purchases by Payment Method Report

Modified: trunk/applications/order/config/OrderUiLabels_it.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels_it.properties	2006-06-15 08:12:23 UTC (rev 7796)
+++ trunk/applications/order/config/OrderUiLabels_it.properties	2006-06-15 10:58:06 UTC (rev 7797)
@@ -321,6 +321,7 @@
 OrderRelease=Rilascia Congelato
 OrderRemaining = Rimanenza
 OrderRemainingSubTotal = SubTotale Rimanenza
+OrderRemoveSelected=Rimuovi Selezionati
 OrderReports=Stampe Ordini
 OrderReportPurchasesByOrganization=Report Acquisti per Organizzazione
 OrderReportPurchasesByPaymentMethod=Report Acquisti per Metodo di Pagamento

Modified: trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl	2006-06-15 08:12:23 UTC (rev 7796)
+++ trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl	2006-06-15 10:58:06 UTC (rev 7797)
@@ -32,6 +32,7 @@
         <a href="<@ofbizUrl>emptycart</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderClearOrder}</a>
         <#if (shoppingCart.size() > 0)>
             <a href="javascript:document.cartform.submit()" class="submenutext">${uiLabelMap.OrderRecalculateOrder}</a>
+            <a href="javascript:removeSelected();" class="submenutext">${uiLabelMap.OrderRemoveSelected}</a>
             <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
                 <a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderFinalizeOrder}</a>
             <#else>
@@ -41,6 +42,7 @@
             </#if>
         <#else>
             <span class="submenutextdisabled">${uiLabelMap.OrderRecalculateOrder}</span>
+            <span class="submenutextdisabled">${uiLabelMap.OrderRemoveSelected}</span>
             <span class="submenutextdisabled">${uiLabelMap.OrderQuickFinalizeOrder}</span>
             <span class="submenutextdisabled">${uiLabelMap.OrderFinalizeOrderDefault}</span>
             <span class="submenutextrightdisabled">${uiLabelMap.OrderFinalizeOrder}</span>

Modified: trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl	2006-06-15 08:12:23 UTC (rev 7796)
+++ trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl	2006-06-15 10:58:06 UTC (rev 7797)
@@ -289,6 +289,7 @@
           <td align="right"><div class="tabletext"><b>${uiLabelMap.CommonUnitPrice}</b></div></td>
           <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderAdjustments}</b></div></td>
           <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderItemTotal}</b></div></td>
+          <td align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"></td>
         </tr>
 
         <#assign itemsFromList = false>
@@ -450,6 +451,7 @@
             </td>
             <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td>
             <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td>
+            <td nowrap align="center"><div class="tabletext"><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"><#else>&nbsp;</#if></div></td>
           </tr>
         </#list>