Merge pull request #13 from raboof/fix-adding-products

Fix price validation logic

Author: meneerhenk

plugins/market.py

@@ -141,7 +141,7 @@ def saveprice(self, text):
             price = float(text)
             if not 0 < price < 1000:
                 return self.messageandbuttons(
-                    "saveprice", "numbers", "Price should be between 0.01 and 999.99"
+                    "saveprice", "numbers", "Price should be between 0 and 1000"
                 )
             self.newprodprice = price
             self.products[self.priceprod]["price"] = price
@@ -202,11 +202,11 @@ def addproductprice(self, text):
             return self.master.callhook("abort", None)
         try:
             price = float(text)
-            if 0.01 < price < 999.99:
+            if not 0 < price < 1000:
                 return self.messageandbuttons(
                     "addproductprice",
                     "numbers",
-                    "Price should be between 0.01 and 999.99",
+                    "Price should be between 0 and 1000",
                 )
             self.newprodprice = price
             self.master.donext(self, "addproductgroup")

plugins/products.py

@@ -143,9 +143,9 @@ def saveprice(self, text):
         try:
             price = float(text)
             print(price)
-            if 0.01 > price < 999.99:
+            if not 0 < price < 1000:
                 return self.messageandbuttons(
-                    "saveprice", "numbers", "Price should be between 0.01 and 999.99"
+                    "saveprice", "numbers", "Price should be between 0 and 1000"
                 )
             self.newprodprice = price
             self.products[self.priceprod]["price"] = self.newprodprice
@@ -206,11 +206,11 @@ def addproductprice(self, text):
             return self.master.callhook("abort", None)
         try:
             price = float(text)
-            if 0 < price < 999.99:
+            if not 0 < price < 1000:
                 return self.messageandbuttons(
                     "addproductprice",
                     "numbers",
-                    "Price should be between 0.01 and 999.99",
+                    "Price should be between 0 and 1000",
                 )
             self.newprodprice = price
             self.master.donext(self, "addproductgroup")