sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-27 00:59:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(subscriptions): allow one month after sub start-date before it's terminated.

Browse source
This commit is contained in:
Tyler Renelle 2014-05-05 23:19:13 -06:00
parent 3580a8b1a3
commit d92a2eb86e
3 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dist/habitrpg-shared.js vendored
View file

@ -12337,10 +12337,13 @@ var process=require("__browserify_process");(function() {
return typeof cb === "function" ? cb(null, user.stats) : void 0;
},
clearCompleted: function(req, cb) {
_.remove(user.todos, function(t) {
user.todos = _.map(user.todos, function(t) {
var _ref;
return t.completed && !((_ref = t.challenge) != null ? _ref.id : void 0);
if (t.completed && !((_ref = t.challenge) != null ? _ref.id : void 0)) {
t.archived = true;
}
return t;
});
if (typeof user.markModified === "function") {
user.markModified('todos');
@ -13278,7 +13281,7 @@ var process=require("__browserify_process");(function() {
*/
cron: function(options) {
var clearBuffs, daysMissed, expTally, lvl, lvlDiv2, now, perfect, progress, todoTally, _base, _base1, _base2, _base3, _progress, _ref, _ref1, _ref2, _ref3, _ref4;
var clearBuffs, daysMissed, expTally, lvl, lvlDiv2, now, perfect, plan, progress, todoTally, _base, _base1, _base2, _base3, _progress, _ref, _ref1, _ref2, _ref3, _ref4;
if (options == null) {
options = {};
@ -13379,6 +13382,11 @@ var process=require("__browserify_process");(function() {
}
}
});
user.todos.forEach(function(task) {
if (!task.archived && task.completed && moment(now).subtract('days', 3).isAfter(moment(task.dateCompleted))) {
return task.archived = true;
}
});
((_ref1 = (_base1 = ((_ref2 = user.history) != null ? _ref2 : user.history = {})).todos) != null ? _ref1 : _base1.todos = []).push({
date: now,
value: todoTally
@ -13412,6 +13420,15 @@ var process=require("__browserify_process");(function() {
if (user.stats.mp > user._statsComputed.maxMP) {
user.stats.mp = user._statsComputed.maxMP;
}
plan = user.purchased.plan;
if (plan.customerId && plan.dateTerminated && moment(plan.dateTerminated).isBefore(+(new Date))) {
_.merge(user.purchased.plan, {
planId: null,
customerId: null,
paymentMethod: null
});
user.markModified('purchased.plan');
}
progress = user.party.quest.progress;
_progress = _.cloneDeep(progress);
_.merge(progress, {

3
locales/en/subscriber.json
View file

@ -59,5 +59,6 @@
"contactUs": "Contact Us",
"checkout": "Checkout",
"buySubsText": "Buy gems with Gold, No Ads, Support the Devs",
"sureCancelSub": "Are you sure you want to cancel your subscription?"
"sureCancelSub": "Are you sure you want to cancel your subscription?",
"subCanceled": "Subscription cancelled and will become inactive on"
}

7
script/index.coffee
View file

@ -1266,6 +1266,13 @@ api.wrap = (user, main=true) ->
user.stats.mp += _.max([10,.1 * user._statsComputed.maxMP])
user.stats.mp = user._statsComputed.maxMP if user.stats.mp > user._statsComputed.maxMP
# If user cancelled subscription, we give them until 30day's end until it terminates
plan = user.purchased.plan
if plan.customerId && plan.dateTerminated && moment(plan.dateTerminated).isBefore(+new Date)
_.merge user.purchased.plan, {planId:null, customerId:null, paymentMethod:null}
user.markModified 'purchased.plan'
# After all is said and done, progress up user's effect on quest, return those values & reset the user's
progress = user.party.quest.progress; _progress = _.cloneDeep progress
_.merge progress, {down:0,up:0}