Merge b3d3d5d into ed8bd84

HabitRPG · Jan 31, 2019 · c93c5b3 · c93c5b3
2 parents ed8bd84 + b3d3d5d
commit c93c5b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
@@ -417,6 +417,8 @@ shops.getSeasonalGearBySet = function getSeasonalGearBySet (user, set, officialP
 shops.getSeasonalShop = function getSeasonalShop (user, language) {
   let officialPinnedItems = getOfficialPinnedItems(user);
 
+  const myUserVersion = user._v;
+
   let resObject = {
     identifier: 'seasonalShop',
     text: i18n.t('seasonalShop'),
@@ -428,6 +430,8 @@ shops.getSeasonalShop = function getSeasonalShop (user, language) {
       text: i18n.t(seasonalShopConfig.featuredSet),
       items: shops.getSeasonalGearBySet(user, seasonalShopConfig.featuredSet, officialPinnedItems, language, true),
     },
+    // return / subscribe to user._V, to let vue refresh the seasonal shop overview
+    _v: myUserVersion,
   };
 
   return resObject;

diff --git a/website/common/script/ops/pinnedGearUtils.js b/website/common/script/ops/pinnedGearUtils.js
@@ -85,30 +85,16 @@ function removePinnedGearByClass (user) {
 }
 
 function removePinnedGearAddPossibleNewOnes (user, itemPath, newItemKey) {
-  let currentPinnedItems = selectGearToPin(user);
-  let removeAndAddAllItems = false;
-
-  for (let item of currentPinnedItems) {
-    let itemInfo = getItemInfo(user, 'marketGear', item);
-
-    if (itemInfo.path === itemPath) {
-      removeAndAddAllItems = true;
-      break;
-    }
-  }
-
   removeItemByPath(user, itemPath);
 
-  if (removeAndAddAllItems) {
-    // an item of the users current "new" gear was bought
-    // remove the old pinned gear items and add the new gear back
-    removePinnedGearByClass(user);
-    user.items.gear.owned[newItemKey] = true;
-    addPinnedGearByClass(user);
-  } else {
-    // just change the new gear to owned
-    user.items.gear.owned[newItemKey] = true;
-  }
+  // an item of the users current "new" gear was bought
+  // remove the old pinned gear items and add the new gear back
+  removePinnedGearByClass(user);
+  user.items.gear.owned[newItemKey] = true;
+  addPinnedGearByClass(user);
+
+  // update the version, so that vue can refresh the seasonal shop
+  user._v++;
 }
 
 /**