svn commit: r1125951 [5/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/order/webapp/ordermgr/WEB-INF/actions/order/ applications/order/widget/ordermgr/ framework/base/src/org/ofbiz/bas...

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

svn commit: r1125951 [5/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/order/webapp/ordermgr/WEB-INF/actions/order/ applications/order/widget/ordermgr/ framework/base/src/org/ofbiz/bas...

mrisaliti
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Sun May 22 13:11:17 2011
@@ -21,39 +21,32 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <description>Web Pos Component Site Configuration File</description>
     <errorpage>/error/error.jsp</errorpage>
-
+    
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>
-    <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
-    <handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/>
     <handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/>
     <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
     <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
-    <handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/>
-
+    <handler name="groovy" type="request" class="org.ofbiz.webapp.event.GroovyEventHandler"/>    
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
-    <!-- These event handlers have been deprecated, if you need to send json responses then chain
-         the json request from this controller after calling your event
-    <handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
-    -->
-
+    
     <!-- Events run from here for the first hit in a visit -->
     <firstvisit>
         <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/>
         <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/>
         <event name="setDefaultStoreSettings" type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/>
     </firstvisit>
-
+    
     <!-- Events to run on every request before security (chains exempt) -->
     <preprocessor>
         <!-- This event allows affilate/distributor entry on any page -->
+        <event name="checkExternalLoginKey" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkExternalLoginKey"/>
         <event name="setAssociationId" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="setAssociationId"/>
         <event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/>
         <event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/>
         <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/>
-        <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/>
     </preprocessor>
-
+    
     <after-login>
         <event name="updateAssociatedDistributor" type="java" path="org.ofbiz.ecommerce.misc.ThirdPartyEvents" invoke="updateAssociatedDistributor"/>
         <event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/>
@@ -62,39 +55,45 @@
         <!-- after login and restoring from the auto-save list, save everything to the auto-save list to handle anything that may have already been in the cart before login -->
         <event name="saveCartToAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/>
     </after-login>
-
+    
     <!-- Security Mappings -->
     <request-map uri="checkLogin" edit="false">
         <description>Verify a user is logged in.</description>
         <security https="true" auth="false"/>
         <event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="storeCheckLogin"/>
         <response name="success" type="view" value="main"/>
+        <response name="requirePasswordChange" type="view" value="requirePasswordChange"/>
         <response name="error" type="view" value="login"/>
     </request-map>
-
+    
     <request-map uri="login">
         <security https="true" auth="false"/>
         <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="posLogin"/>
-        <response name="success" type="view" value="main"/>
+        <response name="success" type="request" value="main"/>
         <response name="requirePasswordChange" type="view" value="RequirePasswordChange"/>
-        <response name="error" type="view" value="login"/>
+        <response name="error" type="view" value="Login"/>
     </request-map>
-
+    
     <request-map uri="logout">
         <security https="true" auth="true"/>
         <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/>
-        <response name="success" type="request-redirect" value="main"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success" type="request-redirect-noparam" value="main"/>
+        <response name="error" type="request-redirect-noparam" value="main"/>
     </request-map>
-
+    
     <request-map uri="autoLogout">
         <security https="true" auth="false"/>
         <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginRemove"/>
-        <response name="success" type="request-redirect" value="main"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success" type="request-redirect-noparam" value="main"/>
+        <response name="error" type="request-redirect-noparam" value="main"/>
+    </request-map>
+    
+    <request-map uri="requirePasswordChange">
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="RequirePasswordChange"/>
     </request-map>
     <!-- End of Security Mappings -->
-
+    
     <!-- Common json reponse events, chain these after events to send json reponses -->
     <!-- Standard json response, uses all compatible request attributes -->
     <request-map uri="json">
@@ -102,314 +101,389 @@
         <event type="java" path="org.ofbiz.common.CommonEvents" invoke="jsonResponseFromRequestAttributes"/>
         <response name="success" type="none"/>
     </request-map>
-
+    
+    <request-map uri="getJSONuiLabelArray">
+        <security https="false" auth="false"/>
+        <event type="java" path="org.ofbiz.common.CommonEvents" invoke="getJSONuiLabelArray"/>
+        <response name="success" type="none" />
+        <response name="error" type="none" />
+    </request-map>
+    
     <!-- Request Mappings  -->
     <request-map uri="view">
-        <security https="true" auth="false"/>
+        <security https="false" auth="false"/>
         <response name="success" type="view" value="main"/>
     </request-map>
-
+    
     <request-map uri="authview">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <response name="success" type="view" value="main"/>
     </request-map>
-
+    
     <request-map uri="main">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="existsWebPosSession"/>
         <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="login"/>
+        <response name="error" type="view" value="Login"/>
     </request-map>
-
+    
     <request-map uri="Login">
-        <security https="true" auth="false"/>
+        <security https="false" auth="false"/>
         <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="posLogin"/>
-        <response name="success" type="view" value="main"/>
+        <response name="success" type="request" value="main"/>
         <response name="requirePasswordChange" type="view" value="RequirePasswordChange"/>
         <response name="error" type="view" value="Login"/>
     </request-map>
-
+    
     <request-map uri="Logout">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/>
-        <response name="success" type="request-redirect" value="main"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success" type="request-redirect-noparam" value="main"/>
+        <response name="error" type="request-redirect-noparam" value="main"/>
     </request-map>
-
-    <request-map uri="SetSessionLocale">
+    
+    <request-map uri="ListLocales">
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="ListLocales" save-last-view="true"/>
+    </request-map>
+    
+    <request-map uri="setSessionLocale">
         <security https="false" auth="false"/>
         <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
-
-    <request-map uri="Manager">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Manager"/>
+    
+    <request-map uri="ListTimezones">
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="ListTimezones" save-last-view="true"/>
     </request-map>
-
-    <request-map uri="Payment">
+    
+    <request-map uri="setSessionTimeZone">
+        <security https="true" auth="false"/>
+        <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/>
+        <response name="success" type="view-last" value="main"/>
+        <response name="error" type="request" value="main"/>
+    </request-map>
+    
+    <request-map uri="showHelp">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="Payment"/>
+        <response name="success" type="view" value="showHelp"/>
     </request-map>
-
-    <request-map uri="Promo">
+    
+    <request-map uri="help">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="Promo"/>
+        <response name="success" type="view" value="help"/>
     </request-map>
-
-    <request-map uri="SearchProducts">
+    
+    <!-- User preference mapping -->
+    <request-map uri="setUserPreference">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="SearchProducts"/>
+        <event type="service" invoke="setUserPreference"/>
+        <response name="success" type="view-last" value="main"/>
+        <response name="error" type="request" value="main"/>
     </request-map>
 
-    <request-map uri="FindProducts">
+    <request-map uri="ajaxSetUserPreference">
         <security https="true" auth="true"/>
-        <event type="service" invoke="FindProducts"/>
-        <response name="success" type="request" value="json"/>
-        <response name="error" type="request" value="json"/>
+        <event type="service" invoke="setUserPreference"/>
+        <response name="success" type="none"/>
     </request-map>
-
-    <request-map uri="FindProductsByIdentification">
+    
+    <request-map uri="help">
         <security https="true" auth="true"/>
-        <event type="service" invoke="FindProductsByIdentification"/>
-        <response name="success" type="request" value="json"/>
-        <response name="error" type="request" value="json"/>
+        <response name="success" type="view" value="help"/>
     </request-map>
 
+    <request-map uri="ListVisualThemes">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="ListVisualThemes"/>
+    </request-map>
+    
+    <request-map uri="Category">
+        <security https="false" auth="false"/>
+        <response name="success" type="view" value="Category"/>
+    </request-map>
+    
+    <request-map uri="Manager">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="Manager"/>
+    </request-map>
+    
+    <request-map uri="Payment">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="Payment"/>
+    </request-map>
+    
+    <request-map uri="CustomerAddress">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="CustomerAddress"/>
+    </request-map>
+    
     <request-map uri="ShowCart">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <response name="success" type="view" value="ShowCart"/>
     </request-map>
-
-    <request-map uri="ModifyCart">
+    
+    <request-map uri="ShowCartItemSelected">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="ShowCartItemSelected"/>
+    </request-map>
+    
+    <request-map uri="SearchSalesRepsList">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="SearchSalesRepsList"/>
+    </request-map>
+    
+    <request-map uri="SideDeepCategory">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="SideDeepCategory"/>
+    </request-map>
+    
+    <request-map uri="CategoryDetail">
+        <security https="false" auth="true"/>
+        <response name="success" type="view" value="CategoryDetail"/>
+    </request-map>  
+    
+    <request-map uri="Shutdown">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="shutdown"/>
+        <response name="success" type="request" value="Login"/>
+        <response name="error" type="request" value="main"/>
+    </request-map>
+    
+    <!-- Ajax requests -->
+    <request-map uri="Error">
         <security https="false" auth="false"/>
-        <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="modifyCart"/>
-        <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
+    
     <request-map uri="EmptyCart">
         <security https="false" auth="false"/>
-        <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="clearCart"/>
-        <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="main"/>
+        <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="emptyCartAndClearAutoSaveList"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="AddItem">
-        <security https="true" auth="true"/>
-        <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="addToCart"/>
-        <response name="success" type="view" value="main"/>
-        <response name="survey" type="view" value="main"/>
-        <response name="product" type="view" value="main"/>
-        <response name="viewcart" type="request-redirect" value="main"/>
-        <response name="error" type="view" value="main"/>
+    
+    <request-map uri="GetProductType">
+        <security https="false" auth="true"/>
+        <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="getProductType"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ManagerOpenTerminal">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ManagerOpenTerminal"/>
-        <response name="error" type="view" value="ManagerOpenTerminal"/>
+    
+    <request-map uri="GetProductAndPrice">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="getProductAndPrice"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="OpenTerminal">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="openTerminal"/>
-        <response name="success" type="view" value="Manager"/>
-        <response name="error" type="view" value="ManagerOpenTerminal"/>
+    
+    <request-map uri="GetFormattedAmount">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="getFormattedAmount"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ManagerCloseTerminal">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ManagerCloseTerminal"/>
-        <response name="error" type="view" value="ManagerCloseTerminal"/>
+    
+    <request-map uri="GetFormattedProductFeaturePrice">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="getFormattedProductFeaturePrice"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="CloseTerminal">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="closeTerminal"/>
-        <response name="success" type="view" value="Manager"/>
-        <response name="error" type="view" value="ManagerCloseTerminal"/>
+    
+    <request-map uri="AddToCart">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="addCartItem"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ManagerVoidOrder">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ManagerVoidOrder"/>
-        <response name="error" type="view" value="ManagerVoidOrder"/>
+    
+    <request-map uri="SetPartyToCart">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="setPartyToCart"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="VoidOrder">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="voidOrder"/>
-        <response name="success" type="view" value="Manager"/>
-        <response name="error" type="view" value="ManagerVoidOrder"/>
+    
+    <request-map uri="GetShipMethods">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="getShipMethods"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="Shutdown">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="shutdown"/>
-        <response name="success" type="request" value="Logout"/>
-        <response name="error" type="view" value="Login"/>
+    
+    <request-map uri="SetShipMethod">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="setShipMethod"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ManagerPaidOutAndIn">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ManagerPaidOutAndIn"/>
-        <response name="error" type="view" value="ManagerPaidOutAndIn"/>
+    
+    <request-map uri="UpdateCartItem">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="updateCartItem"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="PaidOutAndIn">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="paidOutAndIn"/>
-        <response name="success" type="view" value="Manager"/>
-        <response name="error" type="view" value="ManagerPaidOutAndIn"/>
+    
+    <request-map uri="DeleteCartItem">
+        <security https="false" auth="false"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="deleteCartItem"/>
+        <response name="success"  type="request" value="json"/>
+        <response name="error"  type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ManagerModifyPrice">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ManagerModifyPrice"/>
-        <response name="error" type="view" value="ManagerModifyPrice"/>
+    
+    <request-map uri="FindProducts">
+        <security https="false" auth="true"/>
+        <event type="service" invoke="findProducts"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="ModifyPrice">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="modifyPrice"/>
-        <response name="success" type="view" value="Manager"/>
-        <response name="error" type="view" value="ManagerModifyPrice"/>
+    
+    <request-map uri="FindParties">
+        <security https="false" auth="true"/>
+        <event type="service" invoke="findParties"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="AddPayCash">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPayCash"/>
-        <response name="error" type="view" value="AddPayCash"/>
+    
+    <request-map uri="RemoveSalesRep">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="removeSalesRep"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    
+    <request-map uri="AddSalesRep">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CartEvents.xml" invoke="addSalesRep"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
+  
     <request-map uri="PayCash">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payCash"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="AddPayCash"/>
-    </request-map>
-
-    <request-map uri="AddPayCheck">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPayCheck"/>
-        <response name="error" type="view" value="AddPayCheck"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    
     <request-map uri="PayCheck">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payCheck"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="AddPayCheck"/>
-    </request-map>
-
-    <request-map uri="AddPayGiftCard">
         <security https="false" auth="true"/>
-        <response name="success" type="view" value="AddPayGiftCard"/>
-        <response name="error" type="view" value="AddPayGiftCard"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payCheck"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    
     <request-map uri="PayGiftCard">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payGiftCard"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="AddPayGiftCard"/>
-    </request-map>
-
-    <request-map uri="AddPayCreditCard">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPayCreditCard"/>
-        <response name="error" type="view" value="AddPayCreditCard"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    
     <request-map uri="PayCreditCard">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payCredit"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="AddPayCreditCard"/>
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payCreditCard"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="PayFinish">
-        <security https="true" auth="true"/>
-        <event type="java" path="org.ofbiz.webpos.WebPosEvents" invoke="completeSale"/>
-        <response name="success" type="view" value="main"/>
+    
+    <request-map uri="OpenTerminal">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="openTerminal"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="AddPaySetRef">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPaySetRef"/>
-        <response name="error" type="view" value="AddPaySetRef"/>
+    
+    <request-map uri="CloseTerminal">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="closeTerminal"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="PaySetRef">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="setRefNum"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="AddPaySetRef"/>
+    
+    <request-map uri="PromoCode">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PromoEvents.xml" invoke="addPromoCode"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="AddClearPayment">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ClearPayment"/>
-        <response name="error" type="view" value="ClearPayment"/>
+    
+    <request-map uri="VoidOrder">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="voidOrder"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    
+    <request-map uri="ModifyPrice">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="modifyPrice"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
+    
+    <request-map uri="PaidOutAndIn">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml" invoke="paidOutAndIn"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
+    
+    <request-map uri="PayFinish">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="payFinish"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
+    
     <request-map uri="ClearPayment">
-        <security https="true" auth="true"/>
+        <security https="false" auth="true"/>
         <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="clearPayment"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="ClearPayment"/>
-    </request-map>
-
-    <request-map uri="PayClearAll">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml" invoke="clearAllPayments"/>
-        <response name="success" type="view" value="Payment"/>
-        <response name="error" type="view" value="Payment"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="AddPromoCode">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPromoCode"/>
-        <response name="error" type="view" value="AddPromoCode"/>
+    
+    <request-map uri="CreateUpdateAddress">
+        <security https="false" auth="true"/>
+        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/CustomerEvents.xml" invoke="createUpdateAddress"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
-    <request-map uri="PromoCode">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://webpos/script/org/ofbiz/webpos/event/PromoEvents.xml" invoke="addPromoCode"/>
-        <response name="success" type="view" value="Promo"/>
-        <response name="error" type="view" value="AddPromoCode"/>
+    
+    <request-map uri="EditAddress">
+        <security https="false" auth="true"/>
+        <event type="groovy" path="component://webpos/webapp/webpos/WEB-INF/actions/customer/" invoke="EditAddress.groovy"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
     </request-map>
-
+    <!-- end of Ajax requests -->
+    
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
+    <view-map name="Error" type="screen" page="component://webpos/widget/WebPosScreens.xml#Main"/>
     <view-map name="main" type="screen" page="component://webpos/widget/WebPosScreens.xml#Main"/>
     <view-map name="login" type="screen" page="component://webpos/widget/CommonScreens.xml#Login"/>
     <view-map name="Login" type="screen" page="component://webpos/widget/CommonScreens.xml#Login"/>
     <view-map name="RequirePasswordChange" type="screen" page="component://webpos/widget/CommonScreens.xml#RequirePasswordChange"/>
+    <view-map name="ListLocales" type="screen" page="component://common/widget/LookupScreens.xml#ListLocales"/>
+    <view-map name="ListTimezones" type="screen" page="component://common/widget/LookupScreens.xml#ListTimezones"/>
+    <view-map name="ListVisualThemes" type="screen" page="component://common/widget/LookupScreens.xml#ListVisualThemes"/>
+    <view-map name="help" type="screen" page="component://common/widget/CommonScreens.xml#help"/>
+    <view-map name="showHelp" type="screen" page="component://common/widget/HelpScreens.xml#ShowHelp"/>
+    
     <view-map name="Manager" type="screen" page="component://webpos/widget/WebPosScreens.xml#Manager"/>
     <view-map name="Payment" type="screen" page="component://webpos/widget/WebPosScreens.xml#Payment"/>
-    <view-map name="Promo" type="screen" page="component://webpos/widget/WebPosScreens.xml#Promo"/>
-    <view-map name="SearchProducts" type="screen" page="component://webpos/widget/WebPosScreens.xml#SearchProducts"/>
-    <view-map name="ShowCart" type="screen" page="component://webpos/widget/WebPosScreens.xml#ShowCart"/>
-
-    <!-- Manager view mappings -->
-    <view-map name="ManagerOpenTerminal" type="screen" page="component://webpos/widget/ManagerScreens.xml#OpenTerminal"/>
-    <view-map name="ManagerCloseTerminal" type="screen" page="component://webpos/widget/ManagerScreens.xml#CloseTerminal"/>
-    <view-map name="ManagerVoidOrder" type="screen" page="component://webpos/widget/ManagerScreens.xml#VoidOrder"/>
-    <view-map name="ManagerPaidOutAndIn" type="screen" page="component://webpos/widget/ManagerScreens.xml#PaidOutAndIn"/>
-    <view-map name="ManagerModifyPrice" type="screen" page="component://webpos/widget/ManagerScreens.xml#ModifyPrice"/>
-
-    <!-- Payment view mappings -->
-    <view-map name="AddPayCash" type="screen" page="component://webpos/widget/PaymentScreens.xml#PayCash"/>
-    <view-map name="AddPayCheck" type="screen" page="component://webpos/widget/PaymentScreens.xml#PayCheck"/>
-    <view-map name="AddPayGiftCard" type="screen" page="component://webpos/widget/PaymentScreens.xml#PayGiftCard"/>
-    <view-map name="AddPayCreditCard" type="screen" page="component://webpos/widget/PaymentScreens.xml#PayCreditCard"/>
-    <view-map name="AddPaySetRef" type="screen" page="component://webpos/widget/PaymentScreens.xml#PaySetRef"/>
-    <view-map name="ClearPayment" type="screen" page="component://webpos/widget/PaymentScreens.xml#ClearPayment"/>
-
-    <!-- Promo view mappings -->
-    <view-map name="AddPromoCode" type="screen" page="component://webpos/widget/PromoScreens.xml#PromoCode"/>
+    <view-map name="ShowCart" type="screen" page="component://webpos/widget/CartScreens.xml#ShowCart"/>
+    <view-map name="ShowCartItemSelected" type="screen" page="component://webpos/widget/CartScreens.xml#ShowCartItemSelected"/>
+    <view-map name="CustomerAddress" type="screen" page="component://webpos/widget/SearchScreens.xml#CustomerAddress"/>
+    <view-map name="EditAddress" type="screen" page="component://webpos/widget/CustomerScreens.xml#EditAddress"/>
+    <view-map name="SearchSalesRepsList" type="screen" page="component://webpos/widget/SearchScreens.xml#SearchSalesRepsList"/>
+    <view-map name="SideDeepCategory" type="screen" page="component://webpos/widget/CatalogScreens.xml#SideDeepCategory"/>
+    <view-map name="CategoryDetail" type="screen" page="component://webpos/widget/CatalogScreens.xml#CategoryDetail"/>
     <!-- End of View Mappings -->
 </site-conf>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml Sun May 22 13:11:17 2011
@@ -59,7 +59,7 @@
         </init-param>
         <init-param>
             <param-name>allowedPaths</param-name>
-            <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+            <param-value>/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
             <param-name>errorCode</param-name>
@@ -78,7 +78,7 @@
     <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
     <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
-
+    
     <!-- this listener will save any abandoned cart info -->
     <listener><listener-class>org.ofbiz.order.shoppingcart.CartEventListener</listener-class></listener>
     <!-- this listener will clean up info -->
@@ -91,10 +91,21 @@
         <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+        <servlet-name>CatalogUrlServlet</servlet-name>
+        <display-name>CatalogUrlServlet</display-name>
+        <description>Catalog (Category/Product) URL Servlet</description>
+        <servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
     <servlet-mapping>
         <servlet-name>ControlServlet</servlet-name>
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>CatalogUrlServlet</servlet-name>
+        <url-pattern>/products/*</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>60</session-timeout>
     </session-config>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl Sun May 22 13:11:17 2011
@@ -1,122 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<table class="tableButtons" cellspacing="5">
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a>
-        </td>
-        <td>
-            &nbsp;
-        </td>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true>
-                <a href="<@ofbizUrl>Manager</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonManager}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonManager}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>Promo</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPromo}</a>
-        </td>
-        <td>
-            &nbsp;
-        </td>
-        <td>
-            <#if (shoppingCartSize > 0)>
-                <a href="<@ofbizUrl>Payment</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayment}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPayment}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <#if (shoppingCartSize > 0)>
-                <a href="javascript:document.cartform.submit();" class="posButton">${uiLabelMap.WebPosRecalculateCart}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosRecalculateCart}</span>
-            </#if>
-        </td>
-        <td>
-            <#if (shoppingCartSize > 0)>
-                <a href="<@ofbizUrl>EmptyCart</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosEmptyCart}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosEmptyCart}</span>
-            </#if>
-        </td>
-        <td>
-            <#if (shoppingCartSize > 0)>
-                <a href="javascript:removeSelected();" class="posButton">${uiLabelMap.WebPosRemoveSelected}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosRemoveSelected}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-1001&amp;quantity=1</@ofbizUrl>" class="posButton">NAN GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-5005&amp;quantity=1</@ofbizUrl>" class="posButton">PURPLE GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-2644&amp;quantity=1</@ofbizUrl>" class="posButton">ROUND GIZMO</a>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-2002&amp;quantity=1</@ofbizUrl>" class="posButton">SQUARE GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-7000&amp;quantity=1</@ofbizUrl>" class="posButton">MASSIVE GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=WG-5569&amp;quantity=1</@ofbizUrl>" class="posButton">TINY WIDGET</a>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-1004&amp;quantity=1</@ofbizUrl>" class="posButton">RAINBOW GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-1005&amp;quantity=1</@ofbizUrl>" class="posButton">NIT GIZMO</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=GZ-8544&amp;quantity=1</@ofbizUrl>" class="posButton">BIG GIZMO</a>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddItem?add_product_id=WG-1111&amp;quantity=1</@ofbizUrl>" class="posButton">MICRO WIDGET</a>
-        </td>
-        <td>
-            &nbsp;
-        </td>
-        <td>
-            <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-                <a href="<@ofbizUrl>Logout</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonLogout}</a>
-            <#else/>
-                <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonLogin}</a>
-            </#if>
-        </td>
-    </tr>
-</table>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Manager.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Manager.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Manager.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Manager.ftl Sun May 22 13:11:17 2011
@@ -1,78 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<table class="tableButtons" cellspacing="5">
-    <tr>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == false>
-                <a href="<@ofbizUrl>ManagerOpenTerminal</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonOpenTerminal}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonOpenTerminal}</span>
-            </#if>
-        </td>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true>
-                <a href="<@ofbizUrl>ManagerCloseTerminal</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonCloseTerminal}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonCloseTerminal}</span>
-            </#if>
-        </td>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true>
-                <a href="<@ofbizUrl>ManagerVoidOrder</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonVoidOrder}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonVoidOrder}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true>
-                <a href="<@ofbizUrl>Shutdown</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonShutdown}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonShutdown}</span>
-            </#if>
-        </td>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true>
-                <a href="<@ofbizUrl>ManagerPaidOutAndIn?type=IN</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPaidIn}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPaidIn}</span>
-            </#if>
-        </td>
-        <td>
-            <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true>
-                <a href="<@ofbizUrl>ManagerPaidOutAndIn?type=OUT</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPaidOut}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPaidOut}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>ManagerModifyPrice</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonModifyPrice}</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a>
-        </td>
-        <td>
-            &nbsp;
-        </td>
-    </tr>
-</table>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl Sun May 22 13:11:17 2011
@@ -1,64 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div class="screenlet-body">
-    <table class="tableButtons" cellspacing="5">
-        <tr>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">1</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">2</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">3</a>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">4</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">5</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">6</a>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">7</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">8</a>
-            </td>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">9</a>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">0</a>
-            </td>
-            <td colspan="2">
-                <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonReturn}</a>
-            </td>
-        </tr>
-    </table>
-</div>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl Sun May 22 13:11:17 2011
@@ -1,81 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<table class="tableButtons" cellspacing="5">
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddPayCash</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCash}</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddPayCheck</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCheck}</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>AddPayGiftCard</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayGiftCard}</a>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="<@ofbizUrl>AddPayCreditCard</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCreditCard}</a>
-        </td>
-        <td>
-            <#if (totalDue = 0.00)>
-                <a href="<@ofbizUrl>PayFinish</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayFinish}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPayFinish}</span>
-            </#if>
-        </td>
-        <td>
-            <#if (totalPayments > 0.00)>
-                <a href="<@ofbizUrl>AddPaySetRef</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPaySetRef}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPaySetRef}</span>
-            </#if>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <#if (totalPayments > 0.00)>
-                <a href="<@ofbizUrl>AddClearPayment</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayClear}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPayClear}</span>
-            </#if>
-        </td>
-        <td>
-            <#if (totalPayments > 0.00)>
-                <a href="<@ofbizUrl>PayClearAll</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayClearAll}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPayClearAll}</span>
-            </#if>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a>
-        </td>
-    </tr>
-</table>
-<#if cart?has_content>
-    <#if (totalDue > 0.00)>
-        <div class="errorPosMessage">
-          <p>${uiLabelMap.WebPosTransactionTotalDue} <@ofbizCurrency amount=totalDue isoCode=cart.getCurrency()/></p>
-        </div>
-    <#else>
-        <div class="errorPosMessage">
-          <p>${uiLabelMap.WebPosCompleteSale}</p>
-        </div>
-    </#if>
-</#if>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl Sun May 22 13:11:17 2011
@@ -1,36 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<table class="tableButtons" cellspacing="5">
-    <tr>
-        <td>
-            <#if isOpen?default(false) == true>
-                <a href="<@ofbizUrl>AddPromoCode</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPromoCode}</a>
-            <#else>
-                <span class="disabled">${uiLabelMap.WebPosButtonPromoCode}</span>
-            </#if>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a>
-        </td>
-        <td>
-            <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">&nbsp;</a>
-        </td>
-    </tr>
-</table>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl?rev=1125951&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl (added)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl Sun May 22 13:11:17 2011
@@ -0,0 +1,77 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div id="chooseVariant" style="display:none">
+  <form method="post" action="javascript:void(0);" id="ChooseVariantForm">
+    <table border="0" width="100%">
+      <tr>
+        <td colspan="2">&nbsp;</td>
+      </tr>
+      <tr>
+        <td width="100%" align="center" colspan="2">
+          <div id="features" style="display: none"/>
+        </td>
+      </tr>
+      <tr>
+        <td width="100%" align="center" colspan="2">&nbsp;</td>
+      </tr>
+      <tr>
+        <td width="100%" align="center" colspan="2">
+          <b>
+            <div id="variantProductDescription"></div>
+            <div id="variantProductPrice"></div>
+          </b>
+        </td>
+      </tr>
+      <tr id="addAmount" style="display:none">
+        <td width="50%" align="right">
+          ${uiLabelMap.CommonAmount}
+        </td>
+        <td width="50%" align="left">
+          <input type="text" id="amount" name="add_amount" size="5" value=""/>
+        </td>
+      </tr>
+      <tr>
+        <td width="50%" align="right">
+          ${uiLabelMap.CommonQuantity}
+        </td>
+        <td width="50%" align="left">
+          <input type="hidden" id="variantProductId" name="add_product_id"/>
+          <input type="hidden" id="variant" name="variant" value="Y"/>
+          <input type="text" id="variantQuantity" name="variantQuantity" size="5" maxlength="5" value=""/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">&nbsp;</td>
+      </tr>
+      <tr>
+        <td colspan="2" align="center">
+          <input type="submit" value="${uiLabelMap.CommonConfirm}" id="chooseVariantConfirm"/>
+          <input type="submit" value="${uiLabelMap.CommonCancel}" id="chooseVariantCancel"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <div class="errorPosMessage">
+            <span id="chooseVariantFormServerError"/>
+          </div>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl Sun May 22 13:11:17 2011
@@ -1,57 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div id="microCart">
-    <#if (shoppingCartSize > 0)>
-      <table class="basic-table" cellspacing="1" cellpadding="2">
-        <tr>
-          <td><b>${uiLabelMap.WebPosTransactionId}</b></td>
-          <td><b>${transactionId?default("NA")}</b></td>
-          <td><b>${(paymentCash.get("description", locale))?if_exists}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></b></td>
-          <td><b>${uiLabelMap.OrderSalesTax}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></b></td>
-        </tr>
-        <tr>
-          <td><b>${uiLabelMap.WebPosDrawer}</b></td>
-          <td><b>${drawerNumber?default(0)}</b></td>
-          <td><b>${(paymentCheck.get("description", locale))?if_exists}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></b></td>
-          <td><b>${uiLabelMap.WebPosCartTotal}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></b></td>
-        </tr>
-        <tr>
-          <td><b>${uiLabelMap.WebPosEmployee}</b></td>
-          <td><b>${userLoginId?default("NA")}</b></td>
-          <td><b>${(paymentGift.get("description", locale))?if_exists}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></b></td>
-          <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-          <td><b>${uiLabelMap.WebPosTransactionDate}</b></td>
-          <td><b>${transactionDate?default("NA")}</b></td>
-          <td><b>${(paymentCredit.get("description", locale))?if_exists}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></b></td>
-          <td><b>${uiLabelMap.WebPosTransactionTotalDue}</b></td>
-          <td align="right"><b><@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/></b></td>
-        </tr>
-      </table>
-    <#else>
-      &nbsp;
-    </#if>
-</div>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Sun May 22 13:11:17 2011
@@ -16,111 +16,135 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<script language="JavaScript" type="text/javascript">
-    function toggle(e) {
-        e.checked = !e.checked;
-    }
-
-    function checkToggle(e) {
-        var cform = document.cartform;
-        if (e.checked) {
-            var len = cform.elements.length;
-            var allchecked = true;
-            for (var i = 0; i < len; i++) {
-                var element = cform.elements[i];
-                if (element.name == "selectedItem" && !element.checked) {
-                    allchecked = false;
-                }
-                cform.selectAll.checked = allchecked;
-            }
-        } else {
-            cform.selectAll.checked = false;
-        }
-    }
-
-    function toggleAll(e) {
-        var cform = document.cartform;
-        var len = cform.elements.length;
-        for (var i = 0; i < len; i++) {
-            var element = cform.elements[i];
-            if (element.name == "selectedItem" && element.checked != e.checked) {
-                toggle(element);
-            }
-        }
-    }
+<input type="hidden" id="selectedItem" name="selectedItem" value="${selectedItem?default(0)}"/>
+<input type="hidden" id="cartSize" name="cartSize" value="${shoppingCartSize?default(0)}"/>
 
-    function removeSelected() {
-        var cform = document.cartform;
-        cform.removeSelected.value = true;
-        cform.submit();
-    }
-</script>
-<div class="pos-cart-scroll">
-    <table class="basic-table" cellspacing="0">
-        <tr class="header-row">
-            <td nowrap="nowrap">&nbsp;</td>
-            <td nowrap="nowrap"><b>${uiLabelMap.OrderProduct}</b></td>
-            <td nowrap="nowrap">&nbsp;</td>
-            <td nowrap="nowrap" align="center"><b>${uiLabelMap.CommonQuantity}</b></td>
-            <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td>
-            <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td>
-            <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td>
-            <td nowrap="nowrap" align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);" /></td>
+<#if (shoppingCartSize > 0)>
+<div id="CartHeader">
+  <table class="basic-table" cellspacing="1" cellpadding="1">
+    <input type="hidden" id="totalDue" value="${totalDue}"/>
+    <input type="hidden" id="totalCash" value="${cashAmount}"/>
+    <input type="hidden" id="totalCheck" value="${checkAmount}"/>
+    <input type="hidden" id="totalGift" value="${giftAmount}"/>
+    <input type="hidden" id="totalCredit" value="${creditAmount}"/>
+    <input type="hidden" id="totalDueFormatted" value="<@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/>"/>
+    <input type="hidden" id="totalCashFormatted" value="<@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/>"/>
+    <input type="hidden" id="totalCheckFormatted" value="<@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/>"/>
+    <input type="hidden" id="totalGiftFormatted" value="<@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/>"/>
+    <input type="hidden" id="totalCreditFormatted" value="<@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/>"/>
+    <tr>
+      <td>${uiLabelMap.WebPosTransactionId}</td>
+      <td><b>${transactionId?default("NA")}</b></td>
+      <td>${(paymentCash.get("description", locale))?if_exists}</td>
+      <td align="right"><b><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTotalItemSubTotal}</td>
+      <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></b></td>
+    </tr>
+    <tr>
+      <td>${uiLabelMap.WebPosDrawer}</td>
+      <td><b>${drawerNumber?default(0)}</b></td>
+      <td>${(paymentCheck.get("description", locale))?if_exists}</td>
+      <td align="right"><b><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTotalPromotions}</td>
+      <td align="right"><b><@ofbizCurrency amount=shoppingCart.getOrderOtherAdjustmentTotal() isoCode=shoppingCart.getCurrency()/></b></td>
+    </tr>
+    <tr>
+      <td>${uiLabelMap.WebPosTerminal}</td>
+      <td><b><#if isOpen>${uiLabelMap.WebPosTerminalOpen}<#else>${uiLabelMap.WebPosTerminalClose}</#if></b></td>
+      <td>${(paymentGift.get("description", locale))?if_exists}</td>
+      <td align="right"><b><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTotalSalesTax}</td>
+      <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></b></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td>${(paymentCredit.get("description", locale))?if_exists}</td>
+      <td align="right"><b><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTotalShipping}</td>
+      <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/></b></td>
+    </tr>
+    <tr>
+      <td>${uiLabelMap.WebPosTransactionTotalDue}</td>
+      <td align="right"><b><@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTransactionTotalPay}</td>
+      <td align="right"><b><@ofbizCurrency amount=totalPay isoCode=shoppingCart.getCurrency()/></b></td>
+      <td>${uiLabelMap.WebPosTotal}</td>
+      <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></b></td>
+    </tr>
+  </table>
+</div>
+</#if>
+<div id="Cart">
+  <table class="basic-table" cellspacing="0">
+    <thead class="CartHead">
+      <tr class="header-row">
+        <td nowrap><b>${uiLabelMap.OrderProduct}</b></td>
+        <td nowrap align="center"><b>${uiLabelMap.CommonQuantity}</b></td>
+        <td nowrap align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td>
+        <td nowrap align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td>
+        <td nowrap align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td>
+        <td nowrap align="center"><b>${uiLabelMap.CommonRemove}</b></td>
+      </tr>
+    </thead>
+    <#if (shoppingCartSize > 0)>
+    <tbody class="CartBody">
+      <#-- set initial row color -->
+      <#assign alt_row = false>
+      <#list shoppingCart.items() as cartLine>
+        <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
+        <tr id="cartLine${cartLineIndex}" <#if alt_row>class="pos-cart-even"<#else>class="pos-cart-odd"</#if>>
+          <td>
+            <div>
+              <#if cartLine.getProductId()?exists>
+                <#-- product item -->
+                <#-- start code to display a small image of the product -->
+                <#if cartLine.getParentProductId()?exists>
+                  <#assign parentProductId = cartLine.getParentProductId()/>
+                <#else>
+                  <#assign parentProductId = cartLine.getProductId()/>
+                </#if>
+                <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+                <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+                <#if smallImageUrl?string?has_content>
+                  <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/>
+                </#if>
+                <#-- end code to display a small image of the product -->
+                ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists}
+              <#else>
+                <#-- this is a non-product item -->
+                <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
+              </#if>
+            </div>
+          </td>
+          <td nowrap align="center">
+            ${cartLine.getQuantity()?string.number}
+          </td>
+          <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/></div></td>
+          <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td>
+          <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+          <td nowrap align="center"><a href="javascript:deleteCartItem('${cartLineIndex}');"><img src="/images/mini-trash.png" /></a></td>
         </tr>
-        <#if (shoppingCartSize > 0)>
-            <form method="post" action="<@ofbizUrl>ModifyCart</@ofbizUrl>" name="cartform">
-              <input type="hidden" name="removeSelected" value="false" />
-                <#assign itemsFromList = false>
-                <#-- set initial row color -->
-                <#assign alt_row = false>
-                <#list shoppingCart.items() as cartLine>
-                  <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
-                  <#-- show adjustment info -->
-                  <#list cartLine.getAdjustments() as cartLineAdjustment>
-                    <!-- cart line ${cartLineIndex} adjustment: ${cartLineAdjustment} -->
-                  </#list>
-                  <tr <#if alt_row>class="alternate-row pos-cart-hover-bar"<#else>class="pos-cart-hover-bar"</#if>>
-                    <td>&nbsp;</td>
-                    <td>
-                        <div>
-                          <#if cartLine.getProductId()?exists>
-                            <#-- product item -->
-                            <#-- start code to display a small image of the product -->
-                            <#if cartLine.getParentProductId()?exists>
-                              <#assign parentProductId = cartLine.getParentProductId()/>
-                            <#else>
-                              <#assign parentProductId = cartLine.getProductId()/>
-                            </#if>
-                            <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
-                            <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
-                            <#if smallImageUrl?string?has_content>
-                                <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0" alt="" />
-                            </#if>
-                            <#-- end code to display a small image of the product -->
-                            ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists}
-                          <#else>
-                            <#-- this is a non-product item -->
-                            <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
-                          </#if>
-                        </div>
-                    </td>
-                    <td nowrap="nowrap" align="right">
-                        &nbsp;
-                    </td>
-                    <td nowrap="nowrap" align="center">
-                      <div>
-                        <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" />
-                      </div>
-                    </td>
-                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap="nowrap" align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);" /><#else>&nbsp;</#if></div></td>
-                  </tr>
-                  <#-- toggle the row color -->
-                  <#assign alt_row = !alt_row>
-                </#list>
-            </form>
-        </#if>
-    </table>
-</div>
\ No newline at end of file
+        <#-- toggle the row color -->
+        <#assign alt_row = !alt_row>
+      </#list>
+    <tbody>
+    <tfoot class="CartFoot">
+      <tr>
+        <td colspan="6"><b><hr/></b></td>
+      </tr>
+      <tr id="CartTotal">
+        <td align="left"><b>${shoppingCartSize?default(0)}</b></td>
+        <td align="center"><b>${totalQuantity?default(0)}</b></td>
+        <td align="right">&nbsp;</td>
+        <td align="right">&nbsp;</td>
+        <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></b></td>
+        <td align="right">&nbsp;</td>
+      </tr>
+    <tfoot>
+    </#if>
+  </table>
+</div>
+<script language="JavaScript" type="text/javascript">
+  selectCartItem();
+</script>

Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl?rev=1125951&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl (added)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl Sun May 22 13:11:17 2011
@@ -0,0 +1,75 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#assign focusOnQuantity = requestParameters.focusOnQuantity?if_exists/>
+<#assign cartLineIndex = requestParameters.cartLineIndex?if_exists/>
+<#if cartLineIndex?exists && cartLineIndex?has_content>
+  <#assign isInteger = Static["org.ofbiz.base.util.UtilValidate"].isInteger(cartLineIndex)>
+  <#if isInteger>
+    <#assign idx = cartLineIndex?number>
+    <#assign cartLine = shoppingCart.findCartItem(idx)?if_exists>
+    <#if cartLine?exists && cartLine?has_content>
+      <#if cartLine.getProductId()?exists>
+        <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+        <#if !smallImageUrl?string?has_content>
+          <#assign smallImageUrl = "/images/defaultImage.jpg">
+        </#if>
+        <#if smallImageUrl?string?has_content>
+        <div id="CartItemSelectedLeft">
+          <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/>
+        </div>
+        </#if>
+        <div id="CartItemSelectedRight">
+          <#if cartLine.getProductId()?has_content>
+            ${cartLine.getProductId()}
+            <br/>
+          </#if>
+          <#if cartLine.getName()?has_content>
+            ${cartLine.getName()}
+          <#else>
+            <#if cartLine.getDescription()?has_content>
+            ${cartLine.getDescription()}
+            </#if>
+          </#if>
+      <#else>
+        <div id="CartItemSelectedRight">
+          <#-- this is a non-product item -->
+          <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
+      </#if>
+      <br/>
+      <b>${uiLabelMap.CommonQuantity}</b>&nbsp;
+      <input type="text" id="itemQuantity" name="itemQuantity" value="${cartLine.getQuantity()}" size="5" maxlength="5"/>
+      <a href="javascript:void(0);" id="incrementQuantity"><img src="/images/expand.gif"></a>
+      <a href="javascript:void(0);" id="decrementQuantity"><img src="/images/collapse.gif"></a>
+      <br/>
+      <#if isManager?default(false)>
+        <b>${uiLabelMap.WebPosManagerModifyPriceNewPrice}</b>&nbsp;
+        <input type="hidden" id="cartLineIdx" name="cartLineIdx" value="${idx}"/>
+        <input type="text" id="modifyPrice" name="modifyPrice" value="${cartLine.getDisplayPrice()}" size="8"/>
+        <br/>
+      </#if>
+      <input type="hidden" id="lineIndex" name="lineIndex" value="${cartLineIndex}"/>
+      <a id="updateCartItem" name="updateCartItem" href="javascript:updateCartItem();" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+      <a id="deleteCartItem" name="deleteCartItem" href="javascript:deleteCartItem('${cartLineIndex}');" class="buttontext">${uiLabelMap.CommonDelete}</a>
+    </div>
+    <script language="JavaScript" type="text/javascript">
+      cartItemSelectedEvents('${focusOnQuantity}');
+    </script>
+    </#if>
+  </#if>
+</#if>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1125951&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (added)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Sun May 22 13:11:17 2011
@@ -0,0 +1,68 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if productCategoryMembers?exists>
+<table>
+  <#assign numButton = 1/>
+  <#assign cell = 0/>
+  <tr>    
+  <#list productCategoryMembers as productCategoryMember>
+  <#assign product = productCategoryMember.getRelatedOne("Product")?if_exists>
+  <#if product?exists && product?has_content>
+    <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "SMALL_IMAGE_URL", locale, dispatcher)?if_exists />
+    <#if !smallImageUrl?string?has_content>
+      <#assign smallImageUrl = "/images/defaultImage.jpg">
+    </#if>
+    <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher)?if_exists />
+    <#if !productName?string?has_content>
+      <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "DESCRIPTION", locale, dispatcher)?if_exists />
+    </#if>
+    <#assign addItemLink = "javascript:addItem('" + product.productId + "', '1', 'Y');">
+    <td>
+      <ol id="posButton">
+        <#assign button = "button" + numButton>
+        <li id="${button}" class="notSelectedButton">
+          <#if smallImageUrl?string?has_content>
+            <a href="${addItemLink}">
+              <img src="<@ofbizContentUrl>${smallImageUrl}</@ofbizContentUrl>" align="center" width="60px" height="60px" border="0"/>
+            </a>
+          </#if>
+        </li>
+      </ol>
+      <div class="linkButton">
+        <a href="${addItemLink}">
+          <b>${productName}</b>
+        </a>
+      </div>
+    <td>
+  </#if>
+  <#assign numButton = numButton + 1/>
+  <#assign cell = cell + 1/>
+  <#if cell == 3>
+  </tr>
+  <#assign cell = 0/>
+  </#if>
+  </#list>
+  <#if cell != 3>
+  </tr>
+  </#if>
+</table>
+<script language="JavaScript" type="text/javascript">
+  showSelectedButton();
+</script>
+</#if>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain