diff options
author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
---|---|---|
committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /templates/cashbox | |
parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 |
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
Diffstat (limited to 'templates/cashbox')
-rw-r--r-- | templates/cashbox/add.html | 17 | ||||
-rw-r--r-- | templates/cashbox/detail.html | 26 | ||||
-rw-r--r-- | templates/cashbox/index.html | 21 | ||||
-rw-r--r-- | templates/cashbox/selection.html | 17 |
4 files changed, 0 insertions, 81 deletions
diff --git a/templates/cashbox/add.html b/templates/cashbox/add.html deleted file mode 100644 index 6e26f00..0000000 --- a/templates/cashbox/add.html +++ /dev/null @@ -1,17 +0,0 @@ -<div id="add-successful" class="alert alert-success" style="display: {{{NEW.OK}}};"> - <p>Successfully balanced cashbox:</p> - - <table class="table"> - <tr><th>Type</th><td>{{{TYPE}}}</td></tr> - <tr><th>Amount</th><td>{{{AMOUNT}}}</td></tr> - </table> -</div> - -<div id="add-failed" class="alert alert-error" style="display: {{{NEW.FAIL}}};"> - <h4>Error</h4> - Creating new cashbox balance entry failed. Please make - sure you have sufficient permissions and gave valid - values for type and amount. -</div> - -<a href="/cashbox">Back to cashbox overview</a> diff --git a/templates/cashbox/detail.html b/templates/cashbox/detail.html deleted file mode 100644 index 41d057a..0000000 --- a/templates/cashbox/detail.html +++ /dev/null @@ -1,26 +0,0 @@ -<h1>Cashbox Account {{{DATE}}}</h1> - -<table class="table table-bordered table-striped table-hover table-condensed table-nonfluid"> - <tr><th>Debit</th><td class="text-right">{{{DEBIT}}} €</td></tr> - <tr><th>Loss</th><td class="text-right">{{{LOSS}}} €</td></tr> - <tr><th>Donation</th><td class="text-right">{{{DONATION}}} €</td></tr> - <tr><th>Withdrawal</th><td class="text-right">{{{WITHDRAWAL}}} €</td></tr> -</table> - -<h2>Loss</h2> -<table class="table table-bordered table-striped table-hover table-condensed table-nonfluid"> - <tr><th>Date & Time</th><th>Amount</th></tr> - {{{LOSS_LIST}}} -</table> - -<h2>Donation</h2> -<table class="table table-bordered table-striped table-hover table-condensed table-nonfluid"> - <tr><th>Date & Time</th><th>Amount</th></tr> - {{{DONATION_LIST}}} -</table> - -<h2>Withdrawals</h2> -<table class="table table-bordered table-striped table-hover table-condensed table-nonfluid"> - <tr><th>Date & Time</th><th>Name</th><th>Amount</th></tr> - {{{WITHDRAWAL_LIST}}} -</table> diff --git a/templates/cashbox/index.html b/templates/cashbox/index.html deleted file mode 100644 index d5a03a0..0000000 --- a/templates/cashbox/index.html +++ /dev/null @@ -1,21 +0,0 @@ -<legend>Current Cashbox Status</legend> - -<input name"status" type="number" readonly="readonly" value="{{{CASHBOX_STATUS}}}"/> - -<form action="/cashbox/add" class="form-horizontal"> - <legend>Update Cashbox</legend> - <select name="type" size="1"> - <option value="loss">Loss (Money is missing from the cashbox)</option> - <option value="withdrawal">Withdrawal (You removed money from the cashbox)</option> - <option value="donation">Donation (Cashbox has more money, than there should be)</option> - <option value="deposit">Deposit (You added money to the cashbox)</option> - </select> - <input class="input-medium" name="amount" type="number" placeholder="Amount (in Cent)" /> - <button type="submit" class="btn btn-primary"><i class="icon-plus"></i></button> - <legend>History (last ten updates)</legend> - <table class="table table-bordered table-striped table-hover table-condensed table-nonfluid"> - <tr><td>Date & Time</td><td>Name</td><td>Amount</td></tr> - {{{CASHBOX_HISTORY}}} - </table> - <a href="/cashbox/details">Details for a specific month</a> -</form> diff --git a/templates/cashbox/selection.html b/templates/cashbox/selection.html deleted file mode 100644 index e15ee75..0000000 --- a/templates/cashbox/selection.html +++ /dev/null @@ -1,17 +0,0 @@ -<h1>Cashbox Account</h1> - -<script> -function onSubmit() { - d = document.getElementsByName("date")[0].value - if (d.indexOf("-") > 0) { - var split = d.split("-") - var uri = location.protocol + '//' + location.host + location.pathname + "/" + split[0] + "/" + split[1] - self.location = uri; - } -} -</script> - -<form> - <input type="month" name="date" /> - <input type="button" value="Go" onclick="onSubmit()" /> -</form> |