Merge branch 'develop' into api-v3

2016-02-14 13:03:29 +01:00
parent 8b7719d25e 00f98d90b6
commit 28c6c27b78
419 changed files with 20121 additions and 18129 deletions
@@ -318,9 +318,9 @@ let requiresPurchase = {

 let checkPreferencePurchase = (user, path, item) => {
  let itemPath = `${path}.${item}`;
-  let isDefaultPreference = _.get(shared.content.defaultAppearancePreferences, itemPath);
-
-  if (isDefaultPreference) return true;
+  let appearance = _.get(shared.content.appearances, itemPath)
+  if (!appearance) return false;
+  if (appearance.price === 0) return true;

  return _.get(user.purchased, itemPath);
 };