3539 Commits

Author	SHA1	Message	Date
Du Peng	33d81c6c36	(feat) add a notification to remind users to upload their supporting documents	2023-09-11 15:52:05 +02:00
Nicolas Florentin	35c72cc5ce	fix comment	2023-09-11 14:21:51 +02:00
Du Peng	fb2b762015	Merge branch 'spaces-machines-tree' into dev	2023-09-11 09:54:08 +02:00
Nicolas Florentin	a1938201ca	fix NotificationsController#polling failing request	2023-09-11 09:07:27 +02:00
Du Peng	e4bd077907	(feat) Add extra_authorize_params to OpenIdConnect config	2023-09-07 16:22:57 +02:00
Nicolas Florentin	a72c2e580c	improves api/notification controller to avoid failing when there is a notification with wrong notification_type in db	2023-09-07 10:30:48 +02:00
Du Peng	ccfa7aeb39	(bug) unable to generate stat for reservation no invoice	2023-09-06 16:34:18 +02:00
Vincent	dd2fcbd352	(ui) Remove liste style on statistics table	2023-09-06 15:52:05 +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	45959b1fa4	(bug) unable to update user profile by admin	2023-09-04 11:48:58 +02:00
Du Peng	f3b5e2b240	(bug) fix notification list is shown in notification settings page	2023-09-01 15:18:29 +02:00
Nicolas Florentin	7925040d33	manager can configure his notifications	2023-09-01 14:39:53 +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	ad89e4f278	(bug) user cant book event after has reservation canceled	2023-08-31 17:11:18 +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
Vincent	0f7f32f256	(ui) change editorial-block cta target	2023-08-29 16:22:53 +02:00
Nicolas Florentin	ffaeb7e5c8	Fix a bug: for project categories, if there is no category : do not show categories panel in show view, do not show categories input field in edit view	2023-08-29 08:29:30 +02:00
Du Peng	be69befb6b	(feat) add adds coupon in statistic export	2023-08-24 18:31:16 +02:00
Du Peng	581e08ea1e	(bug) missing reservation context in statistic global export	2023-08-24 18:00:15 +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
Vincent	9000c97aaf	(ui) Fix link	2023-08-22 19:10:08 +02:00
Du Peng	14f404dfb6	(bug) unable to cancel a payment schedule	2023-08-21 18:24:56 +02:00
Du Peng	7187e53835	(bug) unable to show projects next page button	2023-08-11 11:26:09 +02:00
Du Peng	cfe2cbdda1	(bug) 403 error when manager edit an event	2023-08-01 10:47:56 +02:00
Du Peng	65a6a80670	(feat) add submiting to save event form	2023-07-31 15:10:46 +02:00
Du Peng	2a2c451d6e	(bug) admin valid/pay event reservaiton error	2023-07-31 10:18:15 +02:00
Du Peng	cc46103eca	(bug) family event nb free place error	2023-07-28 16:25:39 +02:00
Du Peng	4f26f52d85	(feat) hide child supporting document if dont any type of supporting document	2023-07-28 14:28:54 +02:00
Vincent	3139430761	(ui) Fix select dropdown z-index	2023-07-28 10:35:36 +02:00
Du Peng	c9f17309f9	(bug) child validited cannot reserve event	2023-07-27 17:54:34 +02:00
Du Peng	5a23b8d5e5	(bug) unable to remove supporting document type	2023-07-27 17:47:22 +02:00
Du Peng	ea83265b87	(bug) child cannot be updated	2023-07-27 17:34:54 +02:00
Du Peng	af57e59ccd	(bug) event canceled places error	2023-07-26 16:10:05 +02:00
Du Peng	8a3110cd0f	(feat) add not valid status for event reservaiton	2023-07-26 15:48:14 +02:00
Du Peng	d5fa71e113	(bug) event pre-registration status	2023-07-25 18:53:12 +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
Vincent	06d917f7d3	(i18n) Update user profil form	2023-07-21 15:07:29 +02:00
Nicolas Florentin	f466826e8b	Fix a bug: hide project categories filter if there is no project categories, Improvement : dialog confirm to remove a project category	2023-07-21 10:21:08 +02:00
Nicolas Florentin	043ff6d47e	wip	2023-07-20 16:55:22 +02:00
Vincent	a4d6723413	(ui) Fix machines padding	2023-07-20 09:35:58 +02:00
Du Peng	2ceb4f1119	(bug) incorrect date range in statistics	2023-07-18 11:56:51 -04: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	3b5e087b7a	(feat) family compte setting in panel	2023-07-12 12:47:35 +02:00
Du Peng	e8228ce48f	(bug) event cannot update nb of free places	2023-07-12 12:26:49 +02:00
Du Peng	25d8b25808	(feat) add reservation status registered	2023-07-12 11:23:00 +02:00
Du Peng	b6f2187d94	(feat) add child age will be 18 worker	2023-07-12 09:29:16 +02:00
Du Peng	03d71d7a84	(feat) hide child birthday > 18 years ago	2023-07-12 08:44:02 +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	61fbb37fb2	(feat) add invalidate pre registration notification	2023-07-11 14:57:38 +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
Du Peng	1ff61c9380	(bug) unable to confirm payment of store for admin	2023-07-10 13:49:39 +02:00
Du Peng	b0a204dd1d	(feat) Improved performance when marking all notifications as read	2023-07-07 16:17:34 +02:00
Du Peng	9bc146d037	(bug) unable to create plan with plan limitation	2023-07-07 09:15:14 +02:00
Du Peng	d7d996bc6d	(feat) Ability to show all availabilities in calender for admin	2023-07-07 09:15:13 +02:00
Vincent	a8dedfe040	(ui) Add radio buttons for event validation	2023-07-06 11:24:50 +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	168d804eb9	(bug) variable is not defined	2023-07-04 17:01:04 +02:00
Vincent	ead7e79f01	(ui) Fix projects filters font-weight	2023-07-04 16:57:41 +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	e7bac208a7	(feat) child's supporting document file created/updated notification	2023-07-04 15:01:18 +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	426c74c46f	(feat) filter child in member list	2023-07-04 15:01:14 +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	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	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
Peng	6ed79fe215	Merge branch 'navbar-my-orders-link' into 'dev' ... displays "my orders" link only if store module is active See merge request projets/fab-manager!11	2023-07-03 15:44:58 +00:00
Du Peng	e50c90b30d	(bug) Accouning Line in duplicate	2023-07-03 17:43:27 +02: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
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	11a079b3e2	(bug) unable to refresh machine/space/training calender after pay an reservation	2023-06-22 11:59:52 +02:00
Du Peng	75259773d5	(bug) check object = nil	2023-06-19 21:01:01 +02:00
Du Peng	4fdbd4fcf1	(bug) unable to modify the price of prepaid pack	2023-06-08 10:50:00 +02:00
Du Peng	6c5b4d9595	(bug) OpenAPI accounting gateway_object_id missing error	2023-06-02 18:33:07 +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	6bb74bbc6a	(quality) error message for event reservation	2023-05-02 18:07:21 +02:00
Du Peng	acbe748157	(bug) unable to show calendar	2023-05-02 18:05:42 +02:00
Du Peng	47370723a8	(bug) unable to show calendar for Firefox and Safari	2023-05-02 05:49:45 -04:00
Du Peng	5bc34971d1	(bug) unable to show calendar	2023-04-25 15:11:46 +02:00
Du Peng	b588f1c780	(bug) broken notifications email	2023-04-24 19:17:07 +02:00
Du Peng	57683125a8	(bug) window end time < window start time	2023-04-21 19:28:33 +02:00
Du Peng	112df59c96	(bug) date shift in event creation/update	2023-04-21 19:27:32 +02:00
Du Peng	e39c5638b8	(quality) payzen order status	2023-04-18 10:07:30 +02:00
Du Peng	acc081a413	(bug) logout error in payment_schedules page	2023-04-17 12:20:36 +02:00
Du Peng	b4250b2ce6	(bug) abus notification error	2023-04-17 11:31:01 +02:00
Sylvain	f33a0d7657	(bug) broken notifications	2023-04-05 11:31:38 +02:00
Du Peng	60793815ce	(bug) unable to show order_paid_html notification	2023-04-05 11:07:47 +02:00
Sylvain	ef732f759b	(i18n) updated italian translations	2023-04-05 10:50:06 +02:00
Sylvain	6b98f21300	(bug) list supporting documents types for a deleted group	2023-04-05 09:59:22 +02:00
Sylvain	758827f231	(bug) notification is broken when updating payzen currency	2023-04-05 09:48:28 +02:00
Sylvain	bb717336e6	(feat) reporting ruby exceptions in the UI	2023-04-05 09:47:38 +02:00
Sylvain	5b14a9a4a7	(feat) error message on payzen misconfigured currency	2023-04-05 09:46:00 +02:00
Sylvain	7e36d49035	(bug) unable to bulk_update settings	2023-04-04 17:40:53 +02:00
Sylvain	68bee8c3e3	(bug) broken admin notifications if an order has been paid	2023-04-04 15:41:24 +02:00
Sylvain	4506038401	(merge) Merge branch 'v6' into dev	2023-04-03 11:10:57 +02:00
Sylvain	674d0ce939	(bug) by default, invoices should be ordered by date descending	2023-04-03 10:22:40 +02:00
Sylvain	a25a31b95c	(bug) invoice with esoteric ref pattern	2023-03-31 17:21:33 +02:00
Sylvain	e9205775ce	(bug) find_by_number should consider the number period ... Also: added progress indicators	2023-03-31 15:09:24 +02:00