add admin summary view, fix product id calculation

bitvend/admin.py

@@ -10,11 +10,13 @@ from flask import (
     url_for,
     session,
     abort,
+    current_app,
 )
 from flask_login import current_user, fresh_login_required
 
 from bitvend import dev, spaceauth
 from bitvend.models import db, Transaction
+from sqlalchemy import func
 from bitvend.forms import ManualForm
 from spaceauth import cap_required
 
@@ -25,7 +27,8 @@ def get_user_groups():
     groups_ts = session.get("groups_ts", 0)
 
     if not groups or groups_uid != current_user.uid or time.time() - groups_ts >= 60.0:
-        groups = spaceauth.remote.get("/api/1/userinfo").data.get("groups")
+        resp = spaceauth.remote.get("/api/1/userinfo")
+        groups = resp.data.get("groups")
 
         session["groups"] = groups
         session["groups_ts"] = time.time()
@@ -39,6 +42,9 @@ def admin_required(fn):
     @wraps(fn)
     def wrapped(*args, **kwargs):
         groups = get_user_groups()
+        if not groups:
+            return current_app.login_manager.unauthorized()
+
         if "vending-admin" not in groups:
             abort(403)
 
@@ -50,7 +56,14 @@ def admin_required(fn):
 bp = Blueprint("admin", __name__)
 
 
-@bp.route("/manual", methods=["GET", "POST"])
+@bp.route("/")
+@fresh_login_required
+@admin_required
+def admin_index():
+    return redirect(url_for("admin.manual"))
+
+
+@bp.route("/manual/", methods=["GET", "POST"])
 @fresh_login_required
 @admin_required
 def manual():
@@ -60,7 +73,13 @@ def manual():
         db.session.commit()
         flash("Operation successful.", "success")
 
-    return render_template("admin/manual.html", form=form)
+    return render_template(
+        "admin/manual.html",
+        form=form,
+        summary=db.session.query(func.sum(Transaction.amount))
+        .filter(Transaction.uid != "__bitcoin__")
+        .scalar(),
+    )
 
 
 @bp.route("/transactions/", defaults={"page": 1})

bitvend/mdb.py

@@ -31,7 +31,7 @@ class BitvendCashlessMDBDevice(CashlessMDBDevice):
         if self.current_tx_id:
             with self.app.app_context():
                 tx = Transaction.query.get(self.current_tx_id)
-                tx.product_id = product
+                tx.product_id = product + 9
                 tx.product_value = value
 
                 if tx.amount is None:

bitvend/templates/admin/base.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block body %}
+<div class="row">
+<div class="col-md-2">
+    <div class="list-group">
+    {% macro link(endpoint) %}<a href="{{ url_for(endpoint) }}" class="list-group-item{% if request.endpoint == endpoint %} active{%endif %}">{{ caller() }}</a>{% endmacro %}
+    {% call link('admin.manual') %}Dashboard{% endcall %}
+    {% call link('admin.transactions') %}Transactions{% endcall %}
+  </div>
+
+</div>
+<div class="col-md-10">{% block content %}{% endblock %}</div>
+</div>
+{% endblock %}

bitvend/templates/admin/manual.html

@@ -1,9 +1,17 @@
-{% extends "base.html" %}
+{% extends "admin/base.html" %}
 
-{% from "_helpers.html" import render_field, render_submit %}
+{% from "_helpers.html" import render_field, render_submit, format_currency %}
 
 {% block content %}
-    <h1 class="page-header">Manual transaction </h1>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="well text-right">
+                <h3><small class="pull-left">Cash summary</small> {{ format_currency(summary) }}</h3>
+            </div>
+        </div>
+    </div>
+
+    <h1 class="page-header">Manual transaction</h1>
     <p class="text-muted">Creates manual transaction for current user. Use this when filling machine with money.</p>
     <div class="row">
     <form action="{{ url_for('.manual') }}" method="POST" class="form-horizontal col-md-6 col-md-offset-3">

bitvend/templates/admin/transactions.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "admin/base.html" %}
 
 {% from "_helpers.html" import format_currency, render_pagination %}
 {% set _tx_styles = {

bitvend/templates/base.html

@@ -85,7 +85,10 @@
         {% endfor %}
         {% endwith %}
 
-        {% block content %}{% endblock %}
+        {% block body %}
+          {% block content %}
+          {% endblock %}
+        {% endblock %}
         <hr>
         <footer class="row"><big>made by <a href="https://wiki.hackerspace.pl/people:informatic:start">inf</a></big>
             <span class="pull-right text-right">1infuHrvt7tuGY8nJcfTwB3wwAR1XwUcW &bull; <a href="https://code.hackerspace.pl/informatic/bitvend">sauce</a><br />report any issues to <a href="mailto:informatic@hackerspace.pl">informatic@hackerspace.pl</a></span>

mdb/device.py

@@ -220,10 +220,9 @@ class CashlessMDBDevice(MDBDevice):
         elif req.command == CASHLESS_VEND:
             if req.data[0] == 0x00:  # vend request
                 self.logger.info("VEND: request %r", req)
-                value, product_bcd = struct.unpack(">xhhx", req.data)
+                value, product = struct.unpack(">xhhx", req.data)
-                product = bcd_decode(product_bcd)
                 self.logger.info(
-                    "VEND: requested %d (%04x) for %d", product, product_bcd, value
+                    "VEND: requested %d (%04x) for %d", product, product, value
                 )
                 if self.vend_request(product, value):
                     # accept. two latter bytes are value subtracted from balance