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

vergessen

Browse Source
This commit is contained in:
ogerly 2021-03-31 14:23:26 +02:00
parent 6718759696
commit 4e48740608
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/src/store/store.js
View File

@ -121,33 +121,6 @@ export const store = new Vuex.Store({
$cookies.remove('gdd_lang')
router.push('/Login')
},
<<<<<<< HEAD
ajaxCreate: async ({ dispatch, state }) => {
//console.log('action: ajaxCreate')
state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000
const result = await communityAPI.send(
state.session_id,
state.ajaxCreateData.email,
state.ajaxCreateData.amount,
state.ajaxCreateData.memo,
)
//console.log(result)
if (result.success) {
//console.log('send success')
} else {
//console.log('send error')
}
return result
},
ajaxListTransactions: async ({ commit, dispatch, state }) => {
// console.log('action: ajaxListTransactions', state.session_id)
// const result = await communityAPI.transactions(state.session_id)
},
=======
>>>>>>> master
accountBalance: async ({ commit, dispatch, state }) => {
const result = await communityAPI.balance($cookies.get('gdd_session_id'))
if (result.success) {

22
frontend/src/views/KontoOverview/GddSend.vue
View File

@ -138,7 +138,6 @@
<b-list-group>
<b-list-group-item class="d-flex justify-content-between align-items-center">
<<<<<<< HEAD
{{ $store.state.ajaxCreateData.email }}
<b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
</b-list-group-item>
@ -155,24 +154,6 @@
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
<b-badge variant="primary" pill>{{ $t('form.date') }}</b-badge>
=======
{{ ajaxCreateData.email }}
<b-badge variant="primary" pill>Empfänger</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ ajaxCreateData.amount }} GDD
<b-badge variant="primary" pill>Betrag</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ ajaxCreateData.memo }}
<b-badge variant="primary" pill>Nachricht</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $moment(ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
<b-badge variant="primary" pill>Datum</b-badge>
>>>>>>> master
</b-list-group-item>
</b-list-group>
<hr />
@ -243,10 +224,7 @@ export default {
computed: {},
methods: {
async onDecode(decodedString) {
<<<<<<< HEAD
//console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
=======
>>>>>>> master
const arr = JSON.parse(decodedString)
this.form.email = arr[0].email
this.form.amount = arr[0].amount