Merge remote-tracking branch 'origin/master'

micwallace · Jun 25, 2019 · d9fac87 · d9fac87
2 parents ba07ac7 + a77fda0
commit d9fac87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+### Note: WallacePOS is not longer actively maintained. If you would like to become a maintainer of this project please let me know.
+
 # WallacePOS
 ## An intuitive & modern web based POS system
 ![logo](https://wallacepos.com/images/wallacepos_logo_600.png)

diff --git a/library/installer/schemas/install.sql b/library/installer/schemas/install.sql
@@ -223,7 +223,7 @@ CREATE TABLE IF NOT EXISTS `sale_items` (
   `description` varchar(128) NOT NULL,
   `taxid` varchar(11) NOT NULL,
   `tax` varchar(2048) NOT NULL,
-  `tax_incl` int(1) NOT NULL DEAFULT 1,
+  `tax_incl` int(1) NOT NULL DEFAULT 1,
   `tax_total` decimal(12,2) NOT NULL DEFAULT 0.00,
   `cost` decimal(12,2) NOT NULL DEFAULT 0.00,
   `unit_original` decimal(12,2) NOT NULL DEFAULT 0.00,
@@ -386,4 +386,4 @@ INSERT INTO `tax_rules` (`id`, `data`) VALUES
 (2, '{"name":"GST", "inclusive":true, "mode":"single", "base":[1], "locations":{}, "id":"2"}');
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/library/wpos/models/objects/WposStoredItem.php b/library/wpos/models/objects/WposStoredItem.php
@@ -32,6 +32,7 @@ class WposStoredItem extends stdClass {
     public $description = "";
     public $taxid = 1;
     public $price = "";
+    public $cost = "";
     public $supplierid = 0;
     public $categoryid = 0;
     public $type = "general";