for house change, pool coins and mbux together

pull/138/head
Aevann 2023-03-07 07:09:17 +02:00
parent 6bb35b3d2f
commit 20993c004c
2 changed files with 2 additions and 4 deletions

View File

@ -357,9 +357,7 @@ def settings_personal_post(v):
else:
cost = HOUSE_JOIN_COST
success = v.charge_account('coins', cost)
if not success:
success = v.charge_account('marseybux', cost)
success = v.charge_account('combined', cost)
if not success: abort(403)
if house == "None": house = ''

View File

@ -100,7 +100,7 @@
<p>Join a house (cost: {{cost}} coins or marseybux).</p>
{% endif %}
<div class="input-group mb2">
<select {% if v.coins < cost and v.marseybux < cost or v.bite %}disabled{% endif %} autocomplete="off" id='house' class="form-control setting_select" form="profile-settings" name="house" data-nonce="{{g.nonce}}" data-reload="1">
<select {% if cost > v.coins + v.marseybux or v.bite %}disabled{% endif %} autocomplete="off" id='house' class="form-control setting_select" form="profile-settings" name="house" data-nonce="{{g.nonce}}" data-reload="1">
{% for entry in HOUSES %}
<option value="{{entry}}" {% if v.house.startswith(entry) %} selected {% endif %}>
{{entry}}