diff --git a/SWSCloudCore/controllers/billing/__init__.py b/SWSCloudCore/controllers/billing/__init__.py index 2f3187f..80fc31c 100644 --- a/SWSCloudCore/controllers/billing/__init__.py +++ b/SWSCloudCore/controllers/billing/__init__.py @@ -61,5 +61,5 @@ class ControllerBilling: ).count() transactions['items'] = models.UsersBalanceTransactions.select().where( models.UsersBalanceTransactions.user == user_id - ) + ).order_by(models.UsersBalanceTransactions.created.desc()) return transactions diff --git a/SWSCloudCore/controllers/payments/__init__.py b/SWSCloudCore/controllers/payments/__init__.py index bd1ce9a..72114a1 100644 --- a/SWSCloudCore/controllers/payments/__init__.py +++ b/SWSCloudCore/controllers/payments/__init__.py @@ -13,9 +13,9 @@ class ControllerPayments: balance.balance += float(amount) balance.save() - def transaction_create(self, user_id, amount, status='process'): + def transaction_create(self, user_id, amount, method, status='process'): # create transaction data to database - transaction = models.UsersBalanceTransactions(user=user_id, amount=amount, status=status) + transaction = models.UsersBalanceTransactions(user=user_id, amount=amount, status=status, method=method) transaction.save() return transaction.id diff --git a/SWSCloudCore/models.py b/SWSCloudCore/models.py index 31608a0..0b5ec1a 100644 --- a/SWSCloudCore/models.py +++ b/SWSCloudCore/models.py @@ -175,6 +175,7 @@ class UsersBalanceTransactions(PgSQLModel): notified = IntegerField(null=False, default=0) # success, process, fail status = TextField(null=False) + paid = DateTimeField() # robokassa, webmoney, yandex_money, rbk_money, alfaclick, sberbank_online, paypal, invoice method = CharField(null=False, default=0) details = JSONField(default='{}') diff --git a/SWSCloudWeb/templates/default/_footer.html b/SWSCloudWeb/templates/default/_footer.html index d97ad97..80be5d5 100644 --- a/SWSCloudWeb/templates/default/_footer.html +++ b/SWSCloudWeb/templates/default/_footer.html @@ -1,6 +1,6 @@ diff --git a/SWSCloudWeb/templates/default/billing/payments.html b/SWSCloudWeb/templates/default/billing/payments.html index 049cb57..2fbcf01 100644 --- a/SWSCloudWeb/templates/default/billing/payments.html +++ b/SWSCloudWeb/templates/default/billing/payments.html @@ -12,7 +12,7 @@
-
+

История платежей

@@ -32,55 +32,16 @@ {% else %} {% for record in history['items'] %} - - - - - {% endfor %} - {% endif %} - -
{{ record['amount'] }}{{ record['created'] }} - {% if record['status'] == "process" %} - {{ record['status'] }} - {% elif record['status'] == "fail" %} - {{ record['status'] }} - {% elif record['status'] == "success" %} - {{ record['status'] }} - {% else %} - {{ record['status'] }} - {% endif %} -
-
-
-

Выставленные счета

- - - - - - - - - - - - - - - - - - - - {% if history['total'] == 0 %} - - {% else %} - {% for record in history['items'] %} - - + + + + {% endfor %} {% endif %} diff --git a/SWSCloudWeb/templates/default/support/thank.html b/SWSCloudWeb/templates/default/support/thank.html index 02e5e95..99010ca 100644 --- a/SWSCloudWeb/templates/default/support/thank.html +++ b/SWSCloudWeb/templates/default/support/thank.html @@ -8,7 +8,7 @@

Спасибо!

-

Спасибо за обращение в поддержку. Мы ответим вам в кротчайшее время.

+

Спасибо за обращение в техническую поддержку. Мы ответим вам в кратчайшее время.

{% endblock %} \ No newline at end of file diff --git a/SWSCloudWeb/templates/gocloud2016/layouts/default.html b/SWSCloudWeb/templates/gocloud2016/layouts/default.html index 3e02709..902a396 100644 --- a/SWSCloudWeb/templates/gocloud2016/layouts/default.html +++ b/SWSCloudWeb/templates/gocloud2016/layouts/default.html @@ -80,8 +80,11 @@
-
+

2009-2016 © GoCloud.ru

+ + +
diff --git a/SWSCloudWeb/views/payments/__init__.py b/SWSCloudWeb/views/payments/__init__.py index 07dd544..bca605f 100644 --- a/SWSCloudWeb/views/payments/__init__.py +++ b/SWSCloudWeb/views/payments/__init__.py @@ -48,7 +48,7 @@ def robokassa(action): amount = request.form['amount'] # create transaction data to database - transaction_id = controller_robokassa.transaction_create(user_id, amount, 'process') + transaction_id = controller_robokassa.transaction_create(user_id, amount, 'robokassa', 'process') payment_details = { "payment_id": transaction_id, diff --git a/setup.py b/setup.py index a32c8a2..50b462c 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='SWSCloudCore', - version='2.6.0', + version='2.7.0', author='Vyacheslav Anzhiganov', author_email='hello@anzhiganov.com', packages=[ @@ -36,17 +36,20 @@ setup( 'SWSCloudWeb', 'SWSCloudWeb.views', 'SWSCloudWeb.views.account', - 'SWSCloudWeb.views.containers', + 'SWSCloudWeb.views.bills', + 'SWSCloudWeb.views.compute.containers', + 'SWSCloudWeb.views.compute.vms', 'SWSCloudWeb.views.documents', 'SWSCloudWeb.views.kb', 'SWSCloudWeb.views.payments', 'SWSCloudWeb.views.settings', 'SWSCloudWeb.views.support', 'SWSCloudWeb.views.tasks', - 'SWSCloudWeb.views.vms', # Administrator 'SWSCloudAdministrator', 'SWSCloudAdministrator.Administrator', + # StatisticsClient + 'SWSStatisticsClient', ], package_data={ 'SWSCloudWeb': [ @@ -61,10 +64,17 @@ setup( 'static/js/*.js', 'static/js/foundation/*.js', 'static/js/vendor/*.js', + # New homepage + 'static/assets/css/*.css', + 'static/assets/img/*.png', + 'static/assets/img/testimonials*.png', + 'static/assets/js/*.js', # Templates 'templates/*.html', 'templates/default/*.html', - 'templates/default/containers/*.html', + 'templates/default/billing/*.html', + 'templates/default/compute/containers/*.html', + 'templates/default/compute/vms/*.html', 'templates/default/documents/*.html', 'templates/default/homepage/*.html', 'templates/default/id/*.html', @@ -73,9 +83,12 @@ setup( 'templates/default/payment/robokassa/*.html', 'templates/default/support/*.html', 'templates/default/tasks/*.html', - 'templates/default/vms/*.html', 'templates/email/simple/*.html', 'templates/email/simple/*.css', + # GoCloud2016 + 'templates/gocloud2016/layouts/*.html', + 'templates/gocloud2016/macros/*.html', + 'templates/gocloud2016/pages/*.html', # Errors 'templates/errors/*.html', ],
СуммаДатаСтатус
590.0 рублей2016-03-21Неоплачен
590.0 рублей2016-03-21Оплачен
{{ record['amount'] }}{{ record['id'] }} {{ record['created'] }}{{ record['amount'] }}руб. + {% if record['details']['description'] %} + {{ record['details']['description'] }} + {% else %} + Засчисление на лицевой счёт + {% endif %} + {% if record['status'] == "process" %} {{ record['status'] }} @@ -92,6 +53,7 @@ {{ record['status'] }} {% endif %} {{record['method']}}