Merge branch 'model-transaction-link' into create-transaction-link-mutation

This commit is contained in:
Moriz Wahl 2022-03-09 15:15:05 +01:00
commit 0f3d2719d5
9 changed files with 30 additions and 11 deletions

View File

@ -27,6 +27,9 @@ export class TransactionLink {
@Field(() => Decimal)
amount: Decimal
@Field(() => Decimal)
holdAvailableAmount: Decimal
@Field(() => String)
memo: string

View File

@ -19,10 +19,20 @@ export class TransactionLink extends BaseEntity {
})
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' })
memo: string
@Column({ length: 96, nullable: false, collation: 'utf8mb4_unicode_ci' })
@Column({ length: 24, nullable: false, collation: 'utf8mb4_unicode_ci' })
code: string
@Column({

View File

@ -9,8 +9,9 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
\`id\` int UNSIGNED NOT NULL AUTO_INCREMENT,
\`userId\` int UNSIGNED NOT NULL,
\`amount\` DECIMAL(40,20) NOT NULL,
\`hold_available_amount\` DECIMAL(40,20) NOT NULL,
\`memo\` varchar(255) NOT NULL,
\`code\` varchar(96) NOT NULL,
\`code\` varchar(24) NOT NULL,
\`createdAt\` datetime NOT NULL,
\`validUntil\` datetime NOT NULL,
\`showEmail\` boolean NOT NULL DEFAULT false,

View File

@ -40,3 +40,8 @@ export default {
},
}
</script>
<style>
.pointer {
cursor: pointer;
}
</style>

View File

@ -13,7 +13,7 @@
</div>
<div v-for="({ id, typeId }, index) in transactions" :key="id">
<transaction-list-item :typeId="typeId">
<transaction-list-item :typeId="typeId" class="pointer">
<template #DECAY>
<transaction-decay class="list-group-item" v-bind="transactions[index]" />
</template>

View File

@ -1,5 +1,5 @@
<template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-creation">
<div class="transaction-slot-creation">
<div @click="visible = !visible">
<!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute">
@ -75,7 +75,7 @@
</b-row>
</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-decay-startblock
v-else-if="isStartBlock"

View File

@ -1,5 +1,5 @@
<template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-decay">
<div class="transaction-slot-decay">
<div @click="visible = !visible">
<!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute">
@ -38,7 +38,7 @@
</b-row>
</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" />
</b-collapse>
</div>

View File

@ -1,5 +1,5 @@
<template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-receive">
<div class="transaction-slot-receive">
<div @click="visible = !visible">
<!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute">
@ -78,7 +78,7 @@
</b-row>
</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-decay-startblock
v-else-if="isStartBlock"

View File

@ -1,5 +1,5 @@
<template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-send">
<div class="transaction-slot-send">
<div @click="visible = !visible">
<!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute">
@ -75,7 +75,7 @@
</b-row>
</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-decay-startblock
v-else-if="isStartBlock"