1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Commit Graph

688 Commits

Author SHA1 Message Date
Du Peng
12b1ff5f0e Merge branch 'pre_inscription' into family_compte_pre_inscription 2023-09-11 17:59:14 +02:00
Du Peng
33d81c6c36 (feat) add a notification to remind users to upload their supporting documents 2023-09-11 15:52:05 +02:00
Du Peng
fb2b762015 Merge branch 'spaces-machines-tree' into dev 2023-09-11 09:54:08 +02:00
Du Peng
ccfa7aeb39 (bug) unable to generate stat for reservation no invoice 2023-09-06 16:34:18 +02:00
Nicolas Florentin
b458f03e43 add a notification to remind users to upload their supporting documents 2023-09-05 11:15:12 +02:00
Du Peng
a10f3cffe4 (feat) statistics improvements 2023-09-01 12:43:36 +02:00
Du Peng
d70501e066 (merge) Merge remote-tracking branch 'origin/members-filter-not-validated' into dev 2023-09-01 09:43:59 +02:00
Du Peng
37aa4fb2ff (feat) add is_confirm to slots_reservations 2023-08-31 16:10:43 +02:00
Du Peng
a5c73b64c7 (bug) unable to generate statistic 2023-08-30 18:51:09 +02:00
Nicolas Florentin
fcfa4f018b Feature: add a filter in members list (admin) to show only "not validated" members 2023-08-30 11:56:24 +02:00
Du Peng
be69befb6b (feat) add adds coupon in statistic export 2023-08-24 18:31:16 +02:00
Nicolas Florentin
bdc5729141 (feat) space associate machines 2023-08-24 14:41:29 +02:00
Du Peng
6b183969c7 Merge branch 'reservation-context' into dev 2023-08-24 10:37:53 +02:00
Du Peng
7187e53835 (bug) unable to show projects next page button 2023-08-11 11:26:09 +02:00
Du Peng
ea83265b87 (bug) child cannot be updated 2023-07-27 17:34:54 +02:00
Du Peng
768b5d7e0e (bug) cannot create slot 2023-07-24 18:13:34 +02:00
Du Peng
5e46d8c45e (bug) event reserved places compute error 2023-07-24 14:08:12 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Du Peng
e4b996654b (bug) event reserved places compute error 2023-07-13 15:04:57 +02:00
Du Peng
aa6aab48b2 (feat) admin cannot validate pre-registration > nb total places 2023-07-12 15:07:14 +02:00
Du Peng
a2a970cba4 (bug) cannot show event reservation success info 2023-07-12 14:46:30 +02:00
Du Peng
61fbb37fb2 (feat) add invalidate pre registration notification 2023-07-11 14:57:38 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +02:00
Du Peng
1ff61c9380 (bug) unable to confirm payment of store for admin 2023-07-10 13:49:39 +02:00
Du Peng
d7d996bc6d (feat) Ability to show all availabilities in calender for admin 2023-07-07 09:15:13 +02:00
Du Peng
bd6e4fe0ab (bug) unable to update Store Order sub type in statistics 2023-07-06 10:15:05 +02:00
Du Peng
ab5497dcc6 (bug) unable to show project step image in markdown file 2023-07-04 17:01:05 +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
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
e7bac208a7 (feat) child's supporting document file created/updated notification 2023-07-04 15:01:18 +02:00
Du Peng
426c74c46f (feat) filter child in member list 2023-07-04 15:01:14 +02:00
Du Peng
b577cd1ae2 (feat) child compte validation notification 2023-07-04 15:01:11 +02:00
Du Peng
562dfcb010 (feat) new child notification 2023-07-04 15:01:10 +02:00
Du Peng
d08e4ff9cd (feat) admin can refuse child's supporting document file 2023-07-04 15:01:09 +02:00
Du Peng
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
177748169a (wip) save booking user for event nominatif 2023-07-04 14:58:21 +02:00
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements'
# Conflicts:
#   Gemfile.lock
2023-07-03 16:13:21 +00:00
Du Peng
e50c90b30d (bug) Accouning Line in duplicate 2023-07-03 17:43:27 +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
50ed3c9ed2 projects to markdown in zip 2023-06-30 11:15:37 +02:00
Nicolas Florentin
82823dd4cc download project to markdown file 2023-06-29 16:37:16 +02:00
Nicolas Florentin
97c652f785 filter projects list by member 2023-06-29 14:32:06 +02:00
Nicolas Florentin
8217bb1a59 adds project categories 2023-06-29 08:47:42 +02:00
Du Peng
2756502131 (bug) invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour 2023-05-04 14:15:14 +02:00
Du Peng
112df59c96 (bug) date shift in event creation/update 2023-04-21 19:27:32 +02:00
Sylvain
6b98f21300 (bug) list supporting documents types for a deleted group 2023-04-05 09:59:22 +02:00
Sylvain
4506038401 (merge) Merge branch 'v6' into dev 2023-04-03 11:10:57 +02:00