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

Hot fixes nov 15 (#9519)

Browse Source 
* Added fortify sync. Removed multiple buy

* Added yesterdaily check

* Fixed checks for running yesterdailies
This commit is contained in:
Keith Holliday
2017-11-17 20:31:29 +11:00
committed by GitHub
parent 0c713ab368
commit dc2269a307
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/components/notifications.vue
View File

@@ -373,8 +373,8 @@ export default {
this.$store.state.isRunningYesterdailies = true; this.$store.state.isRunningYesterdailies = true;
if (!this.user.needsCron) { if (!this.user.needsCron) {
this.handleUserNotifications(this.user.notifications);
this.scheduleNextCron(); this.scheduleNextCron();
this.handleUserNotifications(this.user.notifications);
return; return;
} }
@@ -415,8 +415,8 @@ export default {
this.showLevelUpNotifications(this.user.stats.lvl); this.showLevelUpNotifications(this.user.stats.lvl);
} }
this.handleUserNotifications(this.user.notifications);
this.scheduleNextCron(); this.scheduleNextCron();
this.handleUserNotifications(this.user.notifications);
}, },
transferGroupNotification (notification) { transferGroupNotification (notification) {
this.$store.state.groupNotifications.push(notification); this.$store.state.groupNotifications.push(notification);
@@ -424,6 +424,8 @@ export default {
async handleUserNotifications (after) { async handleUserNotifications (after) {
if (!after || after.length === 0 || !Array.isArray(after)) return; if (!after || after.length === 0 || !Array.isArray(after)) return;
if (this.$store.state.isRunningYesterdailies) return;
let notificationsToRead = []; let notificationsToRead = [];
let scoreTaskNotification = []; let scoreTaskNotification = [];

4
website/client/components/shops/buyModal.vue
View File

@@ -42,10 +42,10 @@
) )
.purchase-amount(:class="{'notEnough': !this.enoughCurrency(getPriceClass(), item.value * selectedAmountToBuy)}") .purchase-amount(:class="{'notEnough': !this.enoughCurrency(getPriceClass(), item.value * selectedAmountToBuy)}")
.how-many-to-buy(v-if='item.purchaseType !== "gear"') .how-many-to-buy(v-if='["fortify", "gear"].indexOf(item.purchaseType) === -1')
strong {{ $t('howManyToBuy') }} strong {{ $t('howManyToBuy') }}
div(v-if='item.purchaseType !== "gear"') div(v-if='item.purchaseType !== "gear"')
.box .box(v-if='["fortify", "gear"].indexOf(item.purchaseType) === -1')
input(type='number', min='0', v-model='selectedAmountToBuy') input(type='number', min='0', v-model='selectedAmountToBuy')
span.svg-icon.inline.icon-32(aria-hidden="true", v-html="icons[getPriceClass()]") span.svg-icon.inline.icon-32(aria-hidden="true", v-html="icons[getPriceClass()]")
span.value(:class="getPriceClass()") {{ item.value }} span.value(:class="getPriceClass()") {{ item.value }}

8
website/client/store/actions/shops.js
View File

@@ -126,9 +126,13 @@ export async function genericPurchase (store, params) {
await buyArmoire(store, params); await buyArmoire(store, params);
return; return;
case 'fortify': { case 'fortify': {
let rerollResult = rerollOp(store.state.user.data); let rerollResult = rerollOp(store.state.user.data, store.state.tasks.data);
axios.post('/api/v3/user/reroll'); await axios.post('/api/v3/user/reroll');
await Promise.all([
store.dispatch('user:fetch', {forceLoad: true}),
store.dispatch('tasks:fetchUserTasks', {forceLoad: true}),
]);
return rerollResult; return rerollResult;
} }