Skip to content

Commit 422cfaf

Browse files
committed
adds paid to transfer balance return object
1 parent c9975a3 commit 422cfaf

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

controller/subscription_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func SubscriptionBalance(session *session.ClientSession) (*SubscriptionBalanceRe
192192
netBalanceByteCount += transferBalance.BalanceByteCount
193193
startBalanceByteCount += transferBalance.StartBalanceByteCount
194194

195-
if !isPro && transferBalance.NetRevenue > 0 {
195+
if !isPro && transferBalance.Paid {
196196
// check if any of the transfer balances are from a pro subscription
197197
isPro = true
198198
}

model/subscription_model.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ type TransferBalance struct {
583583
NetRevenue NanoCents `json:"net_revenue_nano_cents"`
584584
BalanceByteCount ByteCount `json:"balance_byte_count"`
585585
PurchaseToken string `json:"purchase_token,omitempty"`
586+
Paid bool `json:"paid,omitempty"`
586587
}
587588

588589
func GetActiveTransferBalances(ctx context.Context, networkId server.Id) []*TransferBalance {
@@ -600,7 +601,8 @@ func GetActiveTransferBalances(ctx context.Context, networkId server.Id) []*Tran
600601
end_time,
601602
start_balance_byte_count,
602603
net_revenue_nano_cents,
603-
balance_byte_count
604+
balance_byte_count,
605+
paid
604606
FROM transfer_balance
605607
WHERE
606608
network_id = $1 AND
@@ -622,6 +624,7 @@ func GetActiveTransferBalances(ctx context.Context, networkId server.Id) []*Tran
622624
&transferBalance.StartBalanceByteCount,
623625
&transferBalance.NetRevenue,
624626
&transferBalance.BalanceByteCount,
627+
&transferBalance.Paid,
625628
))
626629
transferBalances = append(transferBalances, transferBalance)
627630
}

0 commit comments

Comments
 (0)