diff --git a/backend/src/graphql/models/GdtEntry.ts b/backend/src/graphql/models/GdtEntry.ts index 09ee35a70..014195fcd 100644 --- a/backend/src/graphql/models/GdtEntry.ts +++ b/backend/src/graphql/models/GdtEntry.ts @@ -15,6 +15,7 @@ export enum GdtEntryType { @ObjectType() export class GdtEntry { constructor(json: any) { + this.transactionId = json.transaction_id this.amount = json.amount this.date = json.date this.email = json.email @@ -27,6 +28,9 @@ export class GdtEntry { this.gdt = json.gdt } + @Field(() => Number) + transactionId: number + @Field(() => Number) amount: number diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index df85e16bc..81f44ddda 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -125,20 +125,16 @@ export const checkUsername = gql` ` export const listGDTEntriesQuery = gql` - query($email: String!, $currentPage: Float!, $pageSize: Float!) { + query($email: String!, $currentPage: Int!, $pageSize: Int!) { listGDTEntries(email: $email, currentPage: $currentPage, pageSize: $pageSize) { - state count gdtEntries { + transactionId amount date - email comment - couponCode gdtEntryType factor - amount2 - factor2 gdt } gdtSum diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index a9c8a558f..fff400646 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -2,8 +2,8 @@