Skip to content

Commit 22a8b1f

Browse files
stuartwkxcolwell
authored andcommitted
checks pro status in subscrition balance by paid transfer balance
1 parent 5bf6f06 commit 22a8b1f

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

controller/subscription_controller.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,26 @@ func SubscriptionBalance(session *session.ClientSession) (*SubscriptionBalanceRe
186186

187187
netBalanceByteCount := model.ByteCount(0)
188188
startBalanceByteCount := model.ByteCount(0)
189+
isPro := false
190+
189191
for _, transferBalance := range transferBalances {
190192
netBalanceByteCount += transferBalance.BalanceByteCount
191193
startBalanceByteCount += transferBalance.StartBalanceByteCount
194+
195+
if !isPro && transferBalance.NetRevenue > 0 {
196+
// check if any of the transfer balances are from a pro subscription
197+
isPro = true
198+
}
199+
192200
}
193201

194202
openTransferByteCount := model.GetOpenTransferByteCount(session.Ctx, session.ByJwt.NetworkId)
195203

196204
var currentSubscription *Subscription
197205

198-
active, market := model.HasSubscriptionRenewal(session.Ctx, session.ByJwt.NetworkId, model.SubscriptionTypeSupporter)
206+
_, market := model.HasSubscriptionRenewal(session.Ctx, session.ByJwt.NetworkId, model.SubscriptionTypeSupporter)
199207

200-
if active {
208+
if isPro {
201209
currentSubscription = &Subscription{
202210
Plan: model.SubscriptionTypeSupporter,
203211
}

0 commit comments

Comments
 (0)