undersys/proxadmin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

activate functions bugs

Browse source
This commit is contained in:
deflax 2017-07-15 07:28:04 +03:00
parent 7bfdd479f2
commit f222aeae14
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/main/routes.py
View file

@ -5,7 +5,9 @@ from flask_sqlalchemy import get_debug_queries
from . import main from . import main
from .. import db from .. import db
from ..email import send_email from ..email import send_email
from ..models import User, Permission, Deployment, Service, Region, Address, Domain from ..models import User, Permission, Deployment, Service, Region, Address, Domain, contact_proxmaster
import base64
@main.after_app_request @main.after_app_request
def after_request(response): def after_request(response):

6
app/vmanager/routes.py
View file

@ -143,7 +143,7 @@ def activate(itemid=0):
if current_user.wallet < total: if current_user.wallet < total:
flash('Insufficient Funds') flash('Insufficient Funds')
return redirect(url_for('uinvoice.transactions')) return redirect(url_for('uinvoice.transactions'))
current_app.logger.info('[{}] Charge deployments: {}'.format(current_user.email, inventory)) current_app.logger.info('[{}] Charge deployment: {}'.format(current_user.email, deploy.machine_id))
today = datetime.utcnow() today = datetime.utcnow()
current_app.logger.info(form.period.data) current_app.logger.info(form.period.data)
@ -153,10 +153,10 @@ def activate(itemid=0):
deploy.period = form.period.data deploy.period = form.period.data
deploy.daysleft = form.period.data * daysleft.days deploy.daysleft = form.period.data * daysleft.days
deploy.warning = False deploy.warning = False
deploy.active = True deploy.enabled = True
db.session.commit() db.session.commit()
transaction = Transaction(user_id=int(current_user.pid), description='Deployment {} activated for {} month(s)', value=-total) transaction = Transaction(user_id=int(current_user.pid), description='Deployment {} activated for {} month(s)'.format(deploy.machine_alias, form.period.data), value=-total)
db.session.add(transaction) db.session.add(transaction)
db.session.commit() db.session.commit()