From 85e142ca7ba604768e671a29bdbffa60d581ce99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Wed, 17 Jan 2024 16:37:07 +0100 Subject: [PATCH 1/2] bug fix: location expense counted unpaid bills --- app/ui/LocationCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ui/LocationCard.tsx b/app/ui/LocationCard.tsx index 68a207c..7e9c613 100644 --- a/app/ui/LocationCard.tsx +++ b/app/ui/LocationCard.tsx @@ -15,7 +15,7 @@ export interface LocationCardProps { export const LocationCard:FC = ({location: { _id, name, yearMonth, bills }}) => { // sum all the billAmounts - const monthlyExpense = bills.reduce((acc, bill) => acc + (bill.payedAmount ?? 0), 0); + const monthlyExpense = bills.reduce((acc, bill) => bill.paid ? acc + (bill.payedAmount ?? 0) : acc, 0); return(
From 5258bd2d5edc2644270b950da510ad9c1203fb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Wed, 17 Jan 2024 16:37:28 +0100 Subject: [PATCH 2/2] updated image version --- docker-compose-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 8dbc123..14ff288 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -9,7 +9,7 @@ networks: services: web-app: - image: utility-bills-tracker:1.3.0 + image: utility-bills-tracker:1.3.2 networks: - traefik-network - mongo-network