diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 75c07acf8..f95fec0b6 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -93,7 +93,9 @@ "show_all":"Alle {count} Transaktionen ansehen", "nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.", "more": "mehr", - "receiverNotFound":"Empfänger nicht gefunden" + "receiverNotFound":"Empfänger nicht gefunden", + "gdd-text":"Gradido Transaktionen", + "gdt-text":"Gradido Transform Transaktionen" }, "site": { "login": { @@ -164,5 +166,13 @@ "title": "Passwort zurücksetzen", "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst.", "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support." + }, + "gdt": { + "gdt-received":"Gradido Transform (GDT) erhalten", + "factor":"Factor", + "conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)", + "calculation":"Berechnung der Gradido Transform", + "conversion":"Umrechnung", + "formula":"Berechungsformel" } } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 7286c8153..1a6910f90 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -93,7 +93,9 @@ "show_all":"View all {count} transactions.", "nullTransactions":"You don't have any transactions on your account yet.", "more": "more", - "receiverNotFound":"Recipient not found" + "receiverNotFound":"Recipient not found", + "gdd-text":"Gradido Transactions", + "gdt-text":"Gradido Transform Transactions" }, "site": { "login": { @@ -165,5 +167,13 @@ "title": "Reset Password", "text": "Now you can save a new password to login to the Gradido-App in the future.", "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support." - } + }, + "gdt": { + "gdt-received": "Gradido Transform (GDT) received", + "factor": "Factor", + "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)", + "calculation": "Calculation of Gradido Transform", + "conversion": "Conversion", + "formula": "Calculation formula" + } } diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 9be7e3278..7ae44d5c8 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -145,76 +145,9 @@ export default { } }, async updateGdt() { - const result2 = await communityAPI.transactionsgdt(this.$store.state.sessionId) - console.log(' communityAPI.transactionsgdt') - console.log(result2.result) - console.log(result2.result.data.gdtEntries) - this.transactionsGdt = result2.result.data.gdtEntries - this.transactionGdtCount = result2.result.data.count -/* - this.transactionsGdt = - { - state: 'success', - gdt: [ - { - id: 8821, - amount: 1000, - date: '2021-08-05T14:12:00+00:00', - email: 'foerderkreis-1@gradido.org', - comment: null, - coupon_code: '', - gdt_entry_type_id: 4, - factor: '20.0000', - amount2: 0, - factor2: '0.0500', - gdt: 1000, - }, - { - id: 8810, - amount: 1500, - date: '2021-08-04T16:12:00+00:00', - email: 'eopage-gradido-foerderpaket@gradido.org', - comment: null, - coupon_code: '', - gdt_entry_type_id: 7, - factor: '15.0000', - amount2: 0, - factor2: '0.0500', - gdt: 1500, - }, - { - id: 8552, - amount: 1000, - date: '2021-06-03T14:12:00+00:00', - email: 'foerderkreis-1@gradido.org', - comment: null, - coupon_code: '', - gdt_entry_type_id: 4, - factor: '20.0000', - amount2: 0, - factor2: '0.0500', - gdt: 1000, - }, - { - id: 8317, - amount: 1000, - date: '2021-03-16T14:12:00+00:00', - email: 'foerderkreis-1@gradido.org', - comment: null, - coupon_code: '', - gdt_entry_type_id: 4, - factor: '20.0000', - amount2: 0, - factor2: '0.0500', - gdt: 1000, - }, - ], - transactionGdtExecutingCount: 4500, - count: 4, - } - */ - //this.transactionGdtCount = this.transactionsGdt.count - // console.log('transactionGdtCount', this.transactionGdtCount) + const result2 = await communityAPI.transactionsgdt(this.$store.state.sessionId) + this.transactionsGdt = result2.result.data.gdtEntries + this.transactionGdtCount = result2.result.data.count }, updateBalance(ammount) { this.balance -= ammount @@ -226,9 +159,3 @@ export default { }, } - diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js index 1c71b7f6c..fe616b200 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js @@ -119,15 +119,15 @@ describe('GddTransactionList', () => { }) it('shows the message of the transaction', () => { - expect(transaction.findAll('div').at(5).text()).toContain('Alles Gute zum Geburtstag') + expect(transaction.findAll('div').at(6).text()).toContain('Alles Gute zum Geburtstag') }) it('shows the date of the transaction', () => { - expect(transaction.findAll('div').at(8).text()).toContain('Tue May 25 2021') + expect(transaction.findAll('div').at(9).text()).toContain('Tue May 25 2021') }) it('shows the decay calculation', () => { - expect(transaction.findAll('div').at(9).text()).toContain('-0.5') + expect(transaction.findAll('div').at(10).text()).toContain('-0.5') }) }) diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 1e107fb91..3c8a20950 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -24,8 +24,10 @@ {{ $t('form.memo') }} -
-
+
+ {{ $t('form.date') }} +
+
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index a8e358140..be5744ee5 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -6,42 +6,153 @@ id, amount, date, - email, + /*email,*/ comment, - coupon_code, + /*coupon_code,*/ gdt_entry_type_id, factor, - amount2, - factor2, + /*amount2,*/ + /*factor2,*/ gdt, } in this.transactionsGdt" :key="id" > -
-
Gradido Transform (GDT) erhalten {{ comment ? ': '+comment : '' }}
+
+
+ {{ $t('gdt.gdt-received') }} {{ comment ? ': [' + comment + ']' : '' }} +
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
- + +
+ +
+ +
+
+
+ - + {{ $n(amount, 'decimal') }} +
+
+{{ $n(gdt, 'decimal') }}
+
-
{{ amount }} GDT * {{factor}} = {{gdt}}
-
{{ amount }} € ⊢ {{ gdt}} GDT
- - {{ id }} {{ amount }} {{ date }} {{ email }} {{ comment }} {{ coupon_code }} - {{ gdt_entry_type_id }} {{ factor }} {{ amount2 }} {{ factor2 }} {{ gdt }} - +
+ + {{ $t('form.memo') }} + +
+
+ {{ $t('form.date') }} +
+
+ {{ $t('gdt.factor') }} +
+
+ +
+
+
EURO
+
GDT
+
+ +
+ + {{ comment }} + +
+ +
+ {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} +
+ +
+ {{ factor }} +
+
+ +
+ + i + +
+
+ + + + +
+ {{ $t('gdt.conversion-gdt-euro') }} +
+
+ {{ $t('gdt.calculation') }} +
+ + + +
+
+
{{ $t('gdt.factor') }}
+
{{ $t('gdt.conversion') }}
+
+
+
{{ factor }}
+
{{ amount }} € ⊢ {{ gdt }} GDT
+
+
+
+ + + +
+
{{ $t('gdt.formula') }}:
+
{{ amount }} GDT * {{ factor }} = {{ gdt }}
+
+
+
+
+