diff --git a/app/cloud/views/account/__init__.py b/app/cloud/views/account/__init__.py index 020a727..9fc0b42 100644 --- a/app/cloud/views/account/__init__.py +++ b/app/cloud/views/account/__init__.py @@ -112,14 +112,18 @@ def billing(): user_details = models.Users.select().where(models.Users.id == session['user_id']).limit(1)[0] + # выгрузка истории платежей history = dict() history['total'] = models.UsersBalanceTransactions.select().\ where(models.UsersBalanceTransactions.user == user_id).count() history['items'] = models.UsersBalanceTransactions.select().\ where(models.UsersBalanceTransactions.user == user_id) + return render_template( 'default/id/balance.html', - user_details=user_details, user_balance=user_balance, history=history + user_details=user_details, + user_balance=user_balance, + history=history ) diff --git a/app/cloud/views/payments/__init__.py b/app/cloud/views/payments/__init__.py index 1c151fa..bc6e123 100644 --- a/app/cloud/views/payments/__init__.py +++ b/app/cloud/views/payments/__init__.py @@ -1,7 +1,6 @@ # coding: utf-8 from hashlib import md5 - from flask import g from flask import render_template from flask import session @@ -11,7 +10,6 @@ from flask import request from flask import Blueprint from app import models from app.cloud.controllers.users import ControllerUsers -# from app.cloud.controllers.payments import ControllerPayments from app.cloud.controllers.payments import ControllerPaymentsRobokassa viewPayments = Blueprint('payments', __name__, url_prefix='/payments') @@ -40,14 +38,19 @@ def robokassa(action): # create transaction data to database transaction_id = controller_robokassa.transaction_create(user_id, amount, 'process') - payment = dict() - payment["payment_id"] = transaction_id, - payment["amount"] = amount, - payment["login"] = controller_robokassa.args['PAY_ROBOKASSA_LOGIN'], - payment["password"] = controller_robokassa.args['PAY_ROBOKASSA_PASSWORD1'] - payment['signature'] = md5("%(login)s:%(amount)s:%(payment_id)s:%(password)s" % payment).hexdigest() + payment_details = { + "payment_id": transaction_id, + "amount": amount, + "login": controller_robokassa.args['PAY_ROBOKASSA_LOGIN'], + "password": controller_robokassa.args['PAY_ROBOKASSA_PASSWORD1'], + "signature": '' + } - return render_template('default/payment/robokassa/process.html', payment=payment) + payment_details["signature"] = md5( + "%(login)s:%(amount)s:%(payment_id)s:%(password)s" % payment_details + ).hexdigest() + print payment_details + return render_template('default/payment/robokassa/process.html', payment=payment_details) if action == 'result': transaction_id = request.form['InvId']