diff options
author | Lennart Weller <lhw@ring0.de> | 2013-03-17 00:43:14 +0100 |
---|---|---|
committer | Lennart Weller <lhw@ring0.de> | 2013-03-17 00:43:14 +0100 |
commit | b9e4dfad131f8678dfd51c7e7ce209ef2a0c6c02 (patch) | |
tree | bdea32e7d5a8679634f57fc202bec27320698155 /src/db.vala | |
parent | e52ef9c8125562cf2afcd0655fc00068e698594d (diff) | |
parent | 88899c833223608e51102d7c7a61afdf62b12d4c (diff) | |
download | serial-barcode-scanner-b9e4dfad131f8678dfd51c7e7ce209ef2a0c6c02.tar.bz2 |
Merge branch 'master' into rest-api
Diffstat (limited to 'src/db.vala')
-rw-r--r-- | src/db.vala | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/db.vala b/src/db.vala index dc1c834..f938cc8 100644 --- a/src/db.vala +++ b/src/db.vala @@ -19,8 +19,8 @@ public struct StockEntry { public string id; public string name; public int amount; - public string memberprice; - public string guestprice; + public Price memberprice; + public Price guestprice; } public struct PriceEntry { @@ -350,16 +350,10 @@ public class Database { statements["stock_status"].column_text(0), statements["stock_status"].column_text(1), statements["stock_status"].column_int(2), - null, - null + statements["stock_status"].column_int(3), + statements["stock_status"].column_int(4) }; - Price mprice = statements["stock_status"].column_int(3); - Price gprice = statements["stock_status"].column_int(4); - - entry.memberprice = @"$mprice"; - entry.guestprice = @"$gprice"; - result.add(entry); } |