Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 399
TitelLL-793: Anpassung Buchung und Verlängerungen von Gruppenbuchungen
Beschreibung
Statusmerged
Created at 2021-04-12T06:55:04.191Z
Updated at 2021-04-12T06:55:14.090Z
Source branchfeature/LL-793-_group-bookings
Target branchdevelop
AuthorSascha Immig
AssigneeSascha Immig

Discussion notes

merged Sascha Immig 2021-04-12T06:55:14.151Z
mentioned in commit efe8127550ec26305b4993d8278291b21aae8e44 Sascha Immig 2021-04-12T06:55:14.305Z

Merge Commits

Title Id Author Created at Message
updated lang for js 038216dd6d86641966cebd4bdbdc6f408a0789e7 TUV\immigs 2021-04-09T09:03:27.000Z updated lang for js
wip 03d6bd6b4561289b68a89adbaf6bb12f7488fdda TUV\gabrielg 2021-03-24T07:33:28.000Z wip + moved validation function to order class + improved checkbox text + reduce checkbox numbers to necessary minimum
added user number to admin group listing 13daf920402c931f156d8dcbc532e10a7a1d7760 TUV\gabrielg 2021-03-25T12:29:18.000Z added user number to admin group listing
wip 2d78e0ae2de5518094ec21c92c986fe9d43f1fa3 TUV\gabrielg 2021-03-23T09:32:08.000Z wip + booking process finegrained + reordered ui placement
wip 2fafbd630fd44a6254abcd9789125b368ca8995f TUV\gabrielg 2021-03-22T15:44:26.000Z wip + now all checked parameters are passed to booking controller - controller does not respect checked parameters yet
Merge branch 'feature/LL-815-advanced-booking-dialogs' into feature/LL-793-_group-bookings 35077f49fa66d5a37b1e68a3542fb3046d94f918 TUV\immigs 2021-04-08T15:27:34.000Z Merge branch 'feature/LL-815-advanced-booking-dialogs' into feature/LL-793-_group-bookings # Conflicts: # resources/js/messages.js
optimized texts further and added localizations; 3b01d9b849ba586ae819d311911caf74bb072a5d TUV\immigs 2021-04-08T07:51:39.000Z optimized texts further and added localizations;
fixed typo 41a8b37c795a116e6deae3776ae1dda40f4be721 TUV\immigs 2021-04-09T11:48:31.000Z fixed typo
WIP 52fb50bfe0ec08ab568100a8dc006da4b0cbd79f TUV\gabrielg 2021-03-25T16:30:43.000Z WIP + one can delete group orders now - internationalization missing yet - change available_until functionality still missing
Merge branch 'develop' into feature/LL-793-_group-bookings 66e099a3b11bb906bfc89b332eb1231b0f6b4165 TUV\immigs 2021-04-08T12:12:44.000Z Merge branch 'develop' into feature/LL-793-_group-bookings
+ added tests for booking options and booking validation 73330694387cd5fcdd6b4081dfba47b5a650d485 TUV\gabrielg 2021-03-25T09:33:43.000Z + added tests for booking options and booking validation + fixed some logic errors
handle only active users in bookings 7bc58eccd5f44b1103992b8790fc67d44a704a5d TUV\gabrielg 2021-03-25T11:12:44.000Z handle only active users in bookings
cs code fixed with newer version of php-cs-fixer 86139cf059ddb726e9225d626bada9f58b231fba TUV\gabrielg 2021-03-25T10:38:13.000Z cs code fixed with newer version of php-cs-fixer
Merge branch 'feature/LL-817-add-group-order-administration' into feature/LL-793-_group-bookings b2d81af98aecd8d67577837129017642fbcd8dfd TUV\immigs 2021-04-09T08:59:50.000Z Merge branch 'feature/LL-817-add-group-order-administration' into feature/LL-793-_group-bookings
removed old code (comments), restructured HTML and used FA over SVG. Also changed texts. be8cd4904c82417c6f650c020329ba6846789ce7 TUV\immigs 2021-04-06T15:25:35.000Z removed old code (comments), restructured HTML and used FA over SVG. Also changed texts.
one can now prolongue orders c958bd7ed0da520ad3c19fc34c2d9290a55aa4f2 TUV\gabrielg 2021-03-26T09:03:46.000Z one can now prolongue orders
small layout fix for modal. Text changes pending... cb8bac148ac954d5fc0b915211d1e3a7fa3119e2 TUV\immigs 2021-03-26T12:30:00.000Z small layout fix for modal. Text changes pending...
updated texts and reduced the number of actions. Formatted dates. d239ffe33de32b59e2a95b75f0cf6b525e0334ce TUV\immigs 2021-04-07T11:05:37.000Z updated texts and reduced the number of actions. Formatted dates.
wip order listing for groups d46b3b60da43d8119c94f786a5fdadd0d1a03a26 TUV\gabrielg 2021-03-25T15:45:57.000Z wip order listing for groups
fixxed small layout issues and localization e94d2f614e01836ff3ebcd871fd2173193fb08bc TUV\immigs 2021-04-09T14:37:14.000Z fixxed small layout issues and localization