diff --git a/app/admin/routes.py b/app/admin/routes.py index f39de76..1a6b0b0 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -7,7 +7,7 @@ from .forms import ChargeForm, Addr2PoolForm, OrderForm from .. import db from ..email import send_email -from ..models import User, Transaction, Server, Deployment, Service, Region, Address, Domain, contact_proxmaster +from ..models import User, Transaction, Order, Server, Deployment, Service, Region, Address, Domain, contact_proxmaster from ..decorators import admin_required, permission_required import base64 @@ -34,6 +34,12 @@ def after_request(response): def index(): return redirect(url_for('admin.list_users')) +@admin.route("/listorders", methods=['GET', 'POST']) +@fresh_login_required +@admin_required +def list_orders(): + AllOrders = Order.query.all() + return render_template('admin/list_orders.html', orders=AllOrders) @admin.route("/listdeployments", methods=['GET']) @fresh_login_required diff --git a/app/models.py b/app/models.py index 86357be..8f6746b 100644 --- a/app/models.py +++ b/app/models.py @@ -87,6 +87,7 @@ class User(db.Model, UserMixin): wallet = db.Column(db.Float) currency = db.Column(db.String, default='BGN') inv_transactions = db.relationship('Transaction', backref='owner', lazy='dynamic') + inv_orders = db.relationship('Order', backref='owner', lazy='dynamic') inv_servers = db.relationship('Server', backref='owner', lazy='dynamic') inv_deployments = db.relationship('Deployment', backref='owner', lazy='dynamic') diff --git a/app/templates/admin/list_addresses.html b/app/templates/admin/list_addresses.html index 020b2fd..302d3aa 100644 --- a/app/templates/admin/list_addresses.html +++ b/app/templates/admin/list_addresses.html @@ -2,7 +2,6 @@ {% block styles %} {{ super() }} - {% endblock %} {% block page_content %} diff --git a/app/templates/admin/list_orders.html b/app/templates/admin/list_orders.html new file mode 100644 index 0000000..3e7cfc7 --- /dev/null +++ b/app/templates/admin/list_orders.html @@ -0,0 +1,58 @@ +{% extends "base.html" %} + +{% block styles %} +{{ super() }} +{% endblock %} + +{% block page_content %} +
+
User | +Recipe | +param 1 | +param 2 | +param 3 | +param 4 | +Status | +|
---|---|---|---|---|---|---|---|
{{ order.owner.email }} | +{{ order.recipe.templatefile }} | +{{ order.parameter1 }} | +{{ order.parameter2 }} | +{{ order.parameter3 }} | +{{ order.parameter4 }} | +{{ order.status }} | ++ {% endfor %} + |