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

gdt transaction header change

Browse Source
This commit is contained in:
ogerly 2021-08-12 11:38:57 +02:00
parent 392271011f
commit 151acea108
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/DecayInformation.vue
View File

@ -19,7 +19,7 @@
<div v-if="!decay.decay_start_block">{{ $t('decay.last_transaction') }}</div> <div v-if="!decay.decay_start_block">{{ $t('decay.last_transaction') }}</div>
</div> </div>
<div style="width: 60%"> <div style="width: 60%">
<div v-if="decay.decay_start_block > 0"> <div v-if="decay.decay_start_block">
<div class="display-4">{{ $t('decay.Starting_block_decay') }}</div> <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
<div> <div>
{{ $t('decay.decay_introduced') }} : {{ $t('decay.decay_introduced') }} :
@ -35,12 +35,12 @@
</div> </div>
</div> </div>
<div class="d-flex" v-if="!decay.decay_start_block"> <div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2"> <div style="width: 40%" class="text-right pr-3 mr-2">
{{ $t('decay.past_time') }} <div v-if="!decay.decay_start_block">{{ $t('decay.past_time') }}</div>
</div> </div>
<div style="width: 60%"> <div style="width: 60%">
<div>{{ $t('decay.since_introduction') }}</div> <div v-if="decay.decay_start_block">{{ $t('decay.since_introduction') }}</div>
<span v-if="duration"> <span v-if="duration">
<span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span> <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
<span v-if="duration.months > 0"> <span v-if="duration.months > 0">

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

@ -178,8 +178,8 @@
"formula":"Berechungsformel", "formula":"Berechungsformel",
"no-transactions":"Du hast zur Zeit keine Transaktionen", "no-transactions":"Du hast zur Zeit keine Transaktionen",
"publisher":"Dein geworbenes Mitglied hat gespendet.", "publisher":"Dein geworbenes Mitglied hat gespendet.",
"gdt-receive":"GDT erhalten", "gdt-receive":"Aktion",
"your-share":"Dein Anteil", "your-share":"Geworbenes Mitglied",
"donation":"Spende" "donation":"Spende"
} }
} }

20
frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
View File

@ -34,42 +34,40 @@
<b-row v-if="gdt_entry_type_id === 7"> <b-row v-if="gdt_entry_type_id === 7">
<div class="col-6 text-right"> <div class="col-6 text-right">
<div>{{ $t('gdt.gdt-receive') }}</div> <div>{{ $t('gdt.gdt-receive') }}</div>
<div>{{ $n(gdt, 'decimal') }}</div> <div>Gutschrift</div>
</div> </div>
<div class="col-6"> <div class="col-6">
<div>---</div> <div>{{ comment }}</div>
<div>GDT</div> <div>{{ $n(gdt, 'decimal') }} GDT</div>
</div> </div>
</b-row> </b-row>
<!--4 publisher --> <!--4 publisher -->
<b-row v-else-if="gdt_entry_type_id === 4"> <b-row v-else-if="gdt_entry_type_id === 4">
<div class="col-6 text-right"> <div class="col-6 text-right">
<div>{{ $t('gdt.your-share') }}</div> <div>{{ $t('gdt.your-share') }}</div>
<div>{{ $n(amount, 'decimal') }}</div> <div>Gutschrift</div>
</div> </div>
<div class="col-6"> <div class="col-6">
<div>5%</div> <div>5%</div>
<div>GDT</div> <div>{{ $n(amount, 'decimal') }} GDT</div>
</div> </div>
</b-row> </b-row>
<!-- 1, 2, 3, 5, 6 spenden in euro --> <!-- 1, 2, 3, 5, 6 spenden in euro -->
<b-row v-else> <b-row v-else>
<div class="col-6 text-right"> <div class="col-6 text-right">
<div>{{ $t('gdt.donation') }}</div> <div>{{ $t('gdt.donation') }}</div>
<div>{{ $n(amount, 'decimal') }}</div> <div>Gutschrift</div>
<div>{{ $n(gdt, 'decimal') }}</div>
</div> </div>
<div class="col-6"> <div class="col-6">
<div>---</div> <div>{{ $n(amount, 'decimal') }} €</div>
<div>EURO</div> <div>{{ $n(gdt, 'decimal') }} GDT</div>
<div>GDT</div>
</div> </div>
</b-row> </b-row>
<!-- Betrag ENDE--> <!-- Betrag ENDE-->
<!-- Nachricht--> <!-- Nachricht-->
<b-row v-if="comment"> <b-row v-if="comment && gdt_entry_type_id !== 7">
<div class="col-6 text-right"> <div class="col-6 text-right">
{{ $t('form.memo') }} {{ $t('form.memo') }}
</div> </div>