mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 06:37:23 +01:00
commit dd0a410fa6c3741dc0d6793283cf4df3c37790a5 Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Nov 4 14:24:30 2024 -0600 fix(subs): center next hourglass message commit 72d92ffd76bb43fee8ba2bbabd211e595afbd664 Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 14:17:59 2024 -0500 fix(subs): don't hide HG preview entirely commit ea0ecb0c3d519ed3d5c42266367eaaa7283ac5de Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 13:01:06 2024 -0500 fix(subs): Google wording and HG escape commit 2bd2c69e18e37c8c8c7106c62f186c372d25c5d2 Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 09:25:30 2024 -0500 fix(layout): tighten cancellation note commiteb2fc40d24Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 15:41:43 2024 -0500 fix(g1g1): don't try to find Gems promo during bogo commitd3eea86bd7Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 15:00:09 2024 -0500 fix(subs): fix typeError commite3ae9a2d67Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 13:57:27 2024 -0500 fix(subs): also redirect to subs after gift sub commit690163a0deAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 16:42:38 2024 +0200 fix test commit2ad7541fc0Author: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 16:34:52 2024 +0200 fix test commit7e337a9e59Author: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 11:54:15 2024 +0200 remove only commit7462b8a57fAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 11:51:25 2024 +0200 fix bug with incorrectly giving HG bonus commitacd6183e95Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Oct 21 17:22:26 2024 -0500 fix(subs): unhovery and un-12-monthy commit935e9fd6ecAuthor: Kalista Payne <sabrecat@gmail.com> Date: Fri Oct 18 14:50:17 2024 -0500 fix(subs): try again on gifts commit6e1fb7df38Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 18:19:20 2024 -0500 fix(lint): do negate object ig commit71d434b94eAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 18:15:11 2024 -0500 fix(lint): unnecessary ternary commitb90b0bb9c3Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 17:34:24 2024 -0500 fix(subs): gifts DON't renew commit19469304c5Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 17:13:29 2024 -0500 fix(subs): pass autoRenews through Stripe commit6819e7b7e5Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 16:03:25 2024 -0500 fix(subscriptions): minor visual updates commit74633b5e5eAuthor: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 16 17:27:09 2024 -0500 fix(subscriptions): more gift layout revisions commita90ccb89deAuthor: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 16 15:37:50 2024 -0500 fix(subscription): update layout when gifting commitc24b2db8dcAuthor: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 16:11:46 2024 +0200 fix issue with promo hourglasses commit7a61c72b47Author: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 15:59:40 2024 +0200 don’t give additional HG for new sub if they already got one this month commitf14cb09026Author: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 10:38:01 2024 +0200 Admin panel display fixes commitf4cff698cfAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 3 17:58:59 2024 -0500 fix(stripe): correct redirect after success commitc468b58f3fAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 3 17:35:37 2024 -0500 fix(subs): correct border-radius and redirect commit78fb9e31d6Author: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 2 17:41:49 2024 -0500 fix(css): correct and refactor heights and selection states commite2babe8053Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Sep 30 16:45:29 2024 -0500 feat(subscription): max Gems progress readout commit61af8302a3Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 15:11:22 2024 +0200 fix test commitef8ff0ea9eAuthor: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 14:14:44 2024 +0200 show date for hourglass bonus if it was received commit4bafafdc8dAuthor: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 14:12:52 2024 +0200 add new field for cumulative subscription count commit30096247b7Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 13:39:49 2024 +0200 fix missing transaction type commit70872651b0Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 13:31:40 2024 +0200 fix admin panel strings commitf3398db65fAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Sep 26 23:11:16 2024 -0500 WIP(subs): extant Stripe state commitc6b2020109Author: Phillip Thelen <phillip@habitica.com> Date: Thu Sep 26 11:41:55 2024 +0200 fix admin panel display commitd9afc96d2dAuthor: Phillip Thelen <phillip@habitica.com> Date: Thu Sep 26 11:40:16 2024 +0200 Fix hourglass logic for upgrades commit6e2c8eeb64Author: Phillip Thelen <phillip@habitica.com> Date: Wed Sep 25 17:48:54 2024 +0200 fix hourglass count commitcd752fbdceAuthor: Kalista Payne <sabrecat@gmail.com> Date: Fri Sep 20 12:24:21 2024 -0500 WIP(frontend): draft of main subs page view commit0102b29d59Author: Kalista Payne <sabe@habitica.com> Date: Wed Sep 18 15:29:08 2024 -0500 fix(admin): correct logic and style for shrimple subs commit5469a5c5c3Author: Kalista Payne <sabe@habitica.com> Date: Wed Sep 18 15:07:36 2024 -0500 fix(test): short circuit this. commit526193ee6cAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Sep 18 14:42:06 2024 +0200 fix gem limit commit19cf1636aaAuthor: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 13 17:00:40 2024 +0200 return nextHourglassDate again commiteea36e3ed5Author: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 13 13:11:22 2024 +0200 subscription test improvements commitca78e74330Author: Phillip Thelen <phillip@habitica.com> Date: Mon Aug 12 15:46:15 2024 +0200 add more subscription tests commitf4c4f93a08Author: Phillip Thelen <phillip@habitica.com> Date: Fri Aug 9 13:35:22 2024 +0200 finish basic implementation of new logic commite036742048Author: Phillip Thelen <phillip@habitica.com> Date: Fri Aug 9 11:37:44 2024 +0200 cleanup commit6431865688Author: Phillip Thelen <phillip@habitica.com> Date: Wed Aug 7 05:41:18 2024 -0400 update cron tests commit930d875ae9Author: Phillip Thelen <phillip@habitica.com> Date: Thu Aug 8 10:36:50 2024 +0200 begin refactoring commit96623608d0Author: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 6 16:28:16 2024 +0200 begin removing obsolete tests
90 lines
3.0 KiB
JavaScript
90 lines
3.0 KiB
JavaScript
import mongoose from 'mongoose';
|
|
import validator from 'validator';
|
|
import baseModel from '../libs/baseModel';
|
|
import { TransactionModel as Transaction } from './transaction';
|
|
|
|
export const schema = new mongoose.Schema({
|
|
planId: String,
|
|
subscriptionId: String,
|
|
owner: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for subscription owner.'] },
|
|
quantity: { $type: Number, default: 1 },
|
|
paymentMethod: String, // enum: ['Paypal', 'Stripe', 'Gift', 'Amazon Payments', 'Google', '']}
|
|
customerId: String, // Billing Agreement Id in case of Amazon Payments
|
|
dateCreated: Date,
|
|
dateTerminated: Date,
|
|
dateUpdated: Date,
|
|
dateCurrentTypeCreated: Date,
|
|
extraMonths: { $type: Number, default: 0 },
|
|
gemsBought: { $type: Number, default: 0 },
|
|
mysteryItems: { $type: Array, default: () => [] },
|
|
lastReminderDate: Date, // indicates the last time a subscription reminder was sent
|
|
lastBillingDate: Date, // Used only for Amazon Payments to keep track of billing date
|
|
// Example for Google: {'receipt': 'serialized receipt json', 'signature': 'signature string'}
|
|
additionalData: mongoose.Schema.Types.Mixed,
|
|
// indicates when the queue server should process this subscription again.
|
|
nextPaymentProcessing: Date,
|
|
nextBillingDate: Date, // Next time google will bill this user.
|
|
hourglassPromoReceived: Date,
|
|
cumulativeCount: { $type: Number, default: 0 },
|
|
consecutive: {
|
|
count: { $type: Number, default: 0 },
|
|
// when gifted subs, offset++ for each month. offset-- each new-month (cron).
|
|
// count doesn't ++ until offset==0
|
|
offset: { $type: Number, default: 0 },
|
|
gemCapExtra: { $type: Number, default: 0 },
|
|
trinkets: { $type: Number, default: 0 },
|
|
lastHourglassReceived: Date,
|
|
},
|
|
}, {
|
|
strict: true,
|
|
minimize: false, // So empty objects are returned
|
|
_id: false,
|
|
typeKey: '$type', // So that we can use fields named `type`
|
|
});
|
|
|
|
schema.plugin(baseModel, {
|
|
private: ['additionalData'],
|
|
noSet: ['_id'],
|
|
timestamps: false,
|
|
_id: false,
|
|
});
|
|
|
|
schema.methods.rewardPerks = async function rewardPerks
|
|
(userID, adding) {
|
|
let perks = adding;
|
|
if (typeof adding === 'string' || adding instanceof String) {
|
|
perks = parseInt(adding, 10);
|
|
}
|
|
|
|
if (perks > 0) {
|
|
this.consecutive.gemCapExtra += 2 * perks; // 2 extra Gems every month
|
|
// cap it at 50 (hard 24 limit + extra 26)
|
|
if (this.consecutive.gemCapExtra > 26) this.consecutive.gemCapExtra = 26;
|
|
// one Hourglass every month
|
|
await this.updateHourglasses(userID, perks, 'subscription_perks'); // eslint-disable-line no-await-in-loop
|
|
}
|
|
};
|
|
|
|
schema.methods.updateHourglasses = async function updateHourglasses (
|
|
userId,
|
|
amount,
|
|
transactionType,
|
|
reference,
|
|
referenceText,
|
|
) {
|
|
this.consecutive.trinkets += amount;
|
|
this.consecutive.lastHourglassReceived = new Date();
|
|
await Transaction.create({
|
|
currency: 'hourglasses',
|
|
userId,
|
|
transactionType,
|
|
amount,
|
|
reference,
|
|
referenceText,
|
|
|
|
currentAmount: this.consecutive.trinkets,
|
|
});
|
|
};
|
|
|
|
export const model = mongoose.model('SubscriptionPlan', schema);
|