From 053193dea24458c506b8d6cde4c836e9484c083d Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 09:48:05 +0100 Subject: [PATCH 1/6] send-gdd-sendmessage-step-one --- frontend/src/store/store.js | 18 ++++-- frontend/src/views/KontoOverview/GddSend.vue | 67 ++++++++++++++++++-- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 486b8a617..eadb6b1ed 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -22,7 +22,7 @@ export const store = new Vuex.Store({ session_id : '', email: "", amount: 0, - target_date:"2021-02-19T13:25:36+00:00", + target_date:"", memo:"", auto_sign: true }, @@ -137,24 +137,28 @@ export const store = new Vuex.Store({ }, ajaxCreate: async ({ dispatch, state }) => { //console.log('action: ajaxCreate') - state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 - const result = await communityAPI.create($cookies.get("gdd_session_id", email, amount, memo)) - console.log(result) + + state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 + + const result = await communityAPI.create(state.session_id, state.ajaxCreateData.email, state.ajaxCreateData.amount, state.ajaxCreateData.memo) + + return result + //console.log(result) }, ajaxListTransactions: async ({commit, dispatch, state}) => { // console.log('action: ajaxListTransactions', state.session_id) // const result = await communityAPI.transactions(state.session_id) }, accountBalance: async ({ commit, dispatch, state }) => { - console.log('action: accountBalance') + //console.log('action: accountBalance') // console.log('action: dispatch', dispatch) // console.log('action: state.session_id', state.session_id) // console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id") ) // commit('session_id', $cookies.get("gdd_session_id")) // commit('email', $cookies.get("gdd_u")) const result = await communityAPI.balance($cookies.get("gdd_session_id")) - console.log("accountBalance result", result) - console.log("aresult.result.data.balance", result.result.data.balance) + //console.log("accountBalance result", result) + //console.log("aresult.result.data.balance", result.result.data.balance) if(result.success) { commit('user_balance', result.result.data.balance) } else { diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index b6bd00e19..18f7f0bbe 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -1,7 +1,7 @@ @@ -151,12 +191,15 @@ export default { amount: '', memo:'' }, - sent: false, + send: false, + row_form: true, + row_check: false, + row_thx: false, } }, methods: { sendbutton(){ - this.sent = true + this.send = true }, async onDecode (decodedString) { console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) ) @@ -191,7 +234,18 @@ export default { this.$store.state.ajaxCreateData.memo = this.form.memo this.$store.state.ajaxCreateData.target_date = Date.now() - this.$store.dispatch('ajaxCreate') + this.row_form = false + this.row_check = true + this.row_thx = false + + + console.log(ref) + }, + sendTransaction() { + this.$store.dispatch('ajaxCreate') + this.row_form = false + this.row_check = false + this.row_thx = true }, onReset(event) { event.preventDefault() @@ -201,6 +255,9 @@ export default { this.$nextTick(() => { this.show = true }) + this.row_form = true + this.row_check = false + this.row_thx = false } }, computed: { From 39ba3a2386d563cad4a6eaf10ad80e9d2e18c313 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 10:57:19 +0100 Subject: [PATCH 2/6] fix-lint, remove href --- frontend/src/views/KontoOverview/GddSend.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index a373452a7..732fef4ac 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -157,7 +157,7 @@
Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!
- Meine Zahlung + Meine Zahlung {{ $store.state.ajaxCreateData.email }} Empfänger From 584526c1992024518988b6afbb440b6621909ceb Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 11:20:17 +0100 Subject: [PATCH 3/6] send form variable in store --- frontend/src/store/store.js | 3 + frontend/src/views/KontoOverview/GddSend.vue | 65 ++++++++++--------- .../src/views/KontoOverview/GddStatus.vue | 2 +- frontend/src/views/KontoOverview/GddTable.vue | 2 +- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index d8a474d40..01cc6ff10 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -13,6 +13,9 @@ export const store = new Vuex.Store({ sizeDE: 'normal', sizeGB: 'big', loginfail: false, + row_form: true, + row_check: false, + row_thx: false, user: { name: '', balance: 0, diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index 732fef4ac..eb265aaaa 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -1,6 +1,6 @@