FJurmanovic/wallet-go-api
1
0
Fork 0
mirror of https://github.com/FJurmanovic/wallet-go-api.git synced 2026-02-06 06:08:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed wallet not displaying next month correctly

Browse Source
This commit is contained in:
Fran Jurmanović
2021-07-05 20:39:26 +02:00
parent 29bcbb6e91
commit 1228925881
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/subscriptions.go
View File

@@ -77,11 +77,11 @@ func (as *SubscriptionService) SubToTrans(subModel *models.Subscription, tx *pg.
currentLocation := now.Location()
firstOfNextMonth := time.Date(currentYear, currentMonth+1, 1, 0, 0, 0, 0, currentLocation)
tzFirstOfNextMonth := firstOfNextMonth.In(subModel.StartDate.Location())
//tzFirstOfNextMonth := firstOfNextMonth.In(subModel.StartDate.Location())
startDate := subModel.StartDate
stopDate := tzFirstOfNextMonth
if subModel.HasEnd && subModel.EndDate.Before(tzFirstOfNextMonth) {
stopDate := firstOfNextMonth
if subModel.HasEnd && subModel.EndDate.Before(firstOfNextMonth) {
stopDate = subModel.EndDate
}