ruidy/rentease
1
0
Fork 0
mirror of https://github.com/rjNemo/rentease.git synced 2026-06-12 13:46:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: only report the non canceled bookings

Browse source
This commit is contained in:
Ruidy 2024-12-24 18:17:45 +01:00
parent 106aa475d6
commit 041b77c205
No known key found for this signature in database
GPG key ID: E00F51288CB857CC
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/repository/booking/pg_store.go
View file

@ -52,6 +52,7 @@ func (ps *PgStore) List(from, to time.Time) ([]*booking.Line, error) {
from bookings from bookings
join items on bookings.id = items.booking_id join items on bookings.id = items.booking_id
where "to" between ? and ? where "to" between ? and ?
and canceled = false
group by bookings.id group by bookings.id
order by id desc; order by id desc;
`, from, to). `, from, to).
@ -69,6 +70,7 @@ func (ps *PgStore) CardTotal(from, to time.Time) (float64, error) {
from bookings from bookings
join items on bookings.id = items.booking_id join items on bookings.id = items.booking_id
where "to" between ? and ? where "to" between ? and ?
and canceled = false
and payment_method = 'Card' and payment_method = 'Card'
group by booking_id) as t; group by booking_id) as t;
`, from, to). `, from, to).