From 4819d318b8ec4e10c72607db75d6ce64c141cd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Zatorski?= Date: Sun, 1 Dec 2024 15:12:39 +0100 Subject: [PATCH] transactions for counter --- .../com/sasiedzi/event/service/TransactionService.java | 7 ++++++- .../app/entities/transaction/transaction-details.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sasiedzi/event/service/TransactionService.java b/src/main/java/com/sasiedzi/event/service/TransactionService.java index 3722101..8798a35 100644 --- a/src/main/java/com/sasiedzi/event/service/TransactionService.java +++ b/src/main/java/com/sasiedzi/event/service/TransactionService.java @@ -121,7 +121,12 @@ public class TransactionService { if (accountBalance == null) { accountBalance = BigDecimal.ZERO; } - if (accountBalance.compareTo(BigDecimal.ZERO) < 0 && !Account.Skarbiec.toString().equals(item.getUserAccount().getName())) { + if ( + accountBalance.compareTo(BigDecimal.ZERO) < 0 && + !Account.Skarbiec.toString().equals(item.getUserAccount().getName()) && + !Account.Boisko.toString().equals(item.getUserAccount().getName()) && + !Account.Counter.toString().equals(item.getUserAccount().getName()) + ) { TransactionItem newItem = new TransactionItem(); newItem.setAmount(accountBalance.negate()); newItem.setTransaction(newTransaction); diff --git a/src/main/webapp/app/entities/transaction/transaction-details.vue b/src/main/webapp/app/entities/transaction/transaction-details.vue index 80f1abb..c858a5a 100644 --- a/src/main/webapp/app/entities/transaction/transaction-details.vue +++ b/src/main/webapp/app/entities/transaction/transaction-details.vue @@ -45,7 +45,7 @@