1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

1323 Commits

Author SHA1 Message Date
Du Peng
25d8b25808 (feat) add reservation status registered 2023-07-12 11:23:00 +02:00
Du Peng
67f5e68fd7 (feat) user cannot reserve 2 times for event family 2023-07-11 19:13:38 +02:00
Du Peng
9dc85ee80b (bug) cannot create event 2023-07-11 16:07:37 +02:00
Du Peng
e43d4918e1 (feat) show present status for pre registration evnet if amount == 0 2023-07-11 15:42:46 +02:00
Du Peng
8b4150a888 (feat) show age of child in event reservation 2023-07-11 14:17:03 +02:00
Du Peng
8771eb8ccc (feat) admin can confirm the prensence of pre-registration event 2023-07-11 13:53:41 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +02:00
Vincent
a8dedfe040 (ui) Add radio buttons for event validation 2023-07-06 11:24:50 +02:00
Vincent
9cc6a8a552 (ui) Events dashboard layout 2023-07-04 15:05:47 +02:00
Du Peng
e15bbf0b15 (feat) re-make event reservation item view 2023-07-04 15:05:46 +02:00
Du Peng
524404e7fa (feat) some improvements for family account 2023-07-04 15:05:45 +02:00
Du Peng
ab35fdf976 (feat) new pre registration mail and notification 2023-07-04 15:05:44 +02:00
Du Peng
2a57a7e505 (feat) add success info after reservation is paid 2023-07-04 15:05:43 +02:00
Du Peng
83ced44741 (bug) cannot save pre registration end date is empty 2023-07-04 15:05:42 +02:00
Du Peng
26cf72a846 (feat) pre-register event for family compte and nominatif 2023-07-04 15:05:41 +02:00
Du Peng
a60e587187 (feat) admin can confirm the payment of pre-registration reservation 2023-07-04 15:05:40 +02:00
Du Peng
172f09661f (wip) admin confirm payment of reservation pre-registration 2023-07-04 15:05:39 +02:00
Du Peng
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
94e839f647 (feat) pre-book a event 2023-07-04 15:02:40 +02:00
Du Peng
219e7f5913 (wip) add pre-registration to event 2023-07-04 15:02:36 +02:00
Du Peng
b7bcce75f3 (bug) hide member and child select if admin dont select a member before reserve event 2023-07-04 15:01:25 +02:00
Du Peng
26f1c939cd (feat) edit/delete child in members list 2023-07-04 15:01:24 +02:00
Vincent
050ae9be67 (ui) fix gap 2023-07-04 15:01:22 +02:00
Vincent
e392cc1803 (ui) restor deleted table's style 2023-07-04 15:01:21 +02:00
Vincent
d4b2b16425 (ui) integration 2023-07-04 15:01:20 +02:00
Du Peng
f64e76a463 (bug) child validated_at type 2023-07-04 15:01:19 +02:00
Du Peng
78d8b3bfe6 (feat) show event reservation booking users in events of member dashbaord 2023-07-04 15:01:17 +02:00
Du Peng
d729ded4d5 (feat) add birthday alert for event reservation 2023-07-04 15:01:16 +02:00
Du Peng
3de8d664e1 (bug) child birthday < 18 years ago 2023-07-04 15:01:15 +02:00
Du Peng
387fc3ffb3 (feat) confirmation required for delete child 2023-07-04 15:01:13 +02:00
Du Peng
f6883ea43e (feat) show event booking users in member edit page 2023-07-04 15:01:12 +02:00
Du Peng
d08e4ff9cd (feat) admin can refuse child's supporting document file 2023-07-04 15:01:09 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
e935b23631 (wip) family account css 2023-07-04 14:59:02 +02:00
Du Peng
04795ba629 (wip) show event reservation users 2023-07-04 14:59:01 +02:00
Du Peng
e85e2d7b47 (wip) pay family and nominative event 2023-07-04 14:59:00 +02:00
Du Peng
07b47d7956 (wip) add event type 2023-07-04 14:58:58 +02:00
Du Peng
177748169a (wip) save booking user for event nominatif 2023-07-04 14:58:21 +02:00
Du Peng
9373f50706 (wip) event reservation naminative 2023-07-04 14:57:42 +02:00
Du Peng
39178b5d96 (wip) create/update user children 2023-07-04 14:56:34 +02:00
Du Peng
5365cbdaba (wip) add/edit user children 2023-07-04 14:56:33 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +02:00
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements'
# Conflicts:
#   Gemfile.lock
2023-07-03 16:13:21 +00:00
Nicolas Florentin
b3970da1c4 displays "my orders" link only if store module is active 2023-07-03 16:31:45 +02:00
Nicolas Florentin
b8fd8d8172 Merge remote-tracking branch 'origin/projects-to-markdown' into projects-improvements 2023-07-03 14:37:57 +02:00
Nicolas Florentin
a3a5527141 Merge branch 'project-categories' into projects-improvements 2023-07-03 14:32:35 +02:00
Nicolas Florentin
bc284e7813 filter projects by date 2023-07-03 11:42:29 +02:00
Nicolas Florentin
94b0b062bc fix 2023-07-03 07:57:54 +02:00
Nicolas Florentin
af69ba67df wip 2023-06-30 11:26:26 +02:00