krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP(shops): dates and fixes

Browse Source
This commit is contained in:
Sabe Jones
2024-04-22 17:52:07 -05:00
parent 28b936e2d1
commit 5cd58d4119
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/src/components/header/userDropdown.vue
View File

@@ -35,13 +35,9 @@
/> />
</a> </a>
<a <a
class="topbar-dropdown-item dropdown-item" class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('body', 'size')" @click="showAvatar('body', 'size')"
>{{ $t('editAvatar') }}</a> >{{ $t('editAvatar') }}</a>
<a
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('backgrounds', '2024')"
>{{ $t('backgrounds') }}</a>
<a <a
class="topbar-dropdown-item dropdown-item" class="topbar-dropdown-item dropdown-item"
@click="showProfile('profile')" @click="showProfile('profile')"

2
website/client/src/components/ui/selectList.vue
View File

@@ -132,7 +132,7 @@ export default {
}, },
methods: { methods: {
getKeyProp (item) { getKeyProp (item) {
return this.keyProp ? item[this.keyProp] : item; return this.keyProp ? item[this.keyProp] : item.key;
}, },
isDisabled (item) { isDisabled (item) {
return typeof item[this.disabledProp] === 'undefined' ? false : item[this.disabledProp]; return typeof item[this.disabledProp] === 'undefined' ? false : item[this.disabledProp];

7
website/common/script/content/constants/schedule.js
View File

@@ -857,9 +857,10 @@ export function getScheduleMatchingGroup (type, date) {
}); });
} }
if (!cachedScheduleMatchers[type]) { if (!cachedScheduleMatchers[type]) {
let end = moment(checkedDate).date(TYPE_SCHEDULE[type]); let end = moment(checkedDate);
if (end.date() <= checkedDate.date()) { end.date(TYPE_SCHEDULE[type]);
end = moment(end).add(1, 'months'); if (end.date() <= moment(checkedDate).date()) {
moment(end).add(1, 'months');
} }
return { return {
end: end.toDate(), end: end.toDate(),

2
website/common/script/libs/getItemInfo.js
View File

@@ -491,7 +491,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
} }
if (matcher) { if (matcher) {
itemInfo.end = { matcher }; itemInfo.end = matcher.end;
} }
return itemInfo; return itemInfo;

1
website/common/script/libs/shops.js
View File

@@ -582,6 +582,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
bg, bg,
officialPinnedItems, officialPinnedItems,
language, language,
matchers,
); );
backgroundCategory.items.push(item); backgroundCategory.items.push(item);
} }