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 @@