Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

Browse Source 
# Conflicts:
#	website/client/src/components/settings/site.vue
This commit is contained in:
negue
2023-06-24 22:54:00 +02:00
parent f9ff5e5c55 e49d26eacd
commit 6a6f55f6fc
119 changed files with 4665 additions and 2172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/server/controllers/api-v3/hall.js
+3
View File
@@ -277,6 +277,9 @@ api.updateHero = {
if (updateData.purchased.plan.gemsBought) {
hero.purchased.plan.gemsBought = updateData.purchased.plan.gemsBought;
}
if (updateData.purchased.plan.perkMonthCount) {
hero.purchased.plan.perkMonthCount = updateData.purchased.plan.perkMonthCount;
}
if (updateData.purchased.plan.consecutive) {
if (updateData.purchased.plan.consecutive.trinkets) {
const changedHourglassTrinkets = updateData.purchased.plan.consecutive.trinkets