krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(shops): don't push if empty

Browse Source 
Also corrects text on hatching potions
This commit is contained in:
SabreCat
2017-06-02 15:28:28 +00:00
parent de1e477ce2
commit db1c2fd5a2
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/common/script/libs/shops.js
View File

@@ -55,7 +55,7 @@ shops.getMarketCategories = function getMarket (user, language) {
.map(hatchingPotion => {
return {
key: hatchingPotion.key,
text: hatchingPotion.text(language),
text: i18n.t('potion', {potionType: hatchingPotion.text(language)}),
notes: hatchingPotion.notes(language),
class: `Pet_HatchingPotion_${hatchingPotion.key}`,
value: hatchingPotion.value,
@@ -76,7 +76,7 @@ shops.getMarketCategories = function getMarket (user, language) {
.map(premiumHatchingPotion => {
return {
key: premiumHatchingPotion.key,
text: premiumHatchingPotion.text(language),
text: i18n.t('potion', {potionType: premiumHatchingPotion.text(language)}),
notes: `${premiumHatchingPotion.notes(language)} ${premiumHatchingPotion._addlNotes(language)}`,
class: `Pet_HatchingPotion_${premiumHatchingPotion.key}`,
value: premiumHatchingPotion.value,
@@ -85,7 +85,9 @@ shops.getMarketCategories = function getMarket (user, language) {
purchaseType: 'hatchingPotions',
};
}), 'key');
categories.push(premiumHatchingPotionsCategory);
if (premiumHatchingPotionsCategory.items.length > 0) {
categories.push(premiumHatchingPotionsCategory);
}
let foodCategory = {
identifier: 'food',
@@ -185,7 +187,9 @@ shops.getQuestShopCategories = function getQuestShopCategories (user, language)
};
}));
categories.push(bundleCategory);
if (bundleCategory.items.length > 0) {
categories.push(bundleCategory);
}
each(content.userCanOwnQuestCategories, type => {
let category = {