mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge branch 'master' into 1588-frontend-show-link-information
This commit is contained in:
commit
7210804a72
@ -6,7 +6,7 @@ export enum TransactionTypeId {
|
||||
RECEIVE = 3,
|
||||
// This is a virtual property, never occurring on the database
|
||||
DECAY = 4,
|
||||
TRANSACTION_LINK = 5,
|
||||
LINK_SUMMARY = 5,
|
||||
}
|
||||
|
||||
registerEnumType(TransactionTypeId, {
|
||||
|
||||
@ -41,7 +41,7 @@ const virtualLinkTransaction = (
|
||||
id: -2,
|
||||
userId: -1,
|
||||
previous: -1,
|
||||
typeId: TransactionTypeId.TRANSACTION_LINK,
|
||||
typeId: TransactionTypeId.LINK_SUMMARY,
|
||||
amount: amount,
|
||||
balance: balance,
|
||||
balanceDate: validUntil,
|
||||
|
||||
@ -42,8 +42,8 @@
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template #TRANSACTION_LINK>
|
||||
<transaction-links-summary
|
||||
<template #LINK_SUMMARY>
|
||||
<transaction-link-summary
|
||||
class="list-group-item"
|
||||
v-bind="transactions[index]"
|
||||
:transactionLinkCount="transactionLinkCount"
|
||||
@ -72,7 +72,7 @@ import TransactionDecay from '@/components/Transactions/TransactionDecay'
|
||||
import TransactionSend from '@/components/Transactions/TransactionSend'
|
||||
import TransactionReceive from '@/components/Transactions/TransactionReceive'
|
||||
import TransactionCreation from '@/components/Transactions/TransactionCreation'
|
||||
import TransactionLinksSummary from '@/components/Transactions/TransactionLinksSummary'
|
||||
import TransactionLinkSummary from '@/components/Transactions/TransactionLinkSummary'
|
||||
|
||||
export default {
|
||||
name: 'gdd-transaction-list',
|
||||
@ -83,7 +83,7 @@ export default {
|
||||
TransactionSend,
|
||||
TransactionReceive,
|
||||
TransactionCreation,
|
||||
TransactionLinksSummary,
|
||||
TransactionLinkSummary,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { mount } from '@vue/test-utils'
|
||||
import TransactionLinksSummary from './TransactionLinksSummary'
|
||||
import TransactionLinksSummary from './TransactionLinkSummary'
|
||||
import { listTransactionLinks } from '@/graphql/queries'
|
||||
import { toastErrorSpy } from '@test/testSetup'
|
||||
|
||||
@ -29,7 +29,7 @@ const propsData = {
|
||||
transactionLinkCount: 4,
|
||||
}
|
||||
|
||||
describe('TransactionLinksSummary', () => {
|
||||
describe('TransactionLinkSummary', () => {
|
||||
let wrapper
|
||||
|
||||
const Wrapper = () => {
|
||||
Loading…
x
Reference in New Issue
Block a user