From 29bcbb6e915a433ac6c33370858c358c66e2dd9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= <fjurma12@outlook.com>
Date: Sat, 3 Jul 2021 08:45:25 +0200
Subject: [PATCH] fixed wallet headers

---
 pkg/services/wallets.go    | 4 ++--
 pkg/utl/configs/configs.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/wallets.go b/pkg/services/wallets.go
index 7bb9e59..404373d 100644
--- a/pkg/services/wallets.go
+++ b/pkg/services/wallets.go
@@ -83,6 +83,7 @@ func (as *WalletService) GetHeader(ctx context.Context, am *models.Auth, walletI
 		query.Where("? = ?", pg.Ident("wallet_id"), walletId)
 	}
 	query.Select()
+	tx.Commit()
 
 	for _, trans := range *transactions {
 		addWhere(wallets, trans.WalletID, trans)
@@ -93,7 +94,7 @@ func (as *WalletService) GetHeader(ctx context.Context, am *models.Auth, walletI
 			// tzFirstOfMonthAfterNext := firstOfMonthAfterNext.In(trans.TransactionDate.Location())
 			// tzFirstOfNextMonth := firstOfNextMonth.In(trans.TransactionDate.Location())
 			// tzFirstOfMonth := firstOfMonth.In(trans.TransactionDate.Location())
-			if trans.TransactionDate.Before(firstOfMonth) && trans.TransactionDate.After(firstOfMonth) || trans.TransactionDate.Equal(firstOfMonth) {
+			if trans.TransactionDate.Before(firstOfNextMonth) && trans.TransactionDate.After(firstOfMonth) || trans.TransactionDate.Equal(firstOfMonth) {
 				if trans.TransactionType.Type == "expense" {
 					(*wallets)[i].CurrentBalance -= trans.Amount
 				} else {
@@ -127,7 +128,6 @@ func (as *WalletService) GetHeader(ctx context.Context, am *models.Auth, walletI
 	wm.Currency = "USD"
 	wm.WalletId = walletId
 
-	tx.Commit()
 
 	return wm
 }
diff --git a/pkg/utl/configs/configs.go b/pkg/utl/configs/configs.go
index 6f21a63..1075eeb 100644
--- a/pkg/utl/configs/configs.go
+++ b/pkg/utl/configs/configs.go
@@ -1,7 +1,7 @@
 package configs
 
 const (
-	Version    = "0.0.1"
+	Version    = "0.0.72"
 	Prefix     = "v1"
 	Secret     = "Donde4sta"
 	SecretCode = "brasno"