7460 Commits

Author SHA1 Message Date
Moriz Wahl
421ae60507 reset transaction formular emits set transaction with empty data 2022-03-22 18:25:58 +01:00
Moriz Wahl
9097a45cff restructure and improve tests 2022-03-22 18:17:51 +01:00
Moriz Wahl
8c8d06d87c bind the transaction data to the transaction form to allow data restoration after canceling transaction confirmation, use always update transaction to update balance 2022-03-22 17:56:34 +01:00
Moriz Wahl
e08e1b7ea8 remove update balance method and event. We want to have the data always from the backend and do no calculation in the frontend 2022-03-22 17:54:55 +01:00
Moriz Wahl
0a3f80ddc9 add default properties to restore data when transaction is canceled in confirmation step 2022-03-22 17:53:51 +01:00
Alexander Friedland
61bc5efb11
Merge branch 'master' into 1636-Generating-link-does-not-update-gdd-balance 2022-03-22 14:54:10 +01:00
Moriz Wahl
9a040bb84d
Merge pull request #1654 from gradido/add-referrer-id-to-users
feat: Add Referrer ID to Users
2022-03-22 12:21:29 +01:00
Hannes Heine
2457371300
Merge branch 'master' into add-referrer-id-to-users 2022-03-22 09:50:09 +01:00
ogerly
36b4c6cce7 update-balance if link succesfully generated 2022-03-22 09:01:09 +01:00
Moriz Wahl
5eccddec05 test that referrerId is present 2022-03-21 17:28:48 +01:00
Alexander Friedland
5d8fed9c31
Merge pull request #1625 from gradido/1588-frontend-show-link-information
1558 - show tranaction link information page
2022-03-21 17:24:32 +01:00
Moriz Wahl
8c802a9bee add referrerId to entity model of User 2022-03-21 17:08:56 +01:00
Moriz Wahl
88cd631bca update database version 2022-03-21 17:04:45 +01:00
Moriz Wahl
f49610aef4 add referrer id migration 2022-03-21 17:03:20 +01:00
Moriz Wahl
eaa621cc3a coverage unit tests forntend tp 95% 2022-03-21 16:39:13 +01:00
Moriz Wahl
be8e3f489e test with param code 2022-03-21 16:37:44 +01:00
Moriz Wahl
5baa14b359 test transaction link page 2022-03-21 16:25:17 +01:00
Moriz Wahl
c57b40adc1 test Register with Redeem Code 2022-03-21 14:56:37 +01:00
Moriz Wahl
44f8155755 Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information 2022-03-21 14:54:53 +01:00
ogerly
ea99db0159 yarn lint and locales fixed 2022-03-21 14:50:50 +01:00
ogerly
9377102f00 deleted v-else 2022-03-21 14:46:14 +01:00
Moriz Wahl
8bfe350026 Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information 2022-03-21 14:39:49 +01:00
ogerly
7850127ae2 after login go to redeem page 2022-03-21 14:38:19 +01:00
Alexander Friedland
1baf855265
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 14:37:04 +01:00
Moriz Wahl
efe8d0c63b
Merge pull request #1624 from gradido/no-float-ids
refactor: No Float Ids
2022-03-21 14:32:50 +01:00
Moriz Wahl
17bfbd6281 fix test for optional code on login on register 2022-03-21 14:29:00 +01:00
Moriz Wahl
62384b1056
Merge branch 'master' into no-float-ids 2022-03-21 14:05:51 +01:00
Alexander Friedland
c2d0b566a8
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 14:05:41 +01:00
ogerly
b68fab72cc review from ulf and hannes 2022-03-21 14:02:04 +01:00
Alexander Friedland
e41f594fbd
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:50:50 +01:00
Alexander Friedland
db0297b826
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:50:35 +01:00
Alexander Friedland
be319ba5e4
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:50:17 +01:00
Alexander Friedland
07bf90e483
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:49:19 +01:00
Alexander Friedland
8bbe9401b0
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 13:08:48 +01:00
ogerly
58a7bc0e2a delete redeem 2022-03-21 13:08:11 +01:00
ogerly
12f2f2845a remove store redeem and add params code 2022-03-21 13:05:31 +01:00
Hannes Heine
5dc903bfb1
Merge pull request #1336 from gradido/1319-email-optin
Change the text if the account is not activated yet and changed the b…
2022-03-21 12:54:20 +01:00
elweyn
ed1c3bf137 Withdrew else block after throwing an error. 2022-03-21 12:44:03 +01:00
c83959fc58
Merge branch 'master' into 1319-email-optin 2022-03-21 12:30:57 +01:00
ogerly
bf915a9668 add components RedeemInformation.vue 2022-03-21 10:09:28 +01:00
ogerly
837850c17e change order name from LinkInformatins to LinkInformations 2022-03-21 08:24:48 +01:00
ogerly
9c668f3934 changed review from moriz 2022-03-21 08:18:47 +01:00
ogerly
a14f98e4ee test frontend/src/store/store.test.js ok 2022-03-21 08:18:47 +01:00
Alexander Friedland
99575cc2f5
Update frontend/src/pages/ShowTransactionLinkInformations.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-21 08:13:34 +01:00
Alexander Friedland
3a2d7acd29
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-21 08:08:48 +01:00
Alexander Friedland
7210804a72
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-20 19:11:28 +01:00
Moriz Wahl
384fd12b63 change parameter name to code 2022-03-20 19:00:36 +01:00
Moriz Wahl
e9357198c0 change parameter name to code 2022-03-20 18:58:20 +01:00
ogerly
d90284a269 add store.state and store.commit redeemCode, add store.commit in register 2022-03-20 13:39:11 +01:00
ogerly
3f76db7f21 add method redeemLink, add text that shows the code in the formular 2022-03-20 11:42:16 +01:00