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

resolve conflict

Browse Source
This commit is contained in:
ogerly 2022-04-12 16:19:40 +02:00
parent f625681c51
commit 841cf2514f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/pages/Transactions.vue
View File

@ -1,11 +1,7 @@
<template>
<div class="pb-4">
<b-tabs content-class="" justified>
<b-tab
:title="`Gradido (${$n(balance, 'decimal')} GDD)`"
class="px-4"
@click="showGdtBalance(false)"
>
<b-tab :title="`Gradido (${$n(balance, 'decimal')} GDD)`" class="px-4">
<p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
<gdd-transaction-list
@ -20,9 +16,11 @@
/>
</b-tab>
<b-tab :title="titel_gdt" class="px-4" @click="showGdtBalance(true)">
<p class="">{{ $t('transaction.gdt-text') }}</p>
<b-tab :title="titel_gdt" class="px-4">
<b-row class="mb-3">
<b-col>{{ $t('transaction.gdt-text') }}</b-col>
<b-col class="text-right">{{ $n(GdtBalance, 'decimal') }} GDT</b-col>
</b-row>
<gdt-transaction-list />
</b-tab>
</b-tabs>
@ -58,6 +56,7 @@ export default {
updateTransactions(pagination) {
this.$emit('update-transactions', pagination)
},
<<<<<<< HEAD
showGdtBalance(boolean) {
if (Boolean) {
this.titel_gdt += `( ${
@ -67,6 +66,8 @@ export default {
this.titel_gdt = this.$t('gdt.gdt')
}
},
=======
>>>>>>> 183eb0bbf (remove function from tab)
},
}
</script>