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

11 files changed, 0 insertions, 139 deletions

diff --git a/systemd/Makefile b/systemd/Makefile
deleted file mode 100644
index b4dc1c1..0000000
--- a/systemd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-INSTALLPATH=/lib/systemd/system/
-UDEVPATH=/lib/udev/rules.d/
-SERVICEFILES=$(wildcard *.service)
-TIMERFILES=$(wildcard *.timer)
-RULESFILES=$(wildcard *.timer)
-
-install: ${SERVICEFILES} ${TIMERFILES} ${RULESFILES}
-	@echo Installing systemd files into ${INSTALLPATH}...
-	@mkdir -p ${INSTALLPATH}
-	@$(foreach file,${SERVICEFILES},install -m644 ${file} ${INSTALLPATH}/${file};)
-	@$(foreach file,${TIMERFILES},install -m644 ${file} ${INSTALLPATH}/${file};)
-	@echo Installing udev files into ${UDEVPATH}...
-	@mkdir -p ${UDEVPATH}
-	@$(foreach file,${RULESFILES},install -m644 ${file} ${UDEVPATH}/${file};)
-
-uninstall:
-	@echo Remove systemd files from ${INSTALLPATH}...
-	@$(foreach file,${SERVICEFILES},rm -f ${INSTALLPATH}/${file};)
-	@$(foreach file,${TIMERFILES},rm -f ${INSTALLPATH}/${file};)
-	@echo Remove udev files from ${UDEVPATH}...
-	@$(foreach file,${RULESFILES},rm -f ${UDEVPATH}/${file};)
-
-.PHONY: install uninstall
diff --git a/systemd/shopsystem-input-device.rules b/systemd/shopsystem-input-device.rules
deleted file mode 100644
index 7e6bfa2..0000000
--- a/systemd/shopsystem-input-device.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", ATTRS{idVendor}=="0536", ATTRS{idProduct}=="02e1", MODE="0666", SYMLINK+="barcodescanner" TAG+="systemd", ENV{SYSTEMD_WANTS}="shopsystem-input-device"
diff --git a/systemd/shopsystem-input-device.service b/systemd/shopsystem-input-device.service
deleted file mode 100644
index 3fec267..0000000
--- a/systemd/shopsystem-input-device.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Shop System Input Device Handler
-BindsTo=dev-barcodescanner.device
-Requires=dev-barcodescanner.device
-After=dev-barcodescanner.device
-
-[Service]
-Type=dbus
-BusName=io.mainframe.shopsystem.InputDevice
-User=shop
-Group=shop
-Restart=always
-RestartSec=10
-ExecStart=/home/shop/serial-barcode-scanner/src/input-device/input-device
-StandardInput=tty
-StandardOutput=tty
-TTYPath=/dev/tty3
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/shopsystem-mail-backup.service b/systemd/shopsystem-mail-backup.service
deleted file mode 100644
index 9521242..0000000
--- a/systemd/shopsystem-mail-backup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Send shopsystem backup mail
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-User=shop
-Group=shop
-ExecStart=/home/shop/serial-barcode-scanner/src/backup/backup
-IOSchedulingClass=idle
diff --git a/systemd/shopsystem-mail-backup.timer b/systemd/shopsystem-mail-backup.timer
deleted file mode 100644
index b0c18a2..0000000
--- a/systemd/shopsystem-mail-backup.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run shopsystem backup mail daily
-
-[Timer]
-OnCalendar=*-*-* 08:00:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/systemd/shopsystem-mail-daily-invoice.service b/systemd/shopsystem-mail-daily-invoice.service
deleted file mode 100644
index 3cce03e..0000000
--- a/systemd/shopsystem-mail-daily-invoice.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Send shopsystem daily invoice mail
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-User=shop
-Group=shop
-ExecStart=/home/shop/serial-barcode-scanner/src/invoice/invoice temporary
-StandardOutput=journal
-StandardError=journal
-IOSchedulingClass=idle
diff --git a/systemd/shopsystem-mail-daily-invoice.timer b/systemd/shopsystem-mail-daily-invoice.timer
deleted file mode 100644
index 8688d03..0000000
--- a/systemd/shopsystem-mail-daily-invoice.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Send shopsystem daily invoice
-
-[Timer]
-OnCalendar=*-*-* 08:15:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/systemd/shopsystem-mail-monthly-invoice.service b/systemd/shopsystem-mail-monthly-invoice.service
deleted file mode 100644
index dd217b3..0000000
--- a/systemd/shopsystem-mail-monthly-invoice.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Send shopsystem monthly invoice mail
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-User=shop
-Group=shop
-ExecStart=/home/shop/serial-barcode-scanner/src/invoice/invoice final
-StandardOutput=journal
-StandardError=journal
-IOSchedulingClass=idle
diff --git a/systemd/shopsystem-mail-monthly-invoice.timer b/systemd/shopsystem-mail-monthly-invoice.timer
deleted file mode 100644
index a29d964..0000000
--- a/systemd/shopsystem-mail-monthly-invoice.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Send shopsystem monthly invoice
-
-[Timer]
-OnCalendar=*-*-01 09:00:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/systemd/shopsystem-ui.service b/systemd/shopsystem-ui.service
deleted file mode 100644
index 9641d16..0000000
--- a/systemd/shopsystem-ui.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Shop System UI
-
-[Service]
-User=shop
-Group=shop
-Type=simple
-ExecStart=/home/shop/serial-barcode-scanner/src/curses-ui/curses-ui
-StandardInput=tty
-StandardOutput=tty
-TTYPath=/dev/tty3
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/shopsystem-web.service b/systemd/shopsystem-web.service
deleted file mode 100644
index 8393863..0000000
--- a/systemd/shopsystem-web.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shop System Web Interface
-
-[Service]
-User=shop
-Group=shop
-Type=simple
-ExecStart=/home/shop/serial-barcode-scanner/src/web/web
-StandardInput=null
-StandardOutput=journal
-
-[Install]
-WantedBy=multi-user.target