Mere changes with wip

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
 

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 {

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,

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,

frontend/src/locales/de.json

@@ -232,6 +232,11 @@
     "receiverNotFound": "Empfänger nicht gefunden",
     "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen"
   },
+  "transaction-link": {
+    "button": "einlösen",
+    "send_you": "sendet dir",
+    "subtitle": "subtitle"
+  },
   "transactions": "Transaktionen",
   "whitepaper": "Whitepaper"
 }

frontend/src/locales/en.json

@@ -232,6 +232,11 @@
     "receiverNotFound": "Recipient not found",
     "show_all": "View all <strong>{count}</strong> transactions."
   },
+  "transaction-link": {
+    "button": "redeem",
+    "send_you": "wants to send you",
+    "subtitle": "subtitle"
+  },
   "transactions": "Transactions",
   "whitepaper": "Whitepaper"
 }

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)

frontend/src/pages/ShowTransactionLinkInformations.spec.js

@@ -1 +0,0 @@
-

frontend/src/pages/ShowTransactionLinkInformations.vue

@@ -4,14 +4,15 @@
     <div class="header py-7 py-lg-8 pt-lg-9">
       <b-container>
         <div class="header-body text-center mb-7">
+          <div class="mb-5">resultDB : {{ resultDB }}</div>
           <p class="h1">
             {{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }}
-            {{ $t('wants to send you') }} {{ displaySetup.amount | GDD }}
+            {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </p>
-          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <p class="h4">{{ displaySetup.memo }}</p>
           <hr />
           <b-button v-if="displaySetup.linkTo" :to="displaySetup.linkTo">
-            {{ $t(displaySetup.button) }}
+            {{ $t('transaction-link.button') }}
           </b-button>
         </div>
       </b-container>
@@ -25,7 +26,18 @@ export default {
   name: 'ShowTransactionLinkInformations',
   data() {
     return {
-      displaySetup: {},
+      resultDB: {},
+      displaySetup: {
+        amount: '123456',
+        linkTo: '',
+        memo: 'Test Memo, Test Memo von Ogerly, Test Memo von Ogerly für testuser',
+        user: {
+          publisherId: 1,
+          firstName: 'testName',
+          lastName: 'testOgerly',
+          email: 'test@example.de',
+        },
+      },
     }
   },
   methods: {
@@ -41,6 +53,7 @@ export default {
           const {
             data: { queryTransactionLink },
           } = result
+          this.resultDB = queryTransactionLink
           this.displaySetup = queryTransactionLink
           this.$store.commit('publisherId', queryTransactionLink.user.publisherId)
         })