IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable

Browse Source
This commit is contained in:
Alexander Friedland 2022-04-05 09:43:09 +02:00 committed by GitHub
commit 066f898805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 343 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md
View File

@ -4,8 +4,27 @@ All notable changes to this project will be documented in this file. Dates are d
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### [1.7.1](https://github.com/gradido/gradido/compare/1.7.0...1.7.1)
- fix: Localize Dates on Redeem Transaction Link Page [`#1720`](https://github.com/gradido/gradido/pull/1720)
- fix: Round Virtual Transaction Link Transaction [`#1718`](https://github.com/gradido/gradido/pull/1718)
- larger icon and deacy information if center [`#1719`](https://github.com/gradido/gradido/pull/1719)
- Fix: restore script load correct .env [`#1717`](https://github.com/gradido/gradido/pull/1717)
- fix-disbled-button-if-totalBalance [`#1716`](https://github.com/gradido/gradido/pull/1716)
- icon droplet-halflarger and correctly positioned [`#1713`](https://github.com/gradido/gradido/pull/1713)
- fix: Clean up Registration Flow [`#1709`](https://github.com/gradido/gradido/pull/1709)
- 1703 submit button disabled when total amount to submit is minus [`#1705`](https://github.com/gradido/gradido/pull/1705)
- add extra disabled variable for send emit, disabled send by emit [`#1704`](https://github.com/gradido/gradido/pull/1704)
- Fix: Correct calculation of decay [`#1699`](https://github.com/gradido/gradido/pull/1699)
- Fix: Allow sending of more then half of my wealth via link [`#1700`](https://github.com/gradido/gradido/pull/1700)
- feat: Seed Creations Months Ago From Now [`#1702`](https://github.com/gradido/gradido/pull/1702)
- Fix: Frontend show proper error message on failed send [`#1701`](https://github.com/gradido/gradido/pull/1701)
#### [1.7.0](https://github.com/gradido/gradido/compare/1.6.6...1.7.0)
> 30 March 2022
- v1.7.0 [`#1698`](https://github.com/gradido/gradido/pull/1698)
- folder for new style images [`#1694`](https://github.com/gradido/gradido/pull/1694)
- fix: No Email Exposed on Forgot Password [`#1696`](https://github.com/gradido/gradido/pull/1696)
- fix: No Decay Calculation in Frontend [`#1692`](https://github.com/gradido/gradido/pull/1692)

2
admin/package.json
View File

@ -3,7 +3,7 @@
"description": "Administraion Interface for Gradido",
"main": "index.js",
"author": "Moriz Wahl",
"version": "1.7.0",
"version": "1.7.1",
"license": "MIT",
"private": false,
"scripts": {

2
backend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido-backend",
"version": "1.7.0",
"version": "1.7.1",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",

17
backend/src/graphql/model/Transaction.ts
View File

@ -12,15 +12,22 @@ export class Transaction {
this.user = user
this.previous = transaction.previous
this.typeId = transaction.typeId
this.amount = transaction.amount
this.balance = transaction.balance
this.amount = transaction.amount.toDecimalPlaces(2, Decimal.ROUND_DOWN)
this.balance = transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
this.balanceDate = transaction.balanceDate
if (!transaction.decayStart) {
this.decay = new Decay(transaction.balance, new Decimal(0), null, null, null)
// TODO: hot fix, we should separate decay calculation from decay graphql model
this.decay = new Decay(
transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
new Decimal(0),
null,
null,
null,
)
} else {
this.decay = new Decay(
transaction.balance,
transaction.decay,
transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
transaction.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
transaction.decayStart,
transaction.balanceDate,
Math.round((transaction.balanceDate.getTime() - transaction.decayStart.getTime()) / 1000),

18
backend/src/graphql/resolver/BalanceResolver.ts
View File

@ -54,19 +54,23 @@ export class BalanceResolver {
},
})
// The decay is always calculated on the last booked transaction
const calculatedDecay = calculateDecay(
lastTransaction.balance,
lastTransaction.balanceDate,
now,
)
// The final balance is reduced by the link amount withheld
const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
const { sumHoldAvailableAmount } = context.sumHoldAvailableAmount
? { sumHoldAvailableAmount: context.sumHoldAvailableAmount }
: await transactionLinkRepository.summary(user.id, now)
const calculatedDecay = calculateDecay(
lastTransaction.balance.minus(sumHoldAvailableAmount.toString()),
lastTransaction.balanceDate,
now,
)
return new Balance({
balance: calculatedDecay.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN), // round towards zero
balance: calculatedDecay.balance
.minus(sumHoldAvailableAmount.toString())
.toDecimalPlaces(2, Decimal.ROUND_DOWN), // round towards zero
decay: calculatedDecay.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR), // round towards - infinity
lastBookedBalance: lastTransaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
balanceGDT,

12
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -57,7 +57,12 @@ export const executeTransaction = async (
// validate amount
const receivedCallDate = new Date()
const sendBalance = await calculateBalance(sender.id, amount.mul(-1), receivedCallDate)
const sendBalance = await calculateBalance(
sender.id,
amount.mul(-1),
receivedCallDate,
transactionLink,
)
if (!sendBalance) {
throw new Error("user hasn't enough GDD or amount is < 0")
}
@ -198,12 +203,15 @@ export class TransactionResolver {
// decay & link transactions
if (currentPage === 1 && order === Order.DESC) {
// The virtual decay is always on the booked amount, not including the generated, not yet booked links,
// since the decay is substantially different when the amount is less
transactions.push(
virtualDecayTransaction(
lastTransaction.balance.minus(sumHoldAvailableAmount.toString()),
lastTransaction.balance,
lastTransaction.balanceDate,
now,
self,
sumHoldAvailableAmount,
),
)
// virtual transaction for pending transaction-links sum

2
backend/src/seeds/creation/CreationInterface.ts
View File

@ -4,4 +4,6 @@ export interface CreationInterface {
memo: string
creationDate: string
confirmed?: boolean
// number of months to move the confirmed creation to the past
moveCreationDate?: number
}

13
backend/src/seeds/creation/index.ts
View File

@ -1,29 +1,28 @@
import { CreationInterface } from './CreationInterface'
const lastMonth = (date: Date): string => {
return new Date(date.getFullYear(), date.getMonth() - 1, 1).toISOString()
}
import { nMonthsBefore } from '../factory/creation'
export const creations: CreationInterface[] = [
{
email: 'bibi@bloxberg.de',
amount: 1000,
memo: 'Herzlich Willkommen bei Gradido!',
creationDate: lastMonth(new Date()),
creationDate: nMonthsBefore(new Date()),
confirmed: true,
moveCreationDate: 12,
},
{
email: 'bob@baumeister.de',
amount: 1000,
memo: 'Herzlich Willkommen bei Gradido!',
creationDate: lastMonth(new Date()),
creationDate: nMonthsBefore(new Date()),
confirmed: true,
moveCreationDate: 8,
},
{
email: 'raeuber@hotzenplotz.de',
amount: 1000,
memo: 'Herzlich Willkommen bei Gradido!',
creationDate: lastMonth(new Date()),
creationDate: nMonthsBefore(new Date()),
confirmed: true,
},
]

21
backend/src/seeds/factory/creation.ts
View File

@ -6,9 +6,14 @@ import { login } from '@/seeds/graphql/queries'
import { CreationInterface } from '@/seeds/creation/CreationInterface'
import { ApolloServerTestClient } from 'apollo-server-testing'
import { User } from '@entity/User'
import { Transaction } from '@entity/Transaction'
import { AdminPendingCreation } from '@entity/AdminPendingCreation'
// import CONFIG from '@/config/index'
export const nMonthsBefore = (date: Date, months = 1): string => {
return new Date(date.getFullYear(), date.getMonth() - months, 1).toISOString()
}
export const creationFactory = async (
client: ApolloServerTestClient,
creation: CreationInterface,
@ -34,5 +39,21 @@ export const creationFactory = async (
})
await mutate({ mutation: confirmPendingCreation, variables: { id: pendingCreation.id } })
if (creation.moveCreationDate) {
const transaction = await Transaction.findOneOrFail({
where: { userId: user.id, creationDate: new Date(creation.creationDate) },
order: { balanceDate: 'DESC' },
})
if (transaction.decay.equals(0) && transaction.creationDate) {
transaction.creationDate = new Date(
nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
)
transaction.balanceDate = new Date(
nMonthsBefore(transaction.balanceDate, creation.moveCreationDate),
)
await transaction.save()
}
}
}
}

10
backend/src/util/validate.ts
View File

@ -4,6 +4,7 @@ import { Transaction } from '@entity/Transaction'
import { Decay } from '@model/Decay'
import { getCustomRepository } from '@dbTools/typeorm'
import { TransactionLinkRepository } from '@repository/TransactionLink'
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
function isStringBoolean(value: string): boolean {
const lowerValue = value.toLowerCase()
@ -21,6 +22,7 @@ async function calculateBalance(
userId: number,
amount: Decimal,
time: Date,
transactionLink?: dbTransactionLink | null,
): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number } | null> {
const lastTransaction = await Transaction.findOne({ userId }, { order: { balanceDate: 'DESC' } })
if (!lastTransaction) return null
@ -32,7 +34,13 @@ async function calculateBalance(
const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
const { sumHoldAvailableAmount } = await transactionLinkRepository.summary(userId, time)
if (balance.minus(sumHoldAvailableAmount.toString()).lessThan(0)) {
// If we want to redeem a link we need to make sure that the link amount is not considered as blocked
// else we cannot redeem links which are more or equal to half of what an account actually owns
const releasedLinkAmount = transactionLink ? transactionLink.holdAvailableAmount : new Decimal(0)
if (
balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0)
) {
return null
}
return { balance, lastTransactionId: lastTransaction.id, decay }

15
backend/src/util/virtualTransactions.ts
View File

@ -42,11 +42,11 @@ const virtualLinkTransaction = (
userId: -1,
previous: -1,
typeId: TransactionTypeId.LINK_SUMMARY,
amount: amount,
balance: balance,
amount: amount.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
balance: balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
balanceDate: validUntil,
decayStart: createdAt,
decay: decay,
decay: decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
memo: '',
creationDate: null,
...defaultModelFunctions,
@ -59,6 +59,7 @@ const virtualDecayTransaction = (
balanceDate: Date,
time: Date = new Date(),
user: User,
holdAvailabeAmount: Decimal,
): Transaction => {
const decay = calculateDecay(balance, balanceDate, time)
// const balance = decay.balance.minus(lastTransaction.balance)
@ -67,10 +68,12 @@ const virtualDecayTransaction = (
userId: -1,
previous: -1,
typeId: TransactionTypeId.DECAY,
amount: decay.decay ? decay.decay : new Decimal(0), // new Decimal(0), // this kinda is wrong, but helps with the frontend query
balance: decay.balance,
amount: decay.decay ? decay.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR) : new Decimal(0), // new Decimal(0), // this kinda is wrong, but helps with the frontend query
balance: decay.balance
.minus(holdAvailabeAmount.toString())
.toDecimalPlaces(2, Decimal.ROUND_DOWN),
balanceDate: time,
decay: decay.decay ? decay.decay : new Decimal(0),
decay: decay.decay ? decay.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR) : new Decimal(0),
decayStart: decay.start,
memo: '',
creationDate: null,

2
database/package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido-database",
"version": "1.7.0",
"version": "1.7.1",
"description": "Gradido Database Tool to execute database migrations",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/database",

13
deployment/bare_metal/restore.sh
View File

@ -15,13 +15,13 @@ if [ ! -f "$BACKUP_FILE" ]; then
return "File '$BACKUP_FILE' does not exist" 2>/dev/null || exit 1
fi
# Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
# Load database .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
# NOTE: all config values will be in process.env when starting
# the services and will therefore take precedence over the .env
if [ -f "$PROJECT_ROOT/backend/.env" ]; then
export $(cat $PROJECT_ROOT/backend/.env | sed 's/#.*//g' | xargs)
if [ -f "$PROJECT_ROOT/database/.env" ]; then
export $(cat $PROJECT_ROOT/database/.env | sed 's/#.*//g' | xargs)
else
export $(cat $PROJECT_ROOT/backend/.env.dist | sed 's/#.*//g' | xargs)
export $(cat $PROJECT_ROOT/database/.env.dist | sed 's/#.*//g' | xargs)
fi
# Stop gradido-backend service
@ -30,6 +30,11 @@ pm2 stop gradido-backend
# Backup data
mysqldump --databases --single-transaction --quick --hex-blob --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-restore-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
# Drop Database
mysql -u ${DB_USER} -p${DB_PASSWORD} <<EOFMYSQL
DROP DATABASE $DB_DATABASE
EOFMYSQL
# Restore Data
mysql -u ${DB_USER} -p${DB_PASSWORD} <<EOFMYSQL
source $BACKUP_FILE

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "bootstrap-vue-gradido-wallet",
"version": "1.7.0",
"version": "1.7.1",
"private": true,
"scripts": {
"start": "node run/server.js",

35
frontend/src/components/DecayInformations/DecayInformation-Decay.vue
View File

@ -1,22 +1,27 @@
<template>
<div class="decayinformation-decay">
<div class="d-flex">
<div class="text-center pb-3 gradido-max-width">
<b-icon icon="droplet-half" height="12" class="mb-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="6">
<div>
{{ previousBookedBalance | GDD }}
{{ decay | GDD }} {{ $t('math.equal') }}
<b>{{ balance | GDD }}</b>
<b-col cols="1"></b-col>
<b-col cols="11">
<div class="d-flex">
<div class="text-center pb-3 gradido-max-width">
<b-icon icon="droplet-half" class="mr-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
<b-row>
<b-col cols="5" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="7">
<div>
{{ previousBookedBalance | GDD }}
{{ decay | GDD }} {{ $t('math.equal') }}
<b>{{ balance | GDD }}</b>
</div>
</b-col>
</b-row>
</b-col>
</b-row>
</div>

117
frontend/src/components/DecayInformations/DecayInformation-Long.vue
View File

@ -1,64 +1,69 @@
<template>
<div class="decayinformation-long">
<div class="d-flex">
<div class="text-center pb-3 gradido-max-width">
<b-icon icon="droplet-half" height="12" class="mb-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.last_transaction') }}</div>
</b-col>
<b-col cols="6">
<div>
<span>
{{ $d(new Date(decay.start), 'long') }}
</span>
<b-col cols="1"></b-col>
<b-col cols="11">
<div class="d-flex">
<div class="text-center pb-3 gradido-max-width">
<b-icon icon="droplet-half" class="mr-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
</b-col>
</b-row>
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.past_time') }}</div>
</b-col>
<b-col cols="6">
<span v-if="duration">{{ durationText }}</span>
</b-col>
</b-row>
<!-- Decay-->
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="6">{{ decay.decay | GDD }}</b-col>
</b-row>
<hr class="mt-2 mb-2" />
<b-row>
<b-col class="text-center pt-3 pb-2">
<b>{{ $t('decay.calculation_total') }}</b>
</b-col>
</b-row>
<!-- Type-->
<b-row>
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
<b-col cols="6" class="text-right">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
<b-col cols="6">{{ amount | GDD }}</b-col>
</b-row>
<!-- Decay-->
<b-row>
<b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
<b-col cols="6">{{ decay.decay | GDD }}</b-col>
</b-row>
<!-- Total-->
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.total') }}</div>
</b-col>
<b-col cols="6">
<b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
<b-row>
<b-col cols="5" class="text-right">
<div>{{ $t('decay.last_transaction') }}</div>
</b-col>
<b-col cols="7">
<div>
<span>
{{ $d(new Date(decay.start), 'long') }}
</span>
</div>
</b-col>
</b-row>
<b-row>
<b-col cols="5" class="text-right">
<div>{{ $t('decay.past_time') }}</div>
</b-col>
<b-col cols="7">
<span v-if="duration">{{ durationText }}</span>
</b-col>
</b-row>
<!-- Decay-->
<b-row>
<b-col cols="5" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="7">{{ decay.decay | GDD }}</b-col>
</b-row>
<hr class="mt-2 mb-2" />
<b-row>
<b-col class="text-center pt-3 pb-2">
<b>{{ $t('decay.calculation_total') }}</b>
</b-col>
</b-row>
<!-- Type-->
<b-row>
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
<b-col cols="5" class="text-right">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
<b-col cols="7">{{ amount | GDD }}</b-col>
</b-row>
<!-- Decay-->
<b-row>
<b-col cols="5" class="text-right">{{ $t('decay.decay') }}</b-col>
<b-col cols="7">{{ decay.decay | GDD }}</b-col>
</b-row>
<!-- Total-->
<b-row>
<b-col cols="5" class="text-right">
<div>{{ $t('decay.total') }}</div>
</b-col>
<b-col cols="7">
<b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
</b-col>
</b-row>
</b-col>
</b-row>
</div>

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

@ -28,23 +28,21 @@
<strong>{{ $t('gdd_per_link.decay-14-day') }}</strong>
</b-col>
<b-col class="text-right borderbottom">
<strong>{{ $t('math.aprox') }} {{ (amount * 0.028 * -1) | GDD }}</strong>
<strong>{{ $t('math.aprox') }} {{ (amount * -0.028) | GDD }}</strong>
</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
<b-col class="text-right">
{{ $t('math.aprox') }} {{ (balance - amount - amount * 0.028) | GDD }}
</b-col>
<b-col class="text-right">{{ $t('math.aprox') }} {{ totalBalance | GDD }}</b-col>
</b-row>
</b-container>
<b-row class="mt-4">
<b-col>
<b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
</b-col>
<b-col class="text-right">
<b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
<b-button variant="primary" :disabled="disabled" @click="$emit('send-transaction')">
{{ $t('form.generate_now') }}
</b-button>
</b-col>
@ -60,7 +58,17 @@ export default {
amount: { type: Number, required: true },
memo: { type: String, required: true },
loading: { type: Boolean, required: true },
selected: { type: String, required: true },
},
computed: {
totalBalance() {
return this.balance - this.amount * 1.028
},
disabled() {
if (this.totalBalance < 0) {
return true
}
return this.loading
},
},
}
</script>

27
frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
View File

@ -45,6 +45,33 @@ describe('GddSend confirm', () => {
it('renders the component div.confirm-box-send', () => {
expect(wrapper.find('div.confirm-box-send').exists()).toBeTruthy()
})
describe('send now button', () => {
beforeEach(() => {
jest.clearAllMocks()
})
describe('single click', () => {
beforeEach(async () => {
await wrapper.find('button.btn-primary').trigger('click')
})
it('emits send transaction one time', () => {
expect(wrapper.emitted('send-transaction')).toHaveLength(1)
})
})
describe('double click', () => {
beforeEach(async () => {
await wrapper.find('button.btn-primary').trigger('click')
await wrapper.find('button.btn-primary').trigger('click')
})
it('emits send transaction one time', () => {
expect(wrapper.emitted('send-transaction')).toHaveLength(1)
})
})
})
})
})
})

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

@ -55,10 +55,14 @@
<b-row class="mt-4">
<b-col>
<b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
</b-col>
<b-col class="text-right">
<b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
<b-button
variant="primary"
:disabled="disabled"
@click="$emit('send-transaction'), (disabled = true)"
>
{{ $t('form.send_now') }}
</b-button>
</b-col>
@ -73,8 +77,11 @@ export default {
email: { type: String, required: false, default: '' },
amount: { type: Number, required: true },
memo: { type: String, required: true },
loading: { type: Boolean, required: true },
selected: { type: String, required: true },
},
data() {
return {
disabled: false,
}
},
}
</script>

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

@ -68,7 +68,7 @@ describe('TransactionForm', () => {
})
it('has SEND_TYPES = send', () => {
expect(wrapper.vm.selected).toBe(SEND_TYPES.send)
expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send)
})
describe('transaction form', () => {
@ -249,7 +249,7 @@ Die ganze Welt bezwingen.“`)
})
it('has the text "form.cancel"', () => {
expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset')
expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel')
})
it('clears all fields on click', async () => {
@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`)
})
it('has SEND_TYPES = link', () => {
expect(wrapper.vm.selected).toBe(SEND_TYPES.link)
expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link)
})
it('has no input field of id input-group-1', () => {

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

@ -6,28 +6,38 @@
<b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
<b-row>
<b-col>
<b-form-radio v-model="selected" name="radios" :value="sendTypes.send" size="lg">
<b-form-radio
v-model="radioSelected"
name="radios"
:value="sendTypes.send"
size="lg"
>
{{ $t('send_gdd') }}
</b-form-radio>
</b-col>
<b-col>
<b-form-radio v-model="selected" name="radios" :value="sendTypes.link" size="lg">
<b-form-radio
v-model="radioSelected"
name="radios"
:value="sendTypes.link"
size="lg"
>
{{ $t('send_per_link') }}
</b-form-radio>
</b-col>
</b-row>
<div class="mt-4" v-if="selected === sendTypes.link">
<div class="mt-4" v-if="radioSelected === sendTypes.link">
<h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
<div>
{{ $t('gdd_per_link.choose-amount') }}
</div>
</div>
<div v-if="selected === sendTypes.send">
<div v-if="radioSelected === sendTypes.send">
<validation-provider
name="Email"
:rules="{
required: selected === sendTypes.send ? true : false,
required: radioSelected === sendTypes.send ? true : false,
email: true,
is_not: $store.state.email,
}"
@ -129,12 +139,12 @@
<b-row v-else class="test-buttons">
<b-col>
<b-button type="reset" variant="secondary" @click="onReset">
{{ $t('form.reset') }}
{{ $t('form.cancel') }}
</b-button>
</b-col>
<b-col class="text-right">
<b-button type="submit" variant="success">
{{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }}
<b-button type="submit" variant="primary">
{{ $t('form.check_now') }}
</b-button>
</b-col>
</b-row>
@ -159,6 +169,7 @@ export default {
email: { type: String, default: '' },
amount: { type: Number, default: 0 },
memo: { type: String, default: '' },
selected: { type: String, default: 'send' },
},
inject: ['getTunneledEmail'],
data() {
@ -171,14 +182,14 @@ export default {
memo: this.memo,
amountValue: 0.0,
},
selected: SEND_TYPES.send,
radioSelected: this.selected,
}
},
methods: {
onSubmit() {
this.normalizeAmount(true)
this.$emit('set-transaction', {
selected: this.selected,
selected: this.radioSelected,
email: this.form.email,
amount: this.form.amountValue,
memo: this.form.memo,

4
frontend/src/components/GddTransactionList.vue
View File

@ -75,7 +75,8 @@
></b-pagination>
<div v-if="transactionCount <= 0" class="mt-4 text-center">
<span>{{ $t('transaction.nullTransactions') }}</span>
<b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
<div v-else>{{ $t('transaction.nullTransactions') }}</div>
</div>
</div>
</template>
@ -111,6 +112,7 @@ export default {
transactionCount: { type: Number, default: 0 },
transactionLinkCount: { type: Number, default: 0 },
showPagination: { type: Boolean, default: false },
pending: { type: Boolean },
},
methods: {
updateTransactions() {

4
frontend/src/components/LinkInformations/RedeemSelfCreator.vue
View File

@ -6,9 +6,9 @@
<div class="mb-3 text-center">
<div class="mt-3">
{{ $t('gdd_per_link.no-redeem') }}
<a to="/transactions" href="#!">
<b-link to="/transactions">
<b>{{ $t('gdd_per_link.link-overview') }}</b>
</a>
</b-link>
</div>
</div>
</b-jumbotron>

5
frontend/src/components/Menu/Navbar.vue
View File

@ -10,7 +10,10 @@
</div>
<b-navbar-nav class="ml-auto" is-nav>
<b-nav-item>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</b-nav-item>
<b-nav-item>
<b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
<div v-else>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</div>
</b-nav-item>
<b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
<small>
{{ $store.state.firstName }} {{ $store.state.lastName }}

8
frontend/src/components/Status.spec.js
View File

@ -26,8 +26,8 @@ describe('Status', () => {
})
describe('balance is pending', () => {
it('it displays an en-dash', () => {
expect(wrapper.find('div.gdd-status-div').text()).toEqual('em-dash GDD')
it('displays an animation icon test-pending-icon', () => {
expect(wrapper.find('.test-pending-icon').exists()).toBe(true)
})
})
@ -38,6 +38,10 @@ describe('Status', () => {
})
})
it('does not display an animation icon test-pending-icon', () => {
expect(wrapper.find('.test-pending-icon').exists()).toBe(false)
})
it('it displays the ammount of GDD', () => {
expect(wrapper.find('div.gdd-status-div').text()).toEqual('1234 GDD')
})

5
frontend/src/components/Status.vue
View File

@ -1,7 +1,10 @@
<template>
<div class="gdd-status">
<div class="p-0 gdd-status-div">
{{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
<b-icon v-if="pending" icon="three-dots" animation="cylon" class="test-pending-icon"></b-icon>
<div v-else>
{{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
</div>
</div>
</div>
</template>

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

@ -52,6 +52,7 @@
"amount": "Betrag",
"at": "am",
"cancel": "Abbrechen",
"check_now": "Jetzt prüfen",
"close": "Schließen",
"current_balance": "Aktueller Kontostand",
"date": "Datum",
@ -60,7 +61,7 @@
"email": "E-Mail",
"firstname": "Vorname",
"from": "Von",
"generate_now": "jetzt generieren",
"generate_now": "Jetzt generieren",
"lastname": "Nachname",
"memo": "Nachricht",
"message": "Nachricht",
@ -95,7 +96,7 @@
},
"GDD": "GDD",
"gdd_per_link": {
"choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
"choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
"copy": "kopieren",
"created": "Der Link wurde erstellt!",
"decay-14-day": "Vergänglichkeit für 14 Tage",
@ -103,7 +104,7 @@
"deleted": "Der Link wurde gelöscht!",
"has-account": "Du besitzt bereits ein Gradido Konto",
"header": "Gradidos versenden per Link",
"link-copied": "Link wurde in die Zwischenablage kopiert",
"link-copied": "Link wurde in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.",
"link-deleted": "Der Link wurde am {date} gelöscht.",
"link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
"link-overview": "Linkübersicht",

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

@ -52,6 +52,7 @@
"amount": "Amount",
"at": "at",
"cancel": "Cancel",
"check_now": "Check now",
"close": "Close",
"current_balance": "Current Balance",
"date": "Date",
@ -103,7 +104,7 @@
"deleted": "The link was deleted!",
"has-account": "You already have a Gradido account",
"header": "Send Gradidos via link",
"link-copied": "Link copied to clipboard",
"link-copied": "Link has been copied to the clipboard. You can now paste it into an email or message.",
"link-deleted": "The link was deleted on {date}.",
"link-expired": "The link is no longer valid. The validity expired on {date}.",
"link-overview": "Link overview",

1
frontend/src/pages/Overview.vue
View File

@ -21,6 +21,7 @@
:decayStartBlock="decayStartBlock"
:transaction-count="transactionCount"
:transactionLinkCount="transactionLinkCount"
:pending="pending"
@update-transactions="updateTransactions"
v-on="$listeners"
/>

50
frontend/src/pages/Send.spec.js
View File

@ -4,6 +4,7 @@ import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
import { TRANSACTION_STEPS } from '@/components/GddSend.vue'
import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
import DashboardLayout from '@/layouts/DashboardLayout_gdd.vue'
import flushPromises from 'flush-promises'
const apolloMutationMock = jest.fn()
apolloMutationMock.mockResolvedValue('success')
@ -57,12 +58,13 @@ describe('Send', () => {
describe('fill transaction form for send coins', () => {
beforeEach(async () => {
wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
email: 'user@example.org',
amount: 23.45,
memo: 'Make the best of it!',
selected: SEND_TYPES.send,
})
const transactionForm = wrapper.findComponent({ name: 'TransactionForm' })
await transactionForm.findAll('input[type="radio"]').at(0).setChecked()
await transactionForm.find('input[type="email"]').setValue('user@example.org')
await transactionForm.find('input[type="text"]').setValue('23.45')
await transactionForm.find('textarea').setValue('Make the best of it!')
await transactionForm.find('form').trigger('submit')
await flushPromises()
})
it('steps forward in the dialog', () => {
@ -74,7 +76,8 @@ describe('Send', () => {
beforeEach(async () => {
await wrapper
.findComponent({ name: 'TransactionConfirmationSend' })
.vm.$emit('on-reset')
.find('button.btn-secondary')
.trigger('click')
})
it('shows the transaction formular again', () => {
@ -98,7 +101,8 @@ describe('Send', () => {
jest.clearAllMocks()
await wrapper
.findComponent({ name: 'TransactionConfirmationSend' })
.vm.$emit('send-transaction')
.find('button.btn-primary')
.trigger('click')
})
it('calls the API when send-transaction is emitted', async () => {
@ -131,7 +135,8 @@ describe('Send', () => {
apolloMutationMock.mockRejectedValue({ message: 'recipient not known' })
await wrapper
.findComponent({ name: 'TransactionConfirmationSend' })
.vm.$emit('send-transaction')
.find('button.btn-primary')
.trigger('click')
})
it('has a component TransactionResultSendError', () => {
@ -155,18 +160,17 @@ describe('Send', () => {
})
})
/* LINK */
describe('transaction form link', () => {
beforeEach(async () => {
apolloMutationMock.mockResolvedValue({
data: { createTransactionLink: { code: '0123456789' } },
})
await wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
amount: 56.78,
memo: 'Make the best of the link!',
selected: SEND_TYPES.link,
})
const transactionForm = wrapper.findComponent({ name: 'TransactionForm' })
await transactionForm.findAll('input[type="radio"]').at(1).setChecked()
await transactionForm.find('input[type="text"]').setValue('56.78')
await transactionForm.find('textarea').setValue('Make the best of the link!')
await transactionForm.find('form').trigger('submit')
await flushPromises()
})
it('steps forward in the dialog', () => {
@ -178,7 +182,8 @@ describe('Send', () => {
jest.clearAllMocks()
await wrapper
.findComponent({ name: 'TransactionConfirmationLink' })
.vm.$emit('send-transaction')
.find('button.btn-primary')
.trigger('click')
})
it('calls the API when send-transaction is emitted', async () => {
@ -254,14 +259,17 @@ describe('Send', () => {
})
})
describe('send apollo if transaction link with error', () => {
beforeEach(() => {
describe('apollo call returns error', () => {
beforeEach(async () => {
apolloMutationMock.mockRejectedValue({ message: 'OUCH!' })
wrapper.find('button.btn-success').trigger('click')
await wrapper
.findComponent({ name: 'TransactionConfirmationLink' })
.find('button.btn-primary')
.trigger('click')
})
it('toasts an error message', () => {
expect(toastErrorSpy).toBeCalledWith({ message: 'OUCH!' })
expect(toastErrorSpy).toBeCalledWith('OUCH!')
})
})
})

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

@ -12,11 +12,9 @@
<template #transactionConfirmationSend>
<transaction-confirmation-send
:balance="balance"
:selected="transactionData.selected"
:email="transactionData.email"
:amount="transactionData.amount"
:memo="transactionData.memo"
:loading="loading"
@send-transaction="sendTransaction"
@on-reset="onReset"
></transaction-confirmation-send>
@ -24,7 +22,6 @@
<template #transactionConfirmationLink>
<transaction-confirmation-link
:balance="balance"
:selected="transactionData.selected"
:email="transactionData.email"
:amount="transactionData.amount"
:memo="transactionData.memo"
@ -133,8 +130,8 @@ export default {
this.transactionData = { ...EMPTY_TRANSACTION_DATA }
this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendSuccess
})
.catch((err) => {
this.errorResult = err.message
.catch((error) => {
this.errorResult = error.message
this.error = true
this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError
})
@ -153,7 +150,7 @@ export default {
this.updateTransactions({})
})
.catch((error) => {
this.toastError(error)
this.toastError(error.message)
})
break
default:

11
frontend/src/pages/TransactionLink.spec.js
View File

@ -12,6 +12,10 @@ const routerPushMock = jest.fn()
const now = new Date().toISOString()
const stubs = {
RouterLink: true,
}
const transactionLinkValidExpireDate = () => {
const validUntil = new Date()
return new Date(validUntil.setDate(new Date().getDate() + 14)).toISOString()
@ -34,6 +38,7 @@ apolloQueryMock.mockResolvedValue({
const mocks = {
$t: jest.fn((t, obj = null) => (obj ? [t, obj.date].join('; ') : t)),
$d: jest.fn((d) => d.toISOString()),
$store: {
state: {
token: null,
@ -58,7 +63,7 @@ describe('TransactionLink', () => {
let wrapper
const Wrapper = () => {
return mount(TransactionLink, { localVue, mocks })
return mount(TransactionLink, { localVue, mocks, stubs })
}
describe('mount', () => {
@ -232,8 +237,8 @@ describe('TransactionLink', () => {
)
})
it('has a link to transaction page', () => {
expect(wrapper.find('a[to="/transactions"]').exists()).toBe(true)
it.skip('has a link to transaction page', () => {
expect(wrapper.find('a[target="/transactions"]').exists()).toBe(true)
})
})

6
frontend/src/pages/TransactionLink.vue
View File

@ -100,7 +100,7 @@ export default {
if (this.linkData.deletedAt) {
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
date: this.linkData.deletedAt,
date: this.$d(new Date(this.linkData.deletedAt), 'long'),
})
return `TEXT`
}
@ -108,7 +108,7 @@ export default {
if (new Date(this.linkData.validUntil) < new Date()) {
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
date: this.linkData.validUntil,
date: this.$d(new Date(this.linkData.validUntil), 'long'),
})
return `TEXT`
}
@ -117,7 +117,7 @@ export default {
if (this.linkData.redeemedAt) {
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
date: this.linkData.redeemedAt,
date: this.$d(new Date(this.linkData.redeemedAt), 'long'),
})
return `TEXT`
}

8
frontend/src/pages/thx.spec.js
View File

@ -79,14 +79,6 @@ describe('Thx', () => {
it('renders the thanks text', () => {
expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
})
it('renders the thanks redirect button', () => {
expect(wrapper.find('a.btn').text()).toBe('site.login.signin')
})
it('links the redirect button to /login', () => {
expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
})
})
describe('coming from /login', () => {

6
frontend/src/pages/thx.vue
View File

@ -9,11 +9,11 @@
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
<p class="h4">{{ $t(displaySetup.subtitle) }}</p>
<hr />
<b-button v-if="$route.params.code" :to="`/redeem/${$route.params.code}`">
<b-button v-if="$route.params.code" :to="`/login/${$route.params.code}`">
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
{{ $t(displaySetup.button) }}
</b-button>
<b-button v-else :to="displaySetup.linkTo">
<b-button v-else-if="displaySetup.linkTo" :to="displaySetup.linkTo">
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
{{ $t(displaySetup.button) }}
</b-button>
@ -41,7 +41,7 @@ const textFields = {
headline: 'site.thx.title',
subtitle: 'site.thx.register',
button: 'site.login.signin',
linkTo: '/login',
// linkTo: '/login',
},
checkEmail: {
headline: 'site.thx.title',

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido",
"version": "1.7.0",
"version": "1.7.1",
"description": "Gradido",
"main": "index.js",
"repository": "git@github.com:gradido/gradido.git",