svn commit: r428403 - in /incubator/ofbiz/trunk/applications/pos: config/XuiLabels.properties config/XuiLabels_fr.properties screens/default/dialog/error/nosales.xml src/org/ofbiz/pos/PosTransaction.java src/org/ofbiz/pos/event/MenuEvents.java

Author: jleroux
Date: Thu Aug  3 06:52:17 2006
New Revision: 428403

URL: http://svn.apache.org/viewvc?rev=428403&view=rev
Log:
Manages when no sales where saved

Added:
    incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml   (with props)
Modified:
    incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties
    incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties
    incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java
    incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java

Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties?rev=428403&r1=428402&r2=428403&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties Thu Aug  3 06:52:17 2006
@@ -73,6 +73,7 @@
 UNKNOWN_CARD_TYPE=UNKNOWN CARD TYPE
 VOID_ITEM=VOID ITEM
 VOID_SALE=VOID SALE
+no_sales=No sales saved
 order_not_found=ORDER NOT FOUND
 problems_reading_card=PROBLEMS READING SWIPED CARD
 product_not_found=PRODUCT NOT FOUND

Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties?rev=428403&r1=428402&r2=428403&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties (original)
+++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties Thu Aug  3 06:52:17 2006
@@ -74,6 +74,7 @@
 UNKNOWN_CARD_TYPE=Type de carte inconnu
 VOID_ITEM=Annuler l'article
 VOID_SALE=Annuler la vente
+no_sales=Aucune vente sauv\u00E9e
 order_not_found=N\u00B0 de transaction inconnu !
 problems_reading_card=Probl\u00E8me lors de la lecture de la carte
 product_not_found=Produit inconnu !

Added: incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml?rev=428403&view=auto
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml (added)
+++ incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml Thu Aug  3 06:52:17 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2001-2006 The Apache Software Foundation
+    
+    Licensed 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.
+-->
+<XPage>
+    <Components>
+        <Panel name="errorPanel" x="0" y="0" w="400" h="200" style="errorpanel" border="0" alignment="Center">
+            <Button w="400" h="200" name="closeBtn" style="error" content="no_sales" alignment="Center"/>
+        </Panel>
+    </Components>
+</XPage>
\ No newline at end of file

Propchange: incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: incubator/ofbiz/trunk/applications/pos/screens/default/dialog/error/nosales.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java?rev=428403&r1=428402&r2=428403&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java Thu Aug  3 06:52:17 2006
@@ -927,6 +927,11 @@
          Debug.log(UtilProperties.getMessage("EcommerceUiLabels","EcommerceNoShoppingListsCreate",locale), module);
         }
 
+        if (0 == shoppingList.size()) {
+            pos.showDialog("dialog/error/nosales");
+            pos.refresh();
+            return;
+        }
         Hashtable salesMap = new Hashtable();
         Iterator i = shoppingList.iterator();
         while (i.hasNext()){

Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=428403&r1=428402&r2=428403&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java (original)
+++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java Thu Aug  3 06:52:17 2006
@@ -361,7 +361,6 @@
 
     public static void loadSale(PosScreen pos) {
         PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession());
-        Input input = pos.getInput();
         trans.loadSale(pos);
     }