486 Commits

Author	SHA1	Message	Date
Vincent	d4b2b16425	(ui) integration	2023-07-04 15:01:20 +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	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	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	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
Sylvain	a24fe8cd71	Merge branch 'feature/each-reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/each-reservation-deadlines	2023-03-20 10:19:29 +01:00
Sylvain	98e58cbc25	(bug) fix invalid invoice reference	2023-03-20 10:13:42 +01:00
Guilherme Chaguri	855df4b552	Fix merge conflicts with dev	2023-03-15 16:26:45 -03:00
Sylvain	dad3babbe4	(ui) add alert on leaving plan form with unsaved changes	2023-03-13 14:19:48 +01:00
vincent	9294bc4c88	(ui) Plan form layout	2023-03-13 14:18:46 +01:00
Sylvain	92d3cbcd3e	(bug) invalid style in accounting codes settings	2023-03-06 13:13:22 +01:00
Guilherme Chaguri	1aa9b2fe39	Added reservation deadlines for each type of reservation	2023-03-01 17:44:01 -03:00
Sylvain	892ffbe138	(quality) rename proof-of-identity to supporting-document	2023-02-15 10:30:13 +01:00
Karen	35f2a69048	(feat) Add unsaved form alert and refreshed tabs on admin machines and trainings view	2023-02-15 10:30:09 +01:00
Karen	7a83a38c68	(quality) replace Angular-controlled notifications list with react code	2023-02-15 10:30:08 +01:00
Karen	10de4fcf5e	(bug) fix display of banners and add unsaved form alert on events banner	2023-02-15 10:30:06 +01:00
Sylvain	42e89ea1b0	(quality) do not load not shown components	2023-02-15 10:30:02 +01:00
Karen	116475780f	(ui) delete banner insight in admin view for machines and trainings	2023-02-15 10:29:58 +01:00
Karen	0f6f763814	(feat) add custom banner on events	2023-02-15 10:29:58 +01:00
Vincent	c194ac9b31	(ui) Update machines and spaces lists layout	2023-02-15 10:29:57 +01:00
Sylvain	a77bf46bcd	(ui) hide work in progress	2023-02-15 10:29:56 +01:00
Sylvain	fea26285d6	(feat) improved calendars loading time ... + (feat) ability to choose a machine in the public calendar	2023-02-15 10:29:55 +01:00
Sylvain	986a663c40	(feat) places cache for slots	2023-02-15 10:29:54 +01:00
Sylvain	bbaac2c122	(wip) use cartitem from order api	2023-02-15 10:29:51 +01:00
Sylvain	42d830b4f8	(feat) save cart items in db	2023-02-15 10:29:46 +01:00
Vincent	994b919b58	(ui) Fix layout width	2023-02-15 10:28:18 +01:00
Sylvain	2b42858229	(feat) display special style if a training override general settings	2023-02-15 10:28:16 +01:00
Karen	0778616345	(feat) add a custom banner for trainings	2023-02-15 10:28:13 +01:00
Karen	a1eaa2eae7	(feat) machines custom banner frontend and frontend test	2023-02-15 10:28:09 +01:00
vincent	7208cd80b0	(quality) Refacto pack-form	2023-02-15 10:28:06 +01:00
Sylvain	305b5425bc	(ui) display trainings in list	2023-02-15 10:28:03 +01:00
vincent	2ea6f49e35	(ui) Editorial block rwd	2023-02-15 10:28:02 +01:00
vincent	9ac9a2a725	(ui) Update product categories layout	2023-02-15 10:28:01 +01:00
vincent	18f0cf3f0f	(ui) Fix edit event form layout	2023-02-15 10:28:00 +01:00
vincent	49a06a9176	(ui) Update machines layout	2023-02-15 10:27:59 +01:00
vincent	5fd2d3fc79	(ui) Add missing margin	2023-02-15 10:27:59 +01:00
vincent	6e38e72851	(ui) Add editorial text block	2023-02-15 10:27:57 +01:00
vincent	98e10dc774	(ui) Uniform layout for settings and form	2023-02-15 10:27:57 +01:00
vincent	a0508e689e	(feat) Add characters count to form input	2023-02-15 10:27:56 +01:00
vincent	7edec2bd69	(ui) Training form	2023-02-15 10:27:56 +01:00
vincent	17c70e0c81	(ui) Trainings settings + style cleanup	2023-02-15 10:27:55 +01:00
vincent	47229d9fff	(ui) Fix layout	2023-02-15 10:27:55 +01:00
vincent	554ed083d0	(ui) Update layout	2023-02-15 10:27:54 +01:00
Karen	b9d86aecdc	(quality) status property :label is now :name for better coherence	2023-02-15 10:27:54 +01:00
Karen	96ddb40c59	(feat) Add Status Settings in Projects Settings	2023-02-15 10:27:53 +01:00
Karen	d80cc4769a	(feat) filter for status in project gallery	2023-02-15 10:27:49 +01:00
Karen	7209dfbe7b	(ui) create status project component	2023-02-15 10:27:13 +01:00
Sylvain	28b64f3c6d	(feat) buy a new prepaid pack from the dashboard	2023-02-15 10:27:12 +01:00
vincent	eb7c4de0ce	(ui) Dashboard inte	2023-02-15 10:26:14 +01:00
Sylvain	dde6782475	(bug) wrong times in admin/event monitoring	2023-02-14 11:37:07 +01:00
Sylvain	193407e0da	(bug) filter statistics by slot date	2023-02-02 11:02:33 +01:00
vincent	5001098f85	(ui) Move Add machine button	2023-01-09 14:57:38 +01:00
Sylvain	e24fca7f9d	(bug) event is over before the end	2023-01-09 11:37:58 +01:00
Sylvain	8ce1ceb345	(quality) translate validation messages	2023-01-04 11:12:02 +01:00
Sylvain	43f45c383f	(feat) cancel subscription	2023-01-03 17:17:39 +01:00
Du Peng	e7615b70a6	(feat) use switch instant of checkbox in show slots unavailables calendar filter	2023-01-03 15:26:32 +01:00
Sylvain	5630872b5f	(bug) update VAT name in front after change	2023-01-03 10:25:41 +01:00
Du Peng	29b92475bb	(feat) Ability to filter uniq slots reserved in admin calendar	2023-01-02 19:20:02 +01:00
Sylvain	7fc79d44e5	(feat) machines reservable or not	2022-12-27 16:14:29 +01:00
Sylvain	898ce07509	(merge) Merge branch 'staging' into dev	2022-12-27 12:20:18 +01:00
Sylvain	f8904dfb9c	(feat) customize VAT name	2022-12-27 12:13:24 +01:00
Sylvain	574974c239	(merge) Merge branch 'machine_category' into staging	2022-12-27 10:59:36 +01:00
Sylvain	e139067954	(feat) prevent generate invoices at 0	2022-12-23 14:14:42 +01:00
Du Peng	774ce35fa8	(feat) add accordion for calendar filter	2022-12-22 15:18:53 +01:00
Sylvain	4b84963d7f	(feat) optional external id	2022-12-21 14:14:29 +01:00
Sylvain	13eeff5964	(ui) enable advanced accounting button in separate box	2022-12-21 14:12:15 +01:00
Sylvain	37f30e26a9	(feat) enable/disable advanced accounting	2022-12-21 14:05:16 +01:00
Sylvain	be8ae01ba4	(ui) refactor plan form ... Also: add advanced accounting to plans	2022-12-21 14:05:16 +01:00
Sylvain	85fcc71d6b	(wip) refactor plan form	2022-12-21 14:05:15 +01:00
Sylvain	3d796549f2	(ui) refactor event form	2022-12-21 14:05:14 +01:00
Sylvain	8df60a8712	(ui) refactor space form	2022-12-21 14:05:14 +01:00
Sylvain	3d88266fe6	(ui) refactor training form	2022-12-21 14:05:13 +01:00
Sylvain	4203da097c	(ui) refactor machine creation form	2022-12-21 14:05:13 +01:00
Sylvain	4cc6574f58	(ui) refactor machine edition form	2022-12-21 14:05:09 +01:00
Du Peng	f47440c85a	(feat) add machine category	2022-12-20 18:45:53 +01:00
Sylvain	795928c07c	(feat) Add reservation deadline parameter	2022-12-19 09:58:44 +01:00
Sylvain	66b1db6d0a	(bug) phone/adresse required not shown	2022-12-16 15:35:02 +01:00
Sylvain	14b5c40ec8	Merge branch 'feature/reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/reservation-deadlines	2022-12-14 11:30:54 +01:00
Sylvain	575c7c7d62	(feat) updated FabAnalytics reports to include new features	2022-12-01 16:34:14 +01:00
Guilherme Chaguri	dea9663f37	Added reservation deadline parameter	2022-11-29 17:02:01 -03:00
Sylvain	20e50bda13	(bug) fix file/image input components	2022-11-03 09:26:21 +01:00