7774 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Florentin	8217bb1a59	adds project categories	2023-06-29 08:47:42 +02:00
Du Peng	59fb10753d	(feat) some improvements for family account	2023-06-28 18:23:07 +02:00
Du Peng	9dafc9f221	(feat) new pre registration mail and notification	2023-06-28 15:33:51 +02:00
Du Peng	25debb4141	(feat) add success info after reservation is paid	2023-06-28 12:05:15 +02:00
Du Peng	ad40661594	(bug) cannot save pre registration end date is empty	2023-06-28 12:05:02 +02:00
Du Peng	57e808e992	Merge branch 'pre_inscription' into staging	2023-06-27 19:05:36 +02:00
Du Peng	0cdc8a2228	(feat) pre-register event for family compte and nominatif	2023-06-27 19:04:37 +02:00
Du Peng	9672ab2968	(feat) admin can confirm the payment of pre-registration reservation	2023-06-27 17:50:47 +02:00
Du Peng	a437fc24ee	(wip) admin confirm payment of reservation pre-registration	2023-06-26 19:28:26 +02:00
Du Peng	92d1a07819	(feat) validate pre-registration reservation	2023-06-26 16:02:54 +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	77035d81e2	Version 6.0.7	2023-06-20 15:27:23 +02:00
Du Peng	48ea7509cf	(bug) Incorrect amount calculation when paying monthly subcription with a wallet	2023-06-19 21:09:26 +02:00
Du Peng	75259773d5	(bug) check object = nil	2023-06-19 21:01:01 +02:00
Du Peng	91fa1fcd85	(bug) notification type missing	2023-06-15 19:14:02 +02:00
Du Peng	c26563944a	(feat) notification type	2023-06-15 19:12:44 +02:00
Du Peng	f9c25d521e	(feat) pre-book a event	2023-06-14 18:21:08 +02:00
Du Peng	e28286d3cc	(wip) add pre-registration to event	2023-06-13 11:38:06 +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	0dbe1420ac	Merge branch 'family_account' into staging	2023-05-31 18:27:49 +02:00
Du Peng	022bbfc3c6	(bug) hide member and child select if admin dont select a member before reserve event	2023-05-31 18:26:25 +02:00
Du Peng	b4781b1642	(feat) edit/delete child in members list	2023-05-31 18:26:24 +02:00
Du Peng	bc8521fc15	(i18n) update translation	2023-05-31 18:26:23 +02:00
Vincent	14b2574c96	(ui) fix gap	2023-05-31 15:18:39 +02:00
Vincent	549983a35d	(ui) restor deleted table's style	2023-05-31 14:55:09 +02:00
Vincent	c019f3ad3e	(ui) integration	2023-05-31 11:29:10 +02:00
Du Peng	e17c0be064	(bug) child validated_at type	2023-05-30 10:43:27 +02:00
Du Peng	4989e16e6f	(feat) child's supporting document file created/updated notification	2023-05-29 19:32:51 +02:00
Du Peng	19df3d47c0	(feat) show event reservation booking users in events of member dashbaord	2023-05-29 15:15:32 +02:00
Du Peng	010da264e8	(feat) add birthday alert for event reservation	2023-05-29 15:10:22 +02:00
Du Peng	1d4a06efa8	(bug) child birthday < 18 years ago	2023-05-29 14:41:30 +02:00
Du Peng	010701ca98	(feat) filter child in member list	2023-05-29 10:34:14 +02:00
Du Peng	4668957cfe	(feat) confirmation required for delete child	2023-05-26 18:52:14 +02:00
Du Peng	27b4ad88bd	(feat) show event booking users in member edit page	2023-05-26 18:10:29 +02:00
Du Peng	ba26f2f653	(feat) child compte validation notification	2023-05-26 16:44:18 +02:00
Du Peng	d95ef8beb7	(feat) new child notification	2023-05-26 15:55:38 +02:00
Du Peng	42946effe0	(feat) admin can refuse child's supporting document file	2023-05-26 12:54:39 +02:00
Du Peng	f1d3fdf2de	(feat) child validation	2023-05-25 20:17:37 +02:00
Du Peng	ecc4fde47f	(feat) add supporting document for child	2023-05-24 19:56:48 +02:00
Du Peng	b473a7cd35	(wip) family account css	2023-05-24 10:01:45 +02:00
Du Peng	4d0fe29bcc	(wip) show event reservation users	2023-05-15 18:23:13 +02:00
Du Peng	1b65540257	(wip) pay family and nominative event	2023-05-15 16:42:01 +02:00
Du Peng	aed5d1fc1b	(wip) add event type	2023-05-11 11:22:23 +02:00
Du Peng	6888f00036	(wip) save booking user for event nominatif	2023-05-10 18:47:13 +02:00
Du Peng	8c4602e535	(wip) event reservation naminative	2023-05-09 18:54:16 +02:00
Du Peng	dc4151cfb0	(wip) create/update user children	2023-05-04 16:54:06 +02:00
Du Peng	10ef342edf	(wip) add/edit user children	2023-05-04 16:54:05 +02:00
Du Peng	be539b1f76	(feat) add Family account setting	2023-05-04 16:54:01 +02:00
Du Peng	7cff0d6c39	Version 6.0.6	2023-05-04 14:26:15 +02:00