mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge branch 'model-transaction-link' into create-transaction-link-mutation
This commit is contained in:
commit
0f3d2719d5
@ -27,6 +27,9 @@ export class TransactionLink {
|
|||||||
@Field(() => Decimal)
|
@Field(() => Decimal)
|
||||||
amount: Decimal
|
amount: Decimal
|
||||||
|
|
||||||
|
@Field(() => Decimal)
|
||||||
|
holdAvailableAmount: Decimal
|
||||||
|
|
||||||
@Field(() => String)
|
@Field(() => String)
|
||||||
memo: string
|
memo: string
|
||||||
|
|
||||||
|
|||||||
@ -19,10 +19,20 @@ export class TransactionLink extends BaseEntity {
|
|||||||
})
|
})
|
||||||
amount: Decimal
|
amount: Decimal
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'decimal',
|
||||||
|
name: 'hold_available_amount',
|
||||||
|
precision: 40,
|
||||||
|
scale: 20,
|
||||||
|
nullable: false,
|
||||||
|
transformer: DecimalTransformer,
|
||||||
|
})
|
||||||
|
holdAvailableAmount: Decimal
|
||||||
|
|
||||||
@Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' })
|
@Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' })
|
||||||
memo: string
|
memo: string
|
||||||
|
|
||||||
@Column({ length: 96, nullable: false, collation: 'utf8mb4_unicode_ci' })
|
@Column({ length: 24, nullable: false, collation: 'utf8mb4_unicode_ci' })
|
||||||
code: string
|
code: string
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
|||||||
@ -9,8 +9,9 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
|
|||||||
\`id\` int UNSIGNED NOT NULL AUTO_INCREMENT,
|
\`id\` int UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||||
\`userId\` int UNSIGNED NOT NULL,
|
\`userId\` int UNSIGNED NOT NULL,
|
||||||
\`amount\` DECIMAL(40,20) NOT NULL,
|
\`amount\` DECIMAL(40,20) NOT NULL,
|
||||||
|
\`hold_available_amount\` DECIMAL(40,20) NOT NULL,
|
||||||
\`memo\` varchar(255) NOT NULL,
|
\`memo\` varchar(255) NOT NULL,
|
||||||
\`code\` varchar(96) NOT NULL,
|
\`code\` varchar(24) NOT NULL,
|
||||||
\`createdAt\` datetime NOT NULL,
|
\`createdAt\` datetime NOT NULL,
|
||||||
\`validUntil\` datetime NOT NULL,
|
\`validUntil\` datetime NOT NULL,
|
||||||
\`showEmail\` boolean NOT NULL DEFAULT false,
|
\`showEmail\` boolean NOT NULL DEFAULT false,
|
||||||
|
|||||||
@ -40,3 +40,8 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
<style>
|
||||||
|
.pointer {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-for="({ id, typeId }, index) in transactions" :key="id">
|
<div v-for="({ id, typeId }, index) in transactions" :key="id">
|
||||||
<transaction-list-item :typeId="typeId">
|
<transaction-list-item :typeId="typeId" class="pointer">
|
||||||
<template #DECAY>
|
<template #DECAY>
|
||||||
<transaction-decay class="list-group-item" v-bind="transactions[index]" />
|
<transaction-decay class="list-group-item" v-bind="transactions[index]" />
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-creation">
|
<div class="transaction-slot-creation">
|
||||||
<div @click="visible = !visible">
|
<div @click="visible = !visible">
|
||||||
<!-- Collaps Icon -->
|
<!-- Collaps Icon -->
|
||||||
<div class="text-right" style="width: 95%; position: absolute">
|
<div class="text-right" style="width: 95%; position: absolute">
|
||||||
@ -75,7 +75,7 @@
|
|||||||
</b-row>
|
</b-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-collapse class="pb-4 pt-5" v-model="visible">
|
<b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
|
||||||
<decay-information-before-startblock v-if="decay.start === null" />
|
<decay-information-before-startblock v-if="decay.start === null" />
|
||||||
<decay-information-decay-startblock
|
<decay-information-decay-startblock
|
||||||
v-else-if="isStartBlock"
|
v-else-if="isStartBlock"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-decay">
|
<div class="transaction-slot-decay">
|
||||||
<div @click="visible = !visible">
|
<div @click="visible = !visible">
|
||||||
<!-- Collaps Icon -->
|
<!-- Collaps Icon -->
|
||||||
<div class="text-right" style="width: 95%; position: absolute">
|
<div class="text-right" style="width: 95%; position: absolute">
|
||||||
@ -38,7 +38,7 @@
|
|||||||
</b-row>
|
</b-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-collapse class="pb-4 pt-5" v-model="visible">
|
<b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
|
||||||
<decay-information-decay :balance="balance" :decay="decay" />
|
<decay-information-decay :balance="balance" :decay="decay" />
|
||||||
</b-collapse>
|
</b-collapse>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-receive">
|
<div class="transaction-slot-receive">
|
||||||
<div @click="visible = !visible">
|
<div @click="visible = !visible">
|
||||||
<!-- Collaps Icon -->
|
<!-- Collaps Icon -->
|
||||||
<div class="text-right" style="width: 95%; position: absolute">
|
<div class="text-right" style="width: 95%; position: absolute">
|
||||||
@ -78,7 +78,7 @@
|
|||||||
</b-row>
|
</b-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-collapse class="pb-4 pt-5" v-model="visible">
|
<b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
|
||||||
<decay-information-before-startblock v-if="decay.start === null" />
|
<decay-information-before-startblock v-if="decay.start === null" />
|
||||||
<decay-information-decay-startblock
|
<decay-information-decay-startblock
|
||||||
v-else-if="isStartBlock"
|
v-else-if="isStartBlock"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-send">
|
<div class="transaction-slot-send">
|
||||||
<div @click="visible = !visible">
|
<div @click="visible = !visible">
|
||||||
<!-- Collaps Icon -->
|
<!-- Collaps Icon -->
|
||||||
<div class="text-right" style="width: 95%; position: absolute">
|
<div class="text-right" style="width: 95%; position: absolute">
|
||||||
@ -75,7 +75,7 @@
|
|||||||
</b-row>
|
</b-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-collapse class="pb-4 pt-5" v-model="visible">
|
<b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
|
||||||
<decay-information-before-startblock v-if="decay.start === null" />
|
<decay-information-before-startblock v-if="decay.start === null" />
|
||||||
<decay-information-decay-startblock
|
<decay-information-decay-startblock
|
||||||
v-else-if="isStartBlock"
|
v-else-if="isStartBlock"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user