diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts index 1670e9a23..52fc6ce78 100644 --- a/backend/src/graphql/model/TransactionLink.ts +++ b/backend/src/graphql/model/TransactionLink.ts @@ -40,6 +40,9 @@ export class TransactionLink { @Field(() => Date) createdAt: Date + @Field(() => Date, { nullable: true }) + deletedAt: Date | null + @Field(() => Date) validUntil: Date diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 9f3d7265f..05ff2b302 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -12,7 +12,7 @@ import CONFIG from '@/config' import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' // import { klicktippSignIn } from '@/apis/KlicktippController' -jest.setTimeout(10000) +jest.setTimeout(1000000) jest.mock('@/mailer/sendAccountActivationEmail', () => { return { diff --git a/database/entity/0030-transaction_link/TransactionLink.ts b/database/entity/0030-transaction_link/TransactionLink.ts index bb12277d1..6ea708547 100644 --- a/database/entity/0030-transaction_link/TransactionLink.ts +++ b/database/entity/0030-transaction_link/TransactionLink.ts @@ -1,5 +1,5 @@ import Decimal from 'decimal.js-light' -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' @Entity('transaction_links') @@ -41,6 +41,9 @@ export class TransactionLink extends BaseEntity { }) createdAt: Date + @DeleteDateColumn() + deletedAt?: Date | null + @Column({ type: 'datetime', nullable: false, diff --git a/database/migrations/0030-transaction_link.ts b/database/migrations/0030-transaction_link.ts index 4d72cf43b..ee76c980d 100644 --- a/database/migrations/0030-transaction_link.ts +++ b/database/migrations/0030-transaction_link.ts @@ -13,6 +13,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`memo\` varchar(255) NOT NULL, \`code\` varchar(24) NOT NULL, \`createdAt\` datetime NOT NULL, + \`deletedAt\` datetime DEFAULT NULL, \`validUntil\` datetime NOT NULL, \`showEmail\` boolean NOT NULL DEFAULT false, \`redeemedAt\` datetime, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 21cfc44cb..8a49c3016 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -232,6 +232,11 @@ "receiverNotFound": "Empfänger nicht gefunden", "show_all": "Alle {count} Transaktionen ansehen" }, + "transaction-link": { + "button": "einlösen", + "send_you": "sendet dir", + "subtitle": "subtitle" + }, "transactions": "Transaktionen", "whitepaper": "Whitepaper" } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 3014570ad..ca66bfe35 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -232,6 +232,11 @@ "receiverNotFound": "Recipient not found", "show_all": "View all {count} transactions." }, + "transaction-link": { + "button": "redeem", + "send_you": "wants to send you", + "subtitle": "subtitle" + }, "transactions": "Transactions", "whitepaper": "Whitepaper" } diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue index 56c31026c..55fa013ca 100644 --- a/frontend/src/pages/Send.vue +++ b/frontend/src/pages/Send.vue @@ -77,7 +77,6 @@ export default { this.currentTransactionStep = 1 }, async sendTransaction() { - console.log('TESTETESTESTES') this.loading = true this.error = false if (this.transactionData.selected === 'send') { @@ -101,7 +100,7 @@ export default { variables: { amount: this.transactionData.amount, memo: this.transactionData.memo }, }) .then((result) => { - console.log(result) + alert(result) }) .catch((error) => { this.toastError(error) diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js index 8b1378917..e69de29bb 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js +++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js @@ -1 +0,0 @@ - diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue index ace86b9aa..385a8c921 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.vue +++ b/frontend/src/pages/ShowTransactionLinkInformations.vue @@ -4,14 +4,15 @@
{{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }} - {{ $t('wants to send you') }} {{ displaySetup.amount | GDD }} + {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
-{{ $t(displaySetup.subtitle) }}
+{{ displaySetup.memo }}