WIP(shops): dates and fixes

website/client/src/components/header/userDropdown.vue

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

website/client/src/components/ui/selectList.vue

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

website/common/script/content/constants/schedule.js

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

website/common/script/libs/getItemInfo.js

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

website/common/script/libs/shops.js

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