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

Group migration fixes (#8555)

Browse Source 
* fix(migration): better subs handling

* feat(migration): award jackalopes

* fix(lint): no console logs
This commit is contained in:
Sabe Jones
2017-03-10 18:18:02 -06:00
committed by GitHub
parent bde41699ee
commit ca903f0dc3
4 changed files with 101 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/server/libs/stripePayments.js
View File

@@ -1,6 +1,7 @@
import stripeModule from 'stripe';
import nconf from 'nconf';
import cc from 'coupon-code';
import moment from 'moment';
import {
BadRequest,
@@ -226,20 +227,27 @@ api.cancelSubscription = async function cancelSubscription (options, stripeInc)
if (!customerId) throw new NotAuthorized(i18n.t('missingSubscription'));
// @TODO: Handle error response
let customer = await stripeApi.customers.retrieve(customerId);
let customer = await stripeApi.customers.retrieve(customerId).catch(function errorCatch (err) {
return err;
});
let nextBill = moment().add(30, 'days').unix() * 1000;
let subscription = customer.subscription;
if (!subscription && customer.subscriptions) {
subscription = customer.subscriptions.data[0];
if (customer && (customer.subscription || customer.subscriptions)) {
let subscription = customer.subscription;
if (!subscription && customer.subscriptions) {
subscription = customer.subscriptions.data[0];
}
await stripeApi.customers.del(customerId);
if (subscription && subscription.current_period_end) {
nextBill = subscription.current_period_end * 1000; // timestamp in seconds
}
}
if (!subscription) return;
await stripeApi.customers.del(customerId);
await payments.cancelSubscription({
user,
groupId,
nextBill: subscription.current_period_end * 1000, // timestamp in seconds
nextBill,
paymentMethod: this.constants.PAYMENT_METHOD,
});
};