svn commit: r674818 - in /ofbiz/trunk/applications/ecommerce: webapp/ecommerce/WEB-INF/controller.xml widget/OrderScreens.xml

[mor-2]

Author: mor
Date: Tue Jul  8 06:33:32 2008
New Revision: 674818

URL: http://svn.apache.org/viewvc?rev=674818&view=rev
Log:
Added page title and cart not empty check on One Page Checkout

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=674818&r1=674817&r2=674818&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Jul  8 06:33:32 2008
@@ -1579,7 +1579,8 @@
 
     <!-- ============== One Page Checkout Requests ============== -->
     <request-map uri="onePageCheckout">
-        <security auth="false" https="true"/>
+        <security https="true" auth="false"/>
+        <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="cartNotEmpty"/>
         <response name="success" type="view" value="OnePageCheckout"/>
         <response name="error" type="view" value="main"/>        
     </request-map>

Modified: ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?rev=674818&r1=674817&r2=674818&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Tue Jul  8 06:33:32 2008
@@ -611,9 +611,10 @@
     <screen name="OnePageCheckout">
         <section>
             <actions>
-                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/ecommerce/images/checkoutProcess.js" global="true"/>
+                <set field="titleProperty" value="EcommerceOnePageCheckout"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/ecommerce/images/checkoutProcess.js" global="true"/>            
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">