diff --git a/app/admin/routes.py b/app/admin/routes.py index 1a6b0b0..5adab67 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -38,7 +38,7 @@ def index(): @fresh_login_required @admin_required def list_orders(): - AllOrders = Order.query.all() + AllOrders = Order.query.filter_by(status='new').all() return render_template('admin/list_orders.html', orders=AllOrders) @admin.route("/listdeployments", methods=['GET']) diff --git a/app/panel/routes.py b/app/panel/routes.py index 033e2b5..a510769 100644 --- a/app/panel/routes.py +++ b/app/panel/routes.py @@ -26,7 +26,7 @@ def deploy(): form = OrderForm() if form.validate_on_submit(): recipe = Recipe.query.filter_by(category='deploy').first() - new_order = Order(user_id=int(current_user.pid), recipe_id=int(recipe.pid), parameter1=str(form.alias.data), parameter2=str(form.cpu.data), parameter3=str(form.memory.data), parameter4=str(form.storage.data)) + new_order = Order(user_id=int(current_user.pid), recipe_id=int(recipe.pid), parameter1=str(form.alias.data), parameter2=str(form.cpu.data), parameter3=str(form.memory.data), parameter4=str(form.storage.data), status='new') db.session.add(new_order) db.session.commit() send_email(current_app.config['MAIL_USERNAME'], 'New order from {}'.format(current_user.email), diff --git a/app/templates/panel/vdc_pool.html b/app/templates/panel/vdc_pool.html index 0e17680..b1c2c2e 100644 --- a/app/templates/panel/vdc_pool.html +++ b/app/templates/panel/vdc_pool.html @@ -23,7 +23,7 @@
@@ -82,11 +82,18 @@

-
+

- Unit: {{ deploy.machine_id }}
+
+ Date Created: {{ moment(deploy.date_created).format('lll') }}
+ {% if deploy.period == 1 %} + {{ deploy.period }} month payment cycle
+ {% else %} + {{ deploy.period }} months payment cycle
+ {% endif %} State: {{ status[deploy.machine_id] }}
Protected: {{ deploy.protected }}
+