IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1724 from gradido/1723-remembered-and-selected-accordingly-send-per-link

Browse Source 
transaction type remains when jumping from the verification back
This commit is contained in:
Alexander Friedland 2022-04-04 22:07:27 +02:00 committed by GitHub
commit 39f4be9606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/GddSend/TransactionForm.spec.js
View File

@ -68,7 +68,7 @@ describe('TransactionForm', () => {
}) })
it('has SEND_TYPES = send', () => { it('has SEND_TYPES = send', () => {
expect(wrapper.vm.selected).toBe(SEND_TYPES.send) expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send)
}) })
describe('transaction form', () => { describe('transaction form', () => {
@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`)
}) })
it('has SEND_TYPES = link', () => { it('has SEND_TYPES = link', () => {
expect(wrapper.vm.selected).toBe(SEND_TYPES.link) expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link)
}) })
it('has no input field of id input-group-1', () => { it('has no input field of id input-group-1', () => {

29
frontend/src/components/GddSend/TransactionForm.vue
View File

@ -6,28 +6,38 @@
<b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset"> <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
<b-row> <b-row>
<b-col> <b-col>
<b-form-radio v-model="selected" name="radios" :value="sendTypes.send" size="lg"> <b-form-radio
v-model="radioSelected"
name="radios"
:value="sendTypes.send"
size="lg"
>
{{ $t('send_gdd') }} {{ $t('send_gdd') }}
</b-form-radio> </b-form-radio>
</b-col> </b-col>
<b-col> <b-col>
<b-form-radio v-model="selected" name="radios" :value="sendTypes.link" size="lg"> <b-form-radio
v-model="radioSelected"
name="radios"
:value="sendTypes.link"
size="lg"
>
{{ $t('send_per_link') }} {{ $t('send_per_link') }}
</b-form-radio> </b-form-radio>
</b-col> </b-col>
</b-row> </b-row>
<div class="mt-4" v-if="selected === sendTypes.link"> <div class="mt-4" v-if="radioSelected === sendTypes.link">
<h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2> <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
<div> <div>
{{ $t('gdd_per_link.choose-amount') }} {{ $t('gdd_per_link.choose-amount') }}
</div> </div>
</div> </div>
<div v-if="selected === sendTypes.send"> <div v-if="radioSelected === sendTypes.send">
<validation-provider <validation-provider
name="Email" name="Email"
:rules="{ :rules="{
required: selected === sendTypes.send ? true : false, required: radioSelected === sendTypes.send ? true : false,
email: true, email: true,
is_not: $store.state.email, is_not: $store.state.email,
}" }"
@ -134,7 +144,9 @@
</b-col> </b-col>
<b-col class="text-right"> <b-col class="text-right">
<b-button type="submit" variant="success"> <b-button type="submit" variant="success">
{{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} {{
radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now')
}}
</b-button> </b-button>
</b-col> </b-col>
</b-row> </b-row>
@ -159,6 +171,7 @@ export default {
email: { type: String, default: '' }, email: { type: String, default: '' },
amount: { type: Number, default: 0 }, amount: { type: Number, default: 0 },
memo: { type: String, default: '' }, memo: { type: String, default: '' },
selected: { type: String, default: 'send' },
}, },
inject: ['getTunneledEmail'], inject: ['getTunneledEmail'],
data() { data() {
@ -171,14 +184,14 @@ export default {
memo: this.memo, memo: this.memo,
amountValue: 0.0, amountValue: 0.0,
}, },
selected: SEND_TYPES.send, radioSelected: this.selected,
} }
}, },
methods: { methods: {
onSubmit() { onSubmit() {
this.normalizeAmount(true) this.normalizeAmount(true)
this.$emit('set-transaction', { this.$emit('set-transaction', {
selected: this.selected, selected: this.radioSelected,
email: this.form.email, email: this.form.email,
amount: this.form.amountValue, amount: this.form.amountValue,
memo: this.form.memo, memo: this.form.memo,