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

Upgrade tests tools and lint migrations and scripts (part 2) (#9998)

Browse Source 
* upgrade gulp-babel

* upgrade babel-eslint

* upgrade eslint-friendly-formatter

* start upgrading chai

* start to upgrade eslint

* restore skipped tests

* start to upgrqde monk

* fix linting and remove unused file

* fix mocha notifications, and common tests

* fix unit tests

* start to fix initrgration tests

* more integration tests fixes

* upgrade monk to latest version

* lint /scripts

* migrations: start moving to /archive unused migrations and run eslint with --fix

* lint migrations

* fix more integration tests

* fix test
This commit is contained in:
Matteo Pagliazzi
2018-02-17 18:11:24 +01:00
committed by GitHub
parent b0ae0ef4da
commit 74ba55c20b
362 changed files with 8041 additions and 7813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/server/libs/payments.js
View File

@@ -42,7 +42,7 @@ function revealMysteryItems (user) {
moment().isBefore(shared.content.mystery[item.mystery].end) &&
!user.items.gear.owned[item.key] &&
user.purchased.plan.mysteryItems.indexOf(item.key) === -1
) {
) {
user.purchased.plan.mysteryItems.push(item.key);
pushedItems.push(item.key);
}
@@ -511,9 +511,9 @@ api.cancelSubscription = async function cancelSubscription (data) {
plan.dateTerminated =
moment(nowStr, nowStrFormat)
.add({days: remaining})
.add({days: extraDays})
.toDate();
.add({days: remaining})
.add({days: extraDays})
.toDate();
plan.extraMonths = 0; // clear extra time. If they subscribe again, it'll be recalculated from p.dateTerminated