Merge pull request #5775 from HabitRPG/item_store_fix

Split out potion and armoire out of the itemStore object

website/views/shared/tasks/task_view/static_rewards.jade

@@ -1,18 +1,22 @@
-ul.items.rewards(ng-if='main && list.type=="reward"')
-  li.task.reward-item(ng-repeat='item in itemStore',popover-trigger='mouseenter', popover-placement='top', popover='{{item.key == "armoire" && !user.flags.armoireEmpty ? env.t("armoireNotesFull") + armoireCount(user.items.gear.owned) : item.notes()}}')
+mixin reward(item)
+  li.task.reward-item(popover-trigger='mouseenter', popover-placement='top', popover='{{::#{item}.notes()}}')&attributes(attributes)
     // right-hand side control buttons
     .task-meta-controls
       span.task-notes
         span.glyphicon.glyphicon-comment
     //left-hand size commands
     .task-controls.task-primary
-      input.visuallyhidden(
-        class="reward",
+      input.reward.visuallyhidden(
         type='checkbox',
-        ui-keypress='{13:"buy(item)"}')
-      a.money.btn-buy.item-btn(ng-class='{highValue: item.value >= 1000}', ng-click='buy(item)')
+        ui-keypress='{13:"buy(#{item})"}')
+      a.money.btn-buy.item-btn(ng-class='::{highValue: #{item}.value >= 1000}', ng-click='::buy(#{item})')
         span.shop_gold
-        span.reward-cost {{item.value}}
+        span.reward-cost {{::#{item}.value}}
     // main content
-    span(ng-class='::{"shop_{{item.key}} shop-sprite item-img": true}').reward-img
-    p.task-text {{item.text()}}
+    span(ng-class='::{"shop_{{#{item}.key}} shop-sprite item-img": true}').reward-img
+    p.task-text {{::#{item}.text()}}
+
+ul.items.rewards(ng-if='main && list.type=="reward"')
+  +reward('item')(ng-repeat='item in itemStore')
+  +reward('healthPotion')
+  +reward('armoire')(ng-if='user.flags.armoireEnabled')