transactions for counter
This commit is contained in:
@@ -121,7 +121,12 @@ public class TransactionService {
|
|||||||
if (accountBalance == null) {
|
if (accountBalance == null) {
|
||||||
accountBalance = BigDecimal.ZERO;
|
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();
|
TransactionItem newItem = new TransactionItem();
|
||||||
newItem.setAmount(accountBalance.negate());
|
newItem.setAmount(accountBalance.negate());
|
||||||
newItem.setTransaction(newTransaction);
|
newItem.setTransaction(newTransaction);
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="transaction.id"
|
v-if="transaction.id && transaction.type == 'MATCH'"
|
||||||
:to="{ name: 'TransactionPaymentsForTransaction', params: { paymentsForTransactionId: transaction.id } }"
|
:to="{ name: 'TransactionPaymentsForTransaction', params: { paymentsForTransactionId: transaction.id } }"
|
||||||
custom
|
custom
|
||||||
v-slot="{ navigate }"
|
v-slot="{ navigate }"
|
||||||
|
|||||||
Reference in New Issue
Block a user