Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 182
TitelNew Subscription Structure
BeschreibungNew Subscription based on the enhanced configuration + modified existing booking process, so that bookings can be done without credit point functionality
Statusmerged
Created at 2020-05-06T09:01:38.751Z
Updated at 2020-06-05T08:56:52.005Z
Source branchfeature/LL-363-remove-credit-points-from-code-base
Target branchdevelop
AuthorGregor Gabriel
AssigneeSascha Immig

Discussion notes

added 3 commits
  • d3c0a463 - Add subscriptions
  • e243f4f1 - Add subscriptions
  • c6ce560f - Modify subscription swapping and pricing
Compare with previous version		 Marcel Pociot 2020-05-19T11:11:32.016Z
added 1 commit
  • ad388aea - Fix config
Compare with previous version		 Marcel Pociot 2020-05-19T14:51:28.574Z
added 112 commits
  • ad388aea...a8354d67 - 110 commits from branch develop
  • 8bf50859 - Merge branch 'develop' into feature/LL-363-remove-credit-points-from-code-base
  • c9d545d7 - fix tests
Compare with previous version		 Marcel Pociot 2020-05-22T09:02:57.602Z
added 1 commit
  • 4e47abc9 - wip
Compare with previous version		 Marcel Pociot 2020-05-22T09:53:20.411Z
marked as a **Work In Progress** from 4e47abc9d278993b5c04d085948f110e4086bdd4 Marcel Pociot 2020-05-22T09:53:20.630Z
added 1 commit
  • c3892f42 - wip
Compare with previous version		 Marcel Pociot 2020-05-22T12:37:56.812Z
added 1 commit
  • 6ab5c41f - wip
Compare with previous version		 Marcel Pociot 2020-05-25T07:11:44.604Z
added 2 commits
  • 10d26c80 - added features for tariffs and moved them to separate templates.
  • 84de3afb - corrected config
Compare with previous version		 Sascha Immig 2020-05-26T12:05:36.174Z
unmarked as a **Work In Progress** Sascha Immig 2020-05-26T13:43:16.790Z
changed title from **{-WIP: removed credit points from System-}** to **{+New Subscription Structure+}** Sascha Immig 2020-05-26T13:43:16.820Z
changed the description Sascha Immig 2020-05-26T13:43:16.845Z
added 1 commit
  • 4b43698c - Der Katalog Seeder enthält nun "Freier Katalog"
Compare with previous version		 Richard Klings 2020-06-03T08:21:10.457Z
added 1 commit
  • 50bdc746 - added visual incator(s) to catalog if training is not buyable
Compare with previous version		 Sascha Immig 2020-06-03T12:44:09.496Z
added 1 commit
  • 7af07db1 - Add invoice table
Compare with previous version		 Marcel Pociot 2020-06-04T09:59:24.193Z
added 1 commit
  • b474b604 - Layout-Update, Translations, reordering of elements
Compare with previous version		 Sascha Immig 2020-06-04T20:24:26.445Z
added 3 commits
  • 9d6cb254 - added free catalog to config and removed unknown id from professional
  • c0d32ecb - corrections edit vs. create
  • 6d55b5f9 - LL-408: show subscription as boolean in client list
Compare with previous version		 Sascha Immig 2020-06-05T07:59:57.887Z
merged Sascha Immig 2020-06-05T08:56:52.048Z

Merge Commits

Title Id Author Created at Message
added features for tariffs and moved them to separate templates. 10d26c800691c631d0aa7680d1d4a906aa5c100a TUV\immigs 2020-05-26T12:04:18.000Z added features for tariffs and moved them to separate templates.
+ removed credit points from System 3083ac1b6357b3676534cf5e96adb02e77e43e48 TUV\gabrielg 2020-05-06T08:40:10.000Z + removed credit points from System + modified existing booking process, so that bookings can be done without credit point functionality
Der Katalog Seeder enthält nun "Freier Katalog" 4b43698cd303539ab684bdfc87fca5264a540e9b Richard Klings 2020-06-03T08:20:46.000Z Der Katalog Seeder enthält nun "Freier Katalog"
wip 4e47abc9d278993b5c04d085948f110e4086bdd4 Marcel Pociot 2020-05-22T09:52:44.000Z wip
added visual incator(s) to catalog if training is not buyable 50bdc7463dc6bc51effd5eb2f993667bf38560b5 TUV\immigs 2020-06-03T12:32:28.000Z added visual incator(s) to catalog if training is not buyable
wip 6ab5c41f898f52fa593f348156101c09a6cc9bad Marcel Pociot 2020-05-25T07:11:06.000Z wip
LL-408: show subscription as boolean in client list 6d55b5f90e2389aedc255e36797d8b355554d101 TUV\immigs 2020-06-05T07:58:16.000Z LL-408: show subscription as boolean in client list
Add invoice table 7af07db15a941b4c9d0ed514b071e9f836de9ed8 Marcel Pociot 2020-06-04T09:59:15.000Z Add invoice table
corrected config 84de3afb0d79cf29321103973be96f66069b4e24 TUV\immigs 2020-05-26T12:05:13.000Z corrected config
Merge branch 'develop' into feature/LL-363-remove-credit-points-from-code-base 8bf50859b51f4c582ac805db9b4c07a9641e7269 Marcel Pociot 2020-05-22T08:58:29.000Z Merge branch 'develop' into feature/LL-363-remove-credit-points-from-code-base
added free catalog to config and removed unknown id from professional 9d6cb254f2977917d5f5627f8244af8e96d6bc66 TUV\immigs 2020-06-05T05:51:45.000Z added free catalog to config and removed unknown id from professional
Fix config ad388aea41a4103e13cd25f2053bac94db3cae00 Marcel Pociot 2020-05-19T14:29:09.000Z Fix config
Layout-Update, Translations, reordering of elements b474b6043bb614b435fd8fce7a22025c0e386538 TUV\immigs 2020-06-04T20:22:56.000Z Layout-Update, Translations, reordering of elements
corrections edit vs. create c0d32ecb8578669f01ece494228deddd34f68308 TUV\immigs 2020-06-05T07:25:43.000Z corrections edit vs. create
wip c3892f422b98777161c6b684a158750f3eda777f Marcel Pociot 2020-05-22T12:37:15.000Z wip
Modify subscription swapping and pricing c6ce560fc96bb5542b3dbdb2e65ec3408a5dfa56 Marcel Pociot 2020-05-19T10:55:00.000Z Modify subscription swapping and pricing
fix tests c9d545d70615ae2d143ec00fe15227661f2f55c5 Marcel Pociot 2020-05-22T09:02:47.000Z fix tests
Add subscriptions d3c0a46313e81c804b8c1451b786ac0b18c35597 Marcel Pociot 2020-05-15T10:32:11.000Z Add subscriptions
Add subscriptions e243f4f114ac0db8f90a50a15212e4a85422f159 Marcel Pociot 2020-05-15T10:51:54.000Z Add subscriptions