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

Send transaction confirm, new amount structured

Browse Source
This commit is contained in:
ogerly 2021-12-14 11:22:30 +01:00
parent 8d88e72246
commit 00c2c85306
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/locales/de.json
View File

@ -54,7 +54,7 @@
"amount": "Betrag",
"your_amount": "Dein Betrag",
"current_balance": "aktueller Kontostand",
"new_balance": "neuer Kontostand",
"new_balance": "neuer Kontostand nach Bestätigung",
"at": "am",
"cancel": "Abbrechen",
"close": "schließen",

2
frontend/src/locales/en.json
View File

@ -54,7 +54,7 @@
"amount": "Amount",
"your_amount": "Your amount",
"current_balance": "current balance",
"new_balance": "new balance",
"new_balance": "account balance after confirmation",
"at": "at",
"cancel": "Cancel",
"close": "Close",

11
frontend/src/views/Pages/SendOverview.vue
View File

@ -1,13 +1,7 @@
<template>
<div>
<b-container>
<b-row>
<b-col class="bg-gray text-white text-center p-3">
<status class="gdd-status-gdd" :pending="pending" :balance="balance" status-text="GDD" />
</b-col>
</b-row>
<br />
<gdd-send :currentTransactionStep="currentTransactionStep">
<gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3">
<template #transaction-form>
<transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
</template>
@ -37,6 +31,7 @@
</template>
<script>
import GddSend from './SendOverview/GddSend.vue'
import Status from '../../components/Status.vue'
import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
@ -52,7 +47,7 @@ export default {
name: 'SendOverview',
components: {
GddSend,
Status,
TransactionForm,
TransactionConfirmation,
TransactionResult,

39
frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
View File

@ -5,7 +5,7 @@
<div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
<b-list-group class="">
<label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
<b-input-group id="input-group-1" class="border border-default" size="lg">
<b-input-group id="input-group-1" class="borderbottom" size="lg">
<b-input-group-prepend class="d-none d-md-block gray-background">
<b-icon icon="envelope" class="display-4 m-3"></b-icon>
</b-input-group-prepend>
@ -13,7 +13,7 @@
</b-input-group>
<br />
<label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
<b-input-group id="input-group-2" class="border border-default" size="lg">
<b-input-group id="input-group-2" class="borderbottom" size="lg">
<b-input-group-prepend class="p-2 d-none d-md-block gray-background">
<div class="m-1 mt-2">GDD</div>
</b-input-group-prepend>
@ -23,7 +23,7 @@
<br />
<label class="input-3" for="input-3">{{ $t('form.message') }}</label>
<b-input-group id="input-group-3" class="border border-default">
<b-input-group id="input-group-3" class="borderbottom">
<b-input-group-prepend class="d-none d-md-block gray-background">
<b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
</b-input-group-prepend>
@ -34,30 +34,26 @@
</b-row>
<b-container class="bv-example-row mt-3 gray-background p-2">
<b-row>
<b-col></b-col>
<b-col>{{ $t('form.current_balance') }}</b-col>
<b-col>{{ $n(balance, 'decimal') }}</b-col>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
<b-col class="text-right">{{ $n(balance, 'decimal') }}</b-col>
</b-row>
<b-row>
<b-col></b-col>
<b-col>
<b-row class="pr-3">
<b-col class="text-right">
<strong>{{ $t('form.your_amount') }}</strong>
</b-col>
<b-col>
<b-col class="text-right">
<strong>- {{ $n(amount, 'decimal') }}</strong>
</b-col>
</b-row>
<b-row>
<b-col></b-col>
<b-col>{{ $t('decay.decay') }}</b-col>
<b-col style="border-bottom: double">- {{ $n(decay, 'decimal') }}</b-col>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('decay.decay') }}</b-col>
<b-col class="text-right" style="border-bottom: double">- {{ $n(decay, 'decimal') }}</b-col>
</b-row>
<b-row>
<b-col></b-col>
<b-col>{{ $t('form.new_balance') }}</b-col>
<b-col>~ {{ $n(balance - amount - decay, 'decimal') }}</b-col>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
<b-col class="text-right">~ {{ $n(balance - amount - decay, 'decimal') }}</b-col>
</b-row>
</b-container>
@ -95,6 +91,9 @@ export default {
</script>
<style>
.gray-background {
background-color: #ebebeba3 !important;
background-color: #ecebe6a3 !important;
}
.borderbottom {
border-bottom: 1px solid rgb(70, 65, 65);
}
</style>