summaryrefslogtreecommitdiffstats
path: root/src/database
diff options
context:
space:
mode:
authorSebastian Reichel <sre@ring0.de>2013-03-26 16:14:34 +0100
committerSebastian Reichel <sre@ring0.de>2013-03-26 16:14:34 +0100
commitc7330792abfd7265faf4047039dd9bf5a24e5633 (patch)
treea45b7ddc9e512172291928515dd327f3f382ecff /src/database
parent7bfb48ef84384ff0460f273ea5841fba628d2a46 (diff)
parent88899c833223608e51102d7c7a61afdf62b12d4c (diff)
downloadserial-barcode-scanner-c7330792abfd7265faf4047039dd9bf5a24e5633.tar.bz2
fix merge conflict
Diffstat (limited to 'src/database')
-rw-r--r--src/database/database.vala10
-rw-r--r--src/database/db-interface.vala4
2 files changed, 4 insertions, 10 deletions
diff --git a/src/database/database.vala b/src/database/database.vala
index 640e175..f84d2c5 100644
--- a/src/database/database.vala
+++ b/src/database/database.vala
@@ -265,16 +265,10 @@ public class DataBase : Object {
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 += entry;
}
diff --git a/src/database/db-interface.vala b/src/database/db-interface.vala
index da95eb7..be9ffba 100644
--- a/src/database/db-interface.vala
+++ b/src/database/db-interface.vala
@@ -53,8 +53,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 {