[OFBiz] SVN: r7065 - in trunk/applications/order: config src/org/ofbiz/order/shoppingcart webapp/ordermgr/entry

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-03-24 08:59:27 -0600 (Fri, 24 Mar 2006)
New Revision: 7065

Modified:
   trunk/applications/order/config/OrderUiLabels.properties
   trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
   trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
Log:
Added link to perform a quick order checkout with default values.

Modified: trunk/applications/order/config/OrderUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels.properties	2006-03-24 11:44:46 UTC (rev 7064)
+++ trunk/applications/order/config/OrderUiLabels.properties	2006-03-24 14:59:27 UTC (rev 7065)
@@ -69,6 +69,7 @@
 OrderErrorFacilityHaveNoAdress=Error : the facility does not have addresses
 OrderExternalId = External ID
 OrderFinalizeOrder = Finalize Order
+OrderFinalizeOrderDefault = Finalize Order With Default Options
 OrderFindOrder = Find Orders
 OrderFindReturn = Find Returns
 OrderGift = Gift?

Modified: trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
===================================================================
--- trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java	2006-03-24 11:44:46 UTC (rev 7064)
+++ trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java	2006-03-24 14:59:27 UTC (rev 7065)
@@ -639,6 +639,11 @@
         }
 
         // set the customer info
+        if (mode != null && mode.equals("default")) {
+            cart.setDefaultCheckoutOptions(dispatcher);
+        }
+
+        // set the customer info
         if (mode != null && mode.equals("cust")) {
             String partyId = (String) request.getAttribute("partyId");
             if (partyId != null) {

Modified: trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl	2006-03-24 11:44:46 UTC (rev 7064)
+++ trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl	2006-03-24 14:59:27 UTC (rev 7065)
@@ -36,11 +36,13 @@
                 <a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderFinalizeOrder}</a>
             <#else>
                 <a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderQuickFinalizeOrder}</a>
+                <a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderFinalizeOrderDefault}</a>
                 <a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderFinalizeOrder}</a>
             </#if>
         <#else>
             <span class="submenutextdisabled">${uiLabelMap.OrderRecalculateOrder}</span>
             <span class="submenutextdisabled">${uiLabelMap.OrderQuickFinalizeOrder}</span>
+            <span class="submenutextdisabled">${uiLabelMap.OrderFinalizeOrderDefault}</span>
             <span class="submenutextrightdisabled">${uiLabelMap.OrderFinalizeOrder}</span>
         </#if>
     </div>