mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-25 11:55:03 +03:00
Fixed products being removed when canceling subscriptions
refs https://github.com/TryGhost/Team/issues/748 Previously when a change happened to a subscription the member's products would be reset purely based on the subscriptions. Since we now support setting products outside of subscriptions, we must make sure than a change to a subscription will only affect the product for which the subscription was for
This commit is contained in:
parent
5a74c614c5
commit
9079a9b9e0
@ -409,36 +409,35 @@ module.exports = class MemberRepository {
|
||||
}
|
||||
|
||||
let status = 'free';
|
||||
let memberProducts = [];
|
||||
let memberProducts = (await member.related('products').fetch(options)).toJSON();
|
||||
if (this.isActiveSubscriptionStatus(subscription.status)) {
|
||||
status = 'paid';
|
||||
try {
|
||||
if (ghostProduct) {
|
||||
memberProducts.push(ghostProduct.toJSON());
|
||||
}
|
||||
const existingProducts = await member.related('products').fetch(options);
|
||||
for (const productModel of existingProducts.models) {
|
||||
memberProducts.push(productModel.toJSON());
|
||||
}
|
||||
} catch (e) {
|
||||
this._logging.error(`Failed to attach products to member - ${data.id}`);
|
||||
}
|
||||
} else {
|
||||
const subscriptions = await member.related('stripeSubscriptions').fetch(options);
|
||||
let activeSubscriptionForGhostProduct = false;
|
||||
for (const subscription of subscriptions.models) {
|
||||
if (this.isActiveSubscriptionStatus(subscription.get('status'))) {
|
||||
status = 'paid';
|
||||
try {
|
||||
const subscriptionProduct = await this._productRepository.get({stripe_price_id: subscription.get('stripe_price_id')});
|
||||
if (subscriptionProduct) {
|
||||
memberProducts.push(subscriptionProduct.toJSON());
|
||||
if (subscriptionProduct && ghostProduct && subscriptionProduct.id === ghostProduct.id) {
|
||||
activeSubscriptionForGhostProduct = true;
|
||||
}
|
||||
} catch (e) {
|
||||
this._logging.error(`Failed to attach products to member - ${data.id}`);
|
||||
this._logging.error(e);
|
||||
}
|
||||
status = 'paid';
|
||||
}
|
||||
}
|
||||
|
||||
if (!activeSubscriptionForGhostProduct) {
|
||||
memberProducts = memberProducts.filter((product) => {
|
||||
return product.id !== ghostProduct.id;
|
||||
});
|
||||
}
|
||||
}
|
||||
let updatedMember;
|
||||
try {
|
||||
|
Loading…
Reference in New Issue
Block a user