From 8c31b877f56fb73511733ddd9ead8b809ad119a9 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Sat, 2 Apr 2016 02:45:26 +0300 Subject: [PATCH] Optimize for Pypi packaging --- .gitmodules | 3 + SWSCloudCore/controllers/payments/__init__.py | 19 -- SWSCloudCore/controllers/users/__init__.py | 2 - SWSCloudCore/models.py | 16 -- .../templates/administrator/_layout.auth.html | 7 +- SWSCloudCore/templates/default/_header.html | 19 +- SWSCloudCore/templates/default/_layout.html | 2 +- .../templates/default/containers/create.html | 12 +- .../templates/default/containers/delete.html | 10 +- .../templates/default/containers/index.html | 37 +--- .../default/containers/settings.html | 20 +- .../templates/default/documents/index.html | 2 +- SWSCloudCore/templates/default/id/_menu.html | 9 +- SWSCloudCore/templates/default/id/api.html | 36 ++-- .../templates/default/id/balance.html | 32 +--- SWSCloudCore/templates/default/id/index.html | 4 +- SWSCloudCore/templates/default/id/login.html | 24 ++- .../default/id/password_reset_step1.html | 14 +- .../default/id/password_reset_step2.html | 21 ++- .../templates/default/id/password_update.html | 28 +-- .../templates/default/id/registration.html | 30 ++- SWSCloudCore/templates/default/id/sshkey.html | 12 +- SWSCloudCore/templates/default/kb/index.html | 2 +- .../default/payment/robokassa/success.html | 2 +- .../templates/default/support/index.html | 24 +-- .../templates/default/support/thank.html | 6 +- SWSCloudCore/views/account/__init__.py | 177 ++++++++++++++---- SWSCloudCore/views/api/__init__.py | 23 --- SWSCloudCore/views/containers/__init__.py | 17 +- SWSCloudCore/views/payments/__init__.py | 69 ------- SWSCloudCore/views/support/__init__.py | 2 +- app/cdn/__init__.py | 1 - .../payments/twocheckout/__init__.py | 13 -- .../payments/twocheckout/api_request.py | 102 ---------- .../payments/twocheckout/charge.py | 61 ------ .../payments/twocheckout/company.py | 16 -- .../payments/twocheckout/contact.py | 15 -- .../payments/twocheckout/coupon.py | 40 ---- .../controllers/payments/twocheckout/error.py | 8 - .../controllers/payments/twocheckout/ins.py | 40 ---- .../payments/twocheckout/option.py | 41 ---- .../payments/twocheckout/passback.py | 40 ---- .../payments/twocheckout/payment.py | 23 --- .../payments/twocheckout/product.py | 41 ---- .../controllers/payments/twocheckout/sale.py | 102 ---------- .../payments/twocheckout/twocheckout.py | 14 -- .../controllers/payments/twocheckout/util.py | 21 --- app/cloud/views/settings/__init__.py | 137 -------------- app/dns/__init__.py | 1 - app/static/css/app.css | 86 --------- app/static/images/promo/bg1.jpg | Bin 61569 -> 0 bytes app/static/images/promo/bg2.png | Bin 105455 -> 0 bytes app/static/images/promo/clouds1.jpg | Bin 284258 -> 0 bytes .../settings/payments/index.html | 38 ---- app/templates/default/_footer.html | 20 -- .../default/containers/create.en.html | 49 ----- .../default/containers/delete.en.html | 31 --- .../default/containers/index.en.html | 71 ------- .../default/containers/settings.en.html | 45 ----- app/templates/default/documents/index.en.html | 11 -- app/templates/default/errors/403.en.html | 11 -- app/templates/default/errors/403.html | 11 -- app/templates/default/errors/404.html | 11 -- app/templates/default/errors/410.html | 10 - app/templates/default/errors/500.html | 19 -- app/templates/default/homepage/index.html | 67 ------- app/templates/default/id/registration.en.html | 41 ---- app/templates/default/kb/index.en.html | 11 -- app/templates/default/kb/index.ru.html | 11 -- .../default/payment/robokassa/success.en.html | 8 - app/templates/default/settings/_menu.html | 7 - .../settings/billing/_tab.creditcard.html | 63 ------- .../default/settings/billing/_tab.paypal.html | 19 -- .../settings/billing/_tab.robokassa.html | 17 -- .../default/settings/billing/index.html | 154 --------------- .../profile/_account_information_edit.html | 23 --- .../profile/_account_information_view.html | 17 -- .../default/settings/profile/edit.html | 33 ---- .../default/settings/profile/index.html | 26 --- app/templates/default/tasks/index.en.html | 43 ----- app/templates/default/tasks/index.ru.html | 43 ----- cli-settings-init.py | 8 - 82 files changed, 308 insertions(+), 2093 deletions(-) delete mode 100644 app/cdn/__init__.py delete mode 100644 app/cloud/controllers/payments/twocheckout/__init__.py delete mode 100755 app/cloud/controllers/payments/twocheckout/api_request.py delete mode 100755 app/cloud/controllers/payments/twocheckout/charge.py delete mode 100644 app/cloud/controllers/payments/twocheckout/company.py delete mode 100644 app/cloud/controllers/payments/twocheckout/contact.py delete mode 100644 app/cloud/controllers/payments/twocheckout/coupon.py delete mode 100644 app/cloud/controllers/payments/twocheckout/error.py delete mode 100644 app/cloud/controllers/payments/twocheckout/ins.py delete mode 100644 app/cloud/controllers/payments/twocheckout/option.py delete mode 100644 app/cloud/controllers/payments/twocheckout/passback.py delete mode 100644 app/cloud/controllers/payments/twocheckout/payment.py delete mode 100644 app/cloud/controllers/payments/twocheckout/product.py delete mode 100644 app/cloud/controllers/payments/twocheckout/sale.py delete mode 100644 app/cloud/controllers/payments/twocheckout/twocheckout.py delete mode 100644 app/cloud/controllers/payments/twocheckout/util.py delete mode 100644 app/cloud/views/settings/__init__.py delete mode 100644 app/dns/__init__.py delete mode 100644 app/static/css/app.css delete mode 100644 app/static/images/promo/bg1.jpg delete mode 100644 app/static/images/promo/bg2.png delete mode 100644 app/static/images/promo/clouds1.jpg delete mode 100644 app/templates/administrator/settings/payments/index.html delete mode 100644 app/templates/default/_footer.html delete mode 100644 app/templates/default/containers/create.en.html delete mode 100644 app/templates/default/containers/delete.en.html delete mode 100644 app/templates/default/containers/index.en.html delete mode 100644 app/templates/default/containers/settings.en.html delete mode 100644 app/templates/default/documents/index.en.html delete mode 100644 app/templates/default/errors/403.en.html delete mode 100644 app/templates/default/errors/403.html delete mode 100644 app/templates/default/errors/404.html delete mode 100644 app/templates/default/errors/410.html delete mode 100644 app/templates/default/errors/500.html delete mode 100644 app/templates/default/homepage/index.html delete mode 100644 app/templates/default/id/registration.en.html delete mode 100644 app/templates/default/kb/index.en.html delete mode 100644 app/templates/default/kb/index.ru.html delete mode 100644 app/templates/default/payment/robokassa/success.en.html delete mode 100644 app/templates/default/settings/_menu.html delete mode 100644 app/templates/default/settings/billing/_tab.creditcard.html delete mode 100644 app/templates/default/settings/billing/_tab.paypal.html delete mode 100644 app/templates/default/settings/billing/_tab.robokassa.html delete mode 100644 app/templates/default/settings/billing/index.html delete mode 100644 app/templates/default/settings/profile/_account_information_edit.html delete mode 100644 app/templates/default/settings/profile/_account_information_view.html delete mode 100644 app/templates/default/settings/profile/edit.html delete mode 100644 app/templates/default/settings/profile/index.html delete mode 100644 app/templates/default/tasks/index.en.html delete mode 100644 app/templates/default/tasks/index.ru.html diff --git a/.gitmodules b/.gitmodules index e69de29..66aa0e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "kb/kb"] + path = kb/kb + url = http://github.com/apescale/kb diff --git a/SWSCloudCore/controllers/payments/__init__.py b/SWSCloudCore/controllers/payments/__init__.py index 7f8a294..bd1ce9a 100644 --- a/SWSCloudCore/controllers/payments/__init__.py +++ b/SWSCloudCore/controllers/payments/__init__.py @@ -8,25 +8,12 @@ class ControllerPayments: self.args = args def balance_update(self, transaction_id, amount): - """ - Обновление баланса пользователя - :param transaction_id: - :param amount: - :return: - """ user = models.UsersBalanceTransactions.select().where(models.UsersBalanceTransactions.id == transaction_id)[0] balance = models.UsersBalance.get(models.UsersBalance.user == user.user.id) balance.balance += float(amount) balance.save() def transaction_create(self, user_id, amount, status='process'): - """ - Создание записи о транзакции со статусом 'proccess' - :param user_id: - :param amount: - :param status: - :return: - """ # create transaction data to database transaction = models.UsersBalanceTransactions(user=user_id, amount=amount, status=status) transaction.save() @@ -40,12 +27,6 @@ class ControllerPayments: return True def transaction_set_status(self, transaction_id, status): - """ - Обновить статус [fail, success, process] - :param transaction_id: - :param status: - :return: - """ # update transaction signature transaction = models.UsersBalanceTransactions.get(models.UsersBalanceTransactions.id == transaction_id) transaction.status = status diff --git a/SWSCloudCore/controllers/users/__init__.py b/SWSCloudCore/controllers/users/__init__.py index 4016e59..8ee5f9c 100644 --- a/SWSCloudCore/controllers/users/__init__.py +++ b/SWSCloudCore/controllers/users/__init__.py @@ -157,8 +157,6 @@ class ControllerUsersDetails(ControllerUsers): x.country = kwargs['country'] if 'state' in kwargs: x.state = kwargs['state'] - if 'phone' in kwargs: - x.phone = kwargs['phone'] if 'zipcode' in kwargs: x.zipcode = kwargs['zipcode'] x.save() diff --git a/SWSCloudCore/models.py b/SWSCloudCore/models.py index 3755d6f..3d92b03 100644 --- a/SWSCloudCore/models.py +++ b/SWSCloudCore/models.py @@ -94,25 +94,9 @@ class UsersDetails(PgSQLModel): city = CharField(null=True) country = CharField(null=True) state = CharField(null=True) - phone = CharField(null=True) zipcode = IntegerField(null=True) -# class UsersBillingDetails(PgSQLModel): -# user = ForeignKeyField(Users) -# fname = CharField(null=True) -# lname = CharField(null=True) -# city = CharField(null=True) -# address = CharField(null=True) -# country = CharField(null=True) -# state = CharField(null=True) -# zipcode = IntegerField(null=True) -# ccno = CharField(null=True) -# ccmonth = CharField(null=True) -# ccyear = CharField(null=True) -# cccvc = CharField(null=True) -# - class UsersBalance(PgSQLModel): user = ForeignKeyField(Users, related_name='usersbalance') balance = FloatField(default=0, null=False) diff --git a/SWSCloudCore/templates/administrator/_layout.auth.html b/SWSCloudCore/templates/administrator/_layout.auth.html index 28bec0e..d2c5e5a 100644 --- a/SWSCloudCore/templates/administrator/_layout.auth.html +++ b/SWSCloudCore/templates/administrator/_layout.auth.html @@ -120,12 +120,7 @@
  • IPs
  • -
  • Settings - -
  • +
  • Settings
  • diff --git a/SWSCloudCore/templates/default/_header.html b/SWSCloudCore/templates/default/_header.html index b450bcd..beb883a 100644 --- a/SWSCloudCore/templates/default/_header.html +++ b/SWSCloudCore/templates/default/_header.html @@ -5,30 +5,27 @@