2086 Commits

Author SHA1 Message Date
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
ogerly
36b4c6cce7 update-balance if link succesfully generated 2022-03-22 09:01:09 +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
Moriz Wahl
17bfbd6281 fix test for optional code on login on register 2022-03-21 14:29:00 +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
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
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
ogerly
6829d7eeac add method redeemLink, add text that shows the code in the formular 2022-03-20 11:40:11 +01:00
ogerly
7996bc8e5c add computed parameters for register and login (add code) 2022-03-20 11:37:53 +01:00
ogerly
0132d95cf8 remove props id and delete id from emit 2022-03-20 11:36:16 +01:00
ogerly
d3352ff0bf add successfully-redeemed 2022-03-20 11:34:41 +01:00
ogerly
283a9d751b change variable id to code 2022-03-20 11:33:15 +01:00
ogerly
5695427392 add optional parameter code to login and register 2022-03-20 11:30:02 +01:00
ogerly
980d3ee527 change parameter id to code 2022-03-20 11:26:22 +01:00
ogerly
4e013ce9be change data linkData in all files 2022-03-20 09:31:02 +01:00
ogerly
7da8b4812b change displaySetup to linkData 2022-03-20 09:29:14 +01:00
ogerly
ec5151c42c change color link information box 2022-03-20 09:13:12 +01:00
Moriz Wahl
7f6b7482b0 Int as arg type for ID 2022-03-19 12:35:34 +01:00
761de3f636
corrected name of transaction link summary to differentiate between a link and the summary transaction 2022-03-19 10:43:17 +01:00
ogerly
7a117d224f test 100% for src/routes/router.test.js 2022-03-18 20:27:32 +01:00
ogerly
cc77a0122f test 100% for NotFoundPage.spec.js 2022-03-18 20:22:27 +01:00
ogerly
1d8f94671f change container margin top to 4 2022-03-18 20:22:27 +01:00
ogerly
f25ab05ec0 change bg-variant to muted, border-variant to info 2022-03-18 20:22:27 +01:00
Alexander Friedland
ffb5ff73ce
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-18 19:54:35 +01:00
ogerly
18a650c95a change tests for ShowTransactionLinkInformations.spec.js 2022-03-18 19:38:57 +01:00