diff --git a/app/smanager/routes.py b/app/smanager/routes.py index 2debe95..b90916c 100644 --- a/app/smanager/routes.py +++ b/app/smanager/routes.py @@ -72,6 +72,8 @@ def activate(itemid=0): owner.wallet = owner.wallet - total db.session.commit() + flash('Deployment {} activated for {} month(s)'.format(str(service.description), form.period.data)) + if owner.is_administrator: return redirect(url_for('admin.list_services')) else: diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py index d5acd35..42b50c7 100644 --- a/app/vmanager/routes.py +++ b/app/vmanager/routes.py @@ -218,7 +218,11 @@ def activate(itemid=0): deploy.protected = True db.session.commit() - transaction = Transaction(user_id=int(owner.pid), description='Deployment {} activated for {} month(s)'.format(str(deploy.machine_alias), form.period.data), value=-total) + email_content = 'Deployment {} is activated for {} month(s). It will expire at {}'.format(str(deploy.machine_alias), form.period.data, str((expiry + extradays).strftime('%c'))) + send_email(current_app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=owner, content=str(email_content)) + send_email(str(owner.email), str(email_content), 'email/client_logger', content=str(email_content)) + + transaction = Transaction(user_id=int(owner.pid), description=str(email_content), value=-total) db.session.add(transaction) db.session.commit() owner.wallet = owner.wallet - total