Repository navigation
Release 7.9.0: claim rewards from the kiosk, record allowance payouts in the panel - #1250
Merged
Merged
Conversation
A child's drawer gets a Pay out button and Settings > Allowance gets Record a payout, both shown once allowance is on. The dialog starts at the child's whole balance, previews the cash as it is typed, refuses more than the balance and records once on a double tap. Before this the record_allowance_payout action was the only way, and a dashboard button can't template its points (tap actions send the text), so paying out a whole balance failed with "expected int at 'points'". The Allowance page now documents the script workaround too. Cash shows two decimals when it has pence (£76.90, not £76.9), in the dialog and in the Recent payouts list.
New opt-in `show_rewards` kiosk option (editor: "Reward claiming"). The unlocked child gets a "Spend your points" section under today's chores listing the rewards they can have, cheapest first: Claim when they can afford it (asks first), points still to go with a bar when they can't, "Waiting for a grown-up" while a claim is pending, the day it opens again when they've hit its limit, and "Not available right now" outside its time window. Jackpots, pool rewards, streak freezes, sold-out/expired rewards and other children's rewards stay on the Rewards card. Claims go through claim_reward naming the child, so the linked-child check and parent approval apply as for any other claim. Strings in all 11 locales; wiki Kiosk Mode page updated. Refs #1248
Points set aside for a pending claim no longer count towards the side tile's progress, so it matches the new rewards list after a claim. Refs #1248
# Conflicts: # custom_components/taskmate/www/locales/da/panel.json # custom_components/taskmate/www/locales/de/panel.json # custom_components/taskmate/www/locales/en-GB/panel.json # custom_components/taskmate/www/locales/en/panel.json # custom_components/taskmate/www/locales/fr/panel.json # custom_components/taskmate/www/locales/nb/panel.json # custom_components/taskmate/www/locales/nl/panel.json # custom_components/taskmate/www/locales/nn/panel.json # custom_components/taskmate/www/locales/pl/panel.json # custom_components/taskmate/www/locales/pt-BR/panel.json # custom_components/taskmate/www/locales/pt/panel.json
Kiosk guard test now allows the child's own claim_reward call (#1248).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Release 7.9.0: children can claim rewards from the kiosk, and parents can record allowance payouts from the admin panel. Ships alongside the kiosk's "Up for grabs" marking from #1247, already on main.
Added
show_rewards). The unlocked child gets a "Spend your points" list under today's chores, cheapest first. Each reward shows Claim (asks first), points still to go with a bar, "Waiting for a grown-up", the day it opens again, or "Not available right now". Claims go throughclaim_rewardnaming the child, so parent approval still applies. Jackpots, pool rewards, streak freezes, sold-out/expired rewards and other children's rewards stay on the Rewards card. The next-reward tile now counts only spendable points.Checks
pytest 4559 passed; node 2201 passed; ruff, ESLint, translation parity, data files and locale bundles pass. On ha-dev via browserless: kiosk rewards in classic/playroom/graphite and the panel payout dialogs at 360/375/393/768, with no overflow or page errors.
Closes #1248