Merge branch 'sabrecat/cshop' into subs-private

website/common/script/libs/getItemInfo.js

@@ -8,6 +8,8 @@ import isPinned from './isPinned';
 import isFreeRebirth from './isFreeRebirth';
 import getOfficialPinnedItems from './getOfficialPinnedItems';
 
+import { ALWAYS_AVAILABLE_CUSTOMIZATIONS } from '../content/constants/schedule';
+
 function lockQuest (quest, user) {
   // checks series quests, including Masterclasser
   if (quest.prereqQuests) {
@@ -490,8 +492,8 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
     throw new BadRequest(i18n.t('wrongItemType', { type }, language));
   }
 
-  if (matcher) {
-    itemInfo.end = { matcher };
+  if (matcher && (!itemInfo.set || ALWAYS_AVAILABLE_CUSTOMIZATIONS.indexOf(itemInfo.set.key) === -1)) {
+    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);
         }
@@ -617,6 +618,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
           hairStyle,
           officialPinnedItems,
           language,
+          hairType === 'color' ? customizationMatcher : null,
         );
         category.items.push(item);
       }
@@ -642,6 +644,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
           appearance,
           officialPinnedItems,
           language,
+          type === 'skin' ? customizationMatcher : null,
         );
         category.items.push(item);
       }