Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/modules/billing/services/stripe-subscription.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,21 @@ export class StripeSubscriptionService {
),
};

await this.updateTeamPlanWithBilling(metadata.hubId, plan, billingDetails);
// Get current team plan
const existingTeam = await this.stripeSubscriptionRepo.findTeamById(
metadata.hubId,
);

// Skip webhook overwrite ONLY if admin changed plan recently
if (existingTeam?.billing?.updatedBy === BillingSource.API_CALL) {
console.log("Skipping webhook overwrite due to admin plan change");
} else {
await this.updateTeamPlanWithBilling(
metadata.hubId,
plan,
billingDetails,
);
}
if (!isDowngrading) {
const teamIdObject = new ObjectId(metadata.hubId);
const updateTeam =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ export class AdminHubsController {
}

@UseGuards(JwtAuthGuard, RolesGuard)
// @Roles("admin")
@Roles("super-admin")
@ApiBearerAuth()
@ApiOperation({ summary: "Extend trial period for a hub" })
@ApiParam({
Expand Down Expand Up @@ -427,7 +427,7 @@ export class AdminHubsController {
}

@UseGuards(JwtAuthGuard, RolesGuard)
// @Roles("admin")
@Roles("super-admin")
@ApiBearerAuth()
@ApiOperation({ summary: "Add a subscription plan to a hub" })
@ApiParam({
Expand Down Expand Up @@ -468,6 +468,7 @@ export class AdminHubsController {
}

@UseGuards(JwtAuthGuard, RolesGuard)
@Roles("super-admin")
@ApiBearerAuth()
@ApiOperation({ summary: "Change hub subscription plan (upgrade/downgrade)" })
@ApiParam({
Expand Down
2 changes: 2 additions & 0 deletions src/modules/user-admin/services/user-admin.hubs.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@ export class AdminHubsService {

const subscriptionId = stripeProvider?.subscriptionId;

// Update Stripe subscription if exists
if (subscriptionId && !subscriptionId.startsWith("sub_test")) {
await this.stripeSubscriptionService["stripeService"].updateSubscription(
subscriptionId,
Expand All @@ -679,6 +680,7 @@ export class AdminHubsService {
changeType,
proratedAmount,
effectiveDate,
updatedByAdmin: true,
},
);
}
Expand Down
Loading