diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 08e03c5b7..c7d06fcbe 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,4 +6,4 @@ title: 🐛 [Bug]
---
## 🐛 Bugreport
-
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e3868124c..363b8fbc6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -42,12 +42,12 @@
"scann_code":"QR Code Scanner - Scanne den QR Code deines Partners",
"max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
"send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
- "thx":"Danke!",
- "send_success":"Deine Zahlung wurde erfolgreich versendet."
+ "thx":"Danke,",
+ "send_success":"deine Transaktion wurde erfolgreich ausgeführt"
},
"transaction":{
- "show_part": "Die letzten {count} Transaktionen",
"show_all":"Alle {count} Transaktionen ansehen",
+ "nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.",
"more": "mehr"
},
"site": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 521f68f0d..6f9a790d9 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -42,12 +42,12 @@
"scann_code":"QR Code Scanner - Scanne den QR Code deines Partners",
"max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
"send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
- "thx":"THX",
- "send_success":"Deine Zahlung wurde erfolgreich versendet."
+ "thx":"Thank you,",
+ "send_success":"your transaction was successfully completed"
},
"transaction":{
"show_part": "The last {count} transactions",
- "show_all":"View all {count} transactions",
+ "nullTransactions":"You don't have any transactions on your account yet.",
"more": "more"
},
"site": {
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index cb1e0eeba..236cc15af 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -9,7 +9,7 @@ const routes = [
},
{
path: '/overview',
- component: () => import('../views/Pages/KontoOverview.vue'),
+ component: () => import('../views/Pages/AccountOverview.vue'),
meta: {
requiresAuth: true,
},
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 79270493a..5fc696574 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -31,7 +31,9 @@
@@ -76,6 +78,7 @@ export default {
return {
balance: 0,
GdtBalance: 0,
+ transactions: [],
}
},
methods: {
@@ -99,10 +102,11 @@ export default {
// what to do when loading balance fails?
}
},
- async loadGDTBalance() {
+ async updateTransactions() {
const result = await communityAPI.transactions(this.$store.state.session_id)
if (result.success) {
this.GdtBalance = result.result.data.gdtSum / 10000
+ this.transactions = result.result.data.transactions
} else {
// what to do when loading balance fails?
}
@@ -116,7 +120,7 @@ export default {
},
created() {
this.loadBalance()
- this.loadGDTBalance()
+ this.updateTransactions()
},
}
diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js
similarity index 77%
rename from frontend/src/views/Pages/KontoOverview.spec.js
rename to frontend/src/views/Pages/AccountOverview.spec.js
index b0385cbc3..668521cf6 100644
--- a/frontend/src/views/Pages/KontoOverview.spec.js
+++ b/frontend/src/views/Pages/AccountOverview.spec.js
@@ -1,9 +1,9 @@
import { shallowMount } from '@vue/test-utils'
-import KontoOverview from './KontoOverview'
+import AccountOverview from './AccountOverview'
const localVue = global.localVue
-describe('KontoOverview', () => {
+describe('AccountOverview', () => {
let wrapper
let mocks = {
@@ -11,7 +11,7 @@ describe('KontoOverview', () => {
}
const Wrapper = () => {
- return shallowMount(KontoOverview, { localVue, mocks })
+ return shallowMount(AccountOverview, { localVue, mocks })
}
describe('shallow Mount', () => {
@@ -35,12 +35,6 @@ describe('KontoOverview', () => {
expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy()
})
- it('updates transctions data when change-transactions is emitted', async () => {
- wrapper.find('gdd-table-stub').vm.$emit('change-transactions', [0, 1])
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.transactions).toEqual(expect.arrayContaining([0, 1]))
- })
-
describe('updateBalance method', () => {
beforeEach(async () => {
wrapper.find('gdd-send-stub').vm.$emit('update-balance', {
diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
similarity index 66%
rename from frontend/src/views/Pages/KontoOverview.vue
rename to frontend/src/views/Pages/AccountOverview.vue
index e05a6236d..5f032a4f8 100644
--- a/frontend/src/views/Pages/KontoOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -2,11 +2,7 @@
-
+
-
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index 9282dd574..b14670e21 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -36,7 +36,7 @@
- {{ $n(this.$store.state.user.balance) }}
+ {{ $n(balance) }}
GDD
@@ -60,6 +60,9 @@ export default {
components: {
VueQrcode,
},
+ props: {
+ balance: { type: Number, default: 0 },
+ },
}
diff --git a/frontend/src/views/Pages/UserProfileActivity.vue b/frontend/src/views/Pages/UserProfileActivity.vue
index 637837f70..6d69bc162 100644
--- a/frontend/src/views/Pages/UserProfileActivity.vue
+++ b/frontend/src/views/Pages/UserProfileActivity.vue
@@ -31,8 +31,8 @@
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 2033a189a..3610ea76b 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -7,19 +7,32 @@
-
+
+
+ {{ $t('transaction.nullTransactions') }}
+