diff --git a/community_server b/community_server
index d7a8adc09..36ddbba58 160000
--- a/community_server
+++ b/community_server
@@ -1 +1 @@
-Subproject commit d7a8adc0943d418ea2ba25efb39210e96d292291
+Subproject commit 36ddbba5815435575b2d3c1270d738ccabc9eb54
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 1f1c59223..a1dc02a68 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -125,7 +125,7 @@ export const store = new Vuex.Store({
axios.post("http://localhost/transaction-creations/ajaxCreate", state.ajaxCreateData).then((result) => {
- console.log("ajaxCreate result", result)
+ console.log("store ajaxCreate result", result)
if( result.success ){
// TODO
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index 4ad3e5ada..39dee08b9 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -14,22 +14,23 @@
-
-
+
+
+ -->
+
- this.$store.dispatch('ajaxCreate')
- this.$store.dispatch('ajaxListTransactions')
- this.$store.dispatch('accountBalance')
+
@@ -39,22 +40,19 @@
import GddStatus from './KontoOverview/GddStatus.vue';
import GddSent from './KontoOverview/GddSent.vue';
import GddTable from './KontoOverview/GddTable.vue';
- import GddAddWork from './KontoOverview/GddAddWork.vue';
- import GddWorkTable from './KontoOverview/GddWorkTable.vue';
+ //import GddAddWork from './KontoOverview/GddAddWork.vue';
+ // import GddWorkTable from './KontoOverview/GddWorkTable.vue';
export default {
components: {
GddStatus,
GddSent,
- GddTable,
- GddAddWork,
- GddWorkTable
+ GddTable
+ //GddAddWork
+ //GddWorkTable
},
- created() {
-
-
- this.$store.dispatch('accountBalance')
-
+ created() {
+ this.$store.dispatch('accountBalance')
},
};
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index 55ebc71b0..59fb55fde 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -8,7 +8,7 @@
- {{ row.detailsShowing ? $t('site.overview.table.hide') : $t('site.overview.table.view') }}
+ {{ row.detailsShowing ? $t('site.overview.table.hide') : $t('site.overview.table.view') }}
@@ -73,10 +73,10 @@ export default {
//console.log("result.count",result.data.count)
// console.log("result.gdtSum",result.data.gdtSum)
- // console.log("result.transactions",result.data.transactions)
+ console.log("result.transactions",result.data.transactions)
//commit('transactions', result.data.transactions)
this.$store.state.user.balance_gdt = result.data.gdtSum
- this.items = result.data.transactions
+ this.items = JSON.parse(result.data.transactions)
}, (error) => {
console.log(error);
diff --git a/login_server b/login_server
index 66dcb3a68..9b9115290 160000
--- a/login_server
+++ b/login_server
@@ -1 +1 @@
-Subproject commit 66dcb3a68397662c15729d559d64b4781a5e2f40
+Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693