diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js index 4b26c18bf..aa0ed2486 100644 --- a/frontend/src/routes/router.js +++ b/frontend/src/routes/router.js @@ -1,7 +1,6 @@ import Vue from 'vue' import VueRouter from 'vue-router' import routes from './routes' -import {store} from '../store/store'; Vue.use(VueRouter) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 08b293a7d..1b8c18426 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -95,9 +95,9 @@ export const store = new Vuex.Store({ }, ajaxCreate: async ({ dispatch, state }) => { console.log('action: ajaxCreate') - console.log(state) + console.log(state.ajaxCreateData) const result = await communityAPI.create( - state.session_id, + state.ajaxCreateData.session_id, state.ajaxCreateData.email, state.ajaxCreateData.amount, state.ajaxCreateData.memo, diff --git a/frontend/src/views/KontoOverview/GddSent.vue b/frontend/src/views/KontoOverview/GddSent.vue index c94a48729..e9e5511fa 100644 --- a/frontend/src/views/KontoOverview/GddSent.vue +++ b/frontend/src/views/KontoOverview/GddSent.vue @@ -7,73 +7,111 @@ {{ $t('site.overview.send_gradido') }} - -

+ + +

- - + - - - + + + + + + - - - - - - - - scan jetzt - - - - + + + QR Code Scanner - Scanne den QR Code deines Partners + + + + abrechen! + + + + + + +
+ + +
- +
- + description="We'll never share your email with anyone else." + size="lg" + class="mb-3" + > + + + + - - - Adressbuch - - + :rules="{required: true, email: true}" + required + style="font-size: xx-large; padding-left:20px">

- - - .

GDD.

- + + + + + + + + + + + +
GDD
+
+
+
+ + + + + +

+
+
+ +
+

jetzt versenden Cancel
-

+
+
@@ -100,8 +138,8 @@ export default { form: { img: '', email: '', - amount1: '', - amount2: '' + amount: '', + memo:'' } } }, @@ -135,28 +173,31 @@ export default { // ... } }, - onSubmit(event) { - event.preventDefault() - alert(JSON.stringify(this.form)) - this.modal = true - this.modal.h4 = 'TODO 1' + async onSubmit() { + //event.preventDefault() + console.log("onSubmit", this.form) + console.log("this.form.img", this.form.img) + console.log("this.form.email", this.form.email) + console.log("this.form.amount", this.form.amount) + console.log("this.form.memo", this.form.memo) + + this.$store.state.ajaxCreateData.session_id = this.$cookies.get('gdd_session_id'), + this.$store.state.ajaxCreateData.email = this.form.email, + this.$store.state.ajaxCreateData.amount = this.form.amount, + this.$store.state.ajaxCreateData.memo = this.form.memo, + + this.$store.dispatch('ajaxCreate') }, onReset(event) { event.preventDefault() // Reset our form values this.form.email = '' - this.form.amount1 = '' - this.form.amount2 = '' + this.form.amount = '' // Trick to reset/clear native browser form validation state this.show = false this.$nextTick(() => { this.show = true }) - }, - adressbook() { - this.modal = true - this.modaldata.h4 = 'Adressbuch' - this.modaldata.p = 'TODO ADRESSBUCH LISTE' } }, computed: { diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index 87825d232..85f42a12a 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -5,24 +5,21 @@ {{ balance_gdd }} GDD - -