diff --git a/files/classes/user.py b/files/classes/user.py index a6a1b741e..23cb4b1bd 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -1105,10 +1105,7 @@ class User(Base): @property @lazy def winnings(self): - from_casino = g.db.query(func.sum(CasinoGame.winnings)).filter(CasinoGame.user_id == self.id).one()[0] - from_casino_value = from_casino or 0 - - return from_casino_value + self.total_lottery_winnings + return g.db.query(func.sum(CasinoGame.winnings)).filter(CasinoGame.user_id == self.id).one()[0] @lazy def show_sig(self, v): diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html index 5295089ed..7d9f6797b 100644 --- a/files/templates/userpage/banner.html +++ b/files/templates/userpage/banner.html @@ -220,7 +220,8 @@

User ID: {{u.id}}

True score: {{u.truescore}}

-

Casino and lottery winnings: {{u.winnings}}

+

Casino winnings: {{u.winnings}}

+

Lottery winnings: {{u.total_lottery_winnings}}

= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})

Coins spent on awards: {{u.coins_spent}}

Coins spent on hats: {{u.coins_spent_on_hats}}

@@ -489,7 +490,8 @@

User ID: {{u.id}}

True score: {{u.truescore}}

-

Casino and lottery winnings: {{u.winnings}}

+

Casino winnings: {{u.winnings}}

+

Lottery winnings: {{u.total_lottery_winnings}}

= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})

Coins spent on awards: {{u.coins_spent}}

Coins spent on hats: {{u.coins_spent_on_hats}}