Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 22 insertions, 0 deletions

diff --git a/data/templates/products/restock.html b/data/templates/products/restock.html
new file mode 100644
index 0000000..70926c5
--- /dev/null
+++ b/data/templates/products/restock.html
@@ -0,0 +1,22 @@
+<h2>Restock: {{{NAME}}}</h2>
+
+<div id="restock-successful" class="alert" style="display: {{{RESTOCK.OK}}};">
+	<p>Successfully restocked:</p>
+
+	<table class="table table-hover">
+		<tr><th>Name</th><td>{{{NAME}}}</td></tr>
+		<tr><th>Amount</th><td>{{{AMOUNT}}}</td></tr>
+		<tr><th>Price</th><td>{{{PRICE}}}</td></tr>
+		<tr><th>Supplier</th><td>{{{SUPPLIER}}}</td></tr>
+		<tr><th>Best Before Date</th><td>{{{BESTBEFORE}}}</td></tr>
+	</table>
+</div>
+
+<div id="restock-failed" class="alert alert-error" style="display: {{{RESTOCK.FAIL}}};">
+	<h4>Error</h4>
+	Restocking <b>{{{NAME}}}</b> failed. Please make sure you
+	have sufficient permissions and gave valid values
+	for amount and price.
+</div>
+
+<a href=".">Back to {{{NAME}}}</a>