WIP(shops): dates and fixes
This commit is contained in:
@@ -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(),
|
||||
|
||||
@@ -491,7 +491,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
|
||||
}
|
||||
|
||||
if (matcher) {
|
||||
itemInfo.end = { matcher };
|
||||
itemInfo.end = matcher.end;
|
||||
}
|
||||
|
||||
return itemInfo;
|
||||
|
||||
@@ -582,6 +582,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
|
||||
bg,
|
||||
officialPinnedItems,
|
||||
language,
|
||||
matchers,
|
||||
);
|
||||
backgroundCategory.items.push(item);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user