From dbd6024b42a8180e7489f14a0de99cc7264a6fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= Date: Sat, 19 Jun 2021 17:07:32 +0200 Subject: [PATCH] stopdate for subs --- pkg/services/wallets.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/services/wallets.go b/pkg/services/wallets.go index 1de103d..858ef55 100644 --- a/pkg/services/wallets.go +++ b/pkg/services/wallets.go @@ -90,7 +90,11 @@ func (as *WalletService) GetHeader(am *models.Auth, embed string, walletId strin for _, sub := range *subscriptions { startDate := sub.StartDate - for startDate.Before(firstOfMonthAfterNext) { + stopDate := firstOfMonthAfterNext + if sub.HasEnd { + stopDate = sub.EndDate + } + for startDate.Before(stopDate) { trans := sub.ToTrans() trans.TransactionDate = startDate addWhere(&wallets, sub.WalletID, *trans)