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 branch '2531-Sending-GDD-does-not-work' into 2535-editing-transaction-does-not-work

Browse Source
This commit is contained in:
ogerly 2023-01-11 10:16:24 +01:00
commit ddc1558ada
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/GddSend/TransactionConfirmationLink.vue
View File

@ -37,7 +37,7 @@
</b-row> </b-row>
<b-row class="mt-5 p-5"> <b-row class="mt-5 p-5">
<b-col> <b-col>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button> <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
</b-col> </b-col>
<b-col class="text-right"> <b-col class="text-right">
<b-button <b-button

2
frontend/src/components/GddSend/TransactionConfirmationSend.vue
View File

@ -41,7 +41,7 @@
</b-row> </b-row>
<b-row class="mt-5 p-5"> <b-row class="mt-5 p-5">
<b-col> <b-col>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button> <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
</b-col> </b-col>
<b-col class="text-right"> <b-col class="text-right">
<b-button <b-button

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

@ -322,7 +322,7 @@ Die ganze Welt bezwingen.“`)
[ [
{ {
email: 'someone@watches.tv', email: 'someone@watches.tv',
amount: '87.23', amount: 87.23,
memo: 'Long enough', memo: 'Long enough',
selected: 'send', selected: 'send',
}, },

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

@ -144,7 +144,7 @@ export default {
this.$emit('set-transaction', { this.$emit('set-transaction', {
selected: this.radioSelected, selected: this.radioSelected,
email: this.form.email, email: this.form.email,
amount: this.form.amount, amount: Number(this.form.amount.replace(',', '.')),
memo: this.form.memo, memo: this.form.memo,
}) })
}, },

2
frontend/src/components/GddSend/TransactionResultLink.vue
View File

@ -10,7 +10,7 @@
<div class="text-center"> <div class="text-center">
<div><figure-qr-code :link="link" /></div> <div><figure-qr-code :link="link" /></div>
<div> <div>
<b-button variant="secondary" @click="$emit('on-reset')" class="mt-4" data-test="close-btn"> <b-button variant="secondary" @click="$emit('on-back')" class="mt-4" data-test="close-btn">
{{ $t('form.close') }} {{ $t('form.close') }}
</b-button> </b-button>
</div> </div>

2
frontend/src/components/GddSend/TransactionResultSendSuccess.vue
View File

@ -6,7 +6,7 @@
{{ $t('form.send_transaction_success') }} {{ $t('form.send_transaction_success') }}
</div> </div>
<div class="text-center mt-5"> <div class="text-center mt-5">
<b-button variant="primary" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button> <b-button variant="primary" @click="$emit('on-back')">{{ $t('form.close') }}</b-button>
</div> </div>
</div> </div>
</template> </template>

13
frontend/src/pages/Send.vue
View File

@ -15,7 +15,7 @@
:amount="transactionData.amount" :amount="transactionData.amount"
:memo="transactionData.memo" :memo="transactionData.memo"
@send-transaction="sendTransaction" @send-transaction="sendTransaction"
@on-reset="onReset" @on-back="onBack"
></transaction-confirmation-send> ></transaction-confirmation-send>
</template> </template>
<template #transactionConfirmationLink> <template #transactionConfirmationLink>
@ -26,17 +26,17 @@
:memo="transactionData.memo" :memo="transactionData.memo"
:loading="loading" :loading="loading"
@send-transaction="sendTransaction" @send-transaction="sendTransaction"
@on-reset="onReset" @on-back="onBack"
></transaction-confirmation-link> ></transaction-confirmation-link>
</template> </template>
<template #transactionResultSendSuccess> <template #transactionResultSendSuccess>
<transaction-result-send-success @on-reset="onReset"></transaction-result-send-success> <transaction-result-send-success @on-back="onBack"></transaction-result-send-success>
</template> </template>
<template #transactionResultSendError> <template #transactionResultSendError>
<transaction-result-send-error <transaction-result-send-error
:error="error" :error="error"
:errorResult="errorResult" :errorResult="errorResult"
@on-reset="onReset" @on-back="onBack"
></transaction-result-send-error> ></transaction-result-send-error>
</template> </template>
<template #transactionResultLink> <template #transactionResultLink>
@ -45,7 +45,7 @@
:amount="amount" :amount="amount"
:memo="memo" :memo="memo"
:validUntil="validUntil" :validUntil="validUntil"
@on-reset="onReset" @on-back="onBack"
></transaction-result-link> ></transaction-result-link>
</template> </template>
</gdd-send> </gdd-send>
@ -169,8 +169,9 @@ export default {
} }
this.loading = false this.loading = false
}, },
onReset() { onBack() {
this.currentTransactionStep = TRANSACTION_STEPS.transactionForm this.currentTransactionStep = TRANSACTION_STEPS.transactionForm
this.$mount()
}, },
updateTransactions(pagination) { updateTransactions(pagination) {
this.$emit('update-transactions', pagination) this.$emit('update-transactions', pagination)