3489 Commits

Author	SHA1	Message	Date
Sylvain	1205cb925c	(bug) event image update not shown	2023-02-15 16:30:47 +01:00
Vincent	93473a8b6f	(ui) Fix trainings list display	2023-02-15 16:26:09 +01:00
Sylvain	a179601b97	(quality) lint code	2023-02-15 16:02:49 +01:00
Sylvain	8312842acc	(test) frontend lib testing	2023-02-15 10:30:14 +01:00
Sylvain	892ffbe138	(quality) rename proof-of-identity to supporting-document	2023-02-15 10:30:13 +01:00
Sylvain	979042078d	(quality) rename proof-of-identity to supporting-documents in notifications	2023-02-15 10:30:13 +01:00
Karen	f7ed347fcb	(bug) fix default tab in notif center and some documentation	2023-02-15 10:30:12 +01:00
Karen	94c3e3effd	(bug) fix wrong query for listing notifications with preferences	2023-02-15 10:30:11 +01:00
Karen	84b28ffddf	(test) fix broken test	2023-02-15 10:30:10 +01:00
Vincent	856a6fa321	(ui) Fix machines list layout	2023-02-15 10:30:10 +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	6217e9e6b1	(bug) fix syntax error in stylesheet	2023-02-15 10:30:09 +01:00
Karen	10473182d4	(feat) Admin can control its notifications preferences	2023-02-15 10:30:08 +01:00
Karen	7a83a38c68	(quality) replace Angular-controlled notifications list with react code	2023-02-15 10:30:08 +01:00
Karen	9b69aad9df	(feat) backend for notifications preference system	2023-02-15 10:30:07 +01:00
Karen	54dbd5ef4d	(quality) replacement of the gem NotifyWith by internal code	2023-02-15 10:30:07 +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	2fc4a59670	(bug) prevent buying packs if restricted or no packs for a machine	2023-02-15 10:30:05 +01:00
Sylvain	eb6cd17b7c	(feat) export external_id and notes	2023-02-15 10:30:04 +01:00
Sylvain	09897b7067	(bug) invalid tables names for cart items	2023-02-15 10:30:03 +01:00
Sylvain	42e89ea1b0	(quality) do not load not shown components	2023-02-15 10:30:02 +01:00
Sylvain	a6f98fb6ce	(bug) crash on empty input	2023-02-15 10:30:02 +01:00
Sylvain	23ba44bc57	(bug) auto cancel trainings ... - Wrong trainings sessions was cancelled (in the past instead of in the futur) - Notifications about auto refunds was incorrect	2023-02-15 10:30:01 +01:00
Sylvain	f00c7e65a7	(feat) default apply general settings when creating a training	2023-02-15 10:29:59 +01:00
Sylvain	4a8e69a06e	(ui) show required fields not filled in trainings settings	2023-02-15 10:29:59 +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	e5b199f8ed	(quality) improved calendar loading time	2023-02-15 10:29:57 +01:00
Sylvain	a77bf46bcd	(ui) hide work in progress	2023-02-15 10:29:56 +01:00
Sylvain	ed6a397b89	(test) test places cache	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	d0239a0e25	(wip) move slot status request	2023-02-15 10:29:55 +01:00
Sylvain	986a663c40	(feat) places cache for slots	2023-02-15 10:29:54 +01:00
Sylvain	9f9a2e616f	(feat) slots/availabilities status for pending reservations	2023-02-15 10:29:54 +01:00
Sylvain	6433767846	(quality) properly handle project not found exception	2023-02-15 10:29:53 +01:00
Sylvain	473aedbdcb	(feat) add reservations in cart/order	2023-02-15 10:29:53 +01:00
Sylvain	05a6f517cd	(wip) cart items components	2023-02-15 10:29:53 +01:00
Sylvain	c24673fefa	(quality) log errors to the JS console	2023-02-15 10:29:52 +01:00
Sylvain	cdc7dc963d	(i18n) translate new errors	2023-02-15 10:29:51 +01:00
Sylvain	bbaac2c122	(wip) use cartitem from order api	2023-02-15 10:29:51 +01:00
Sylvain	bfe0936b40	(feat) save both operator/customer for orders	2023-02-15 10:29:50 +01:00
Sylvain	48a44ff4f3	(feat) create cart items from the api	2023-02-15 10:29:50 +01:00
Sylvain	42d830b4f8	(feat) save cart items in db	2023-02-15 10:29:46 +01:00
Sylvain	7a1809940c	(bug) fix a11y of product form	2023-02-15 10:28:20 +01:00
Vincent	47180755e1	(i18n) update texts	2023-02-15 10:28:19 +01:00
Vincent	994b919b58	(ui) Fix layout width	2023-02-15 10:28:18 +01:00
Sylvain	6fa12d3996	(test) training default settings	2023-02-15 10:28:17 +01:00
Sylvain	2b42858229	(feat) display special style if a training override general settings	2023-02-15 10:28:16 +01:00
Sylvain	73a7f3bcbd	(bug) unable to compile assets ... Unexpected token, expected ','	2023-02-15 10:28:15 +01:00
Karen	0778616345	(feat) add a custom banner for trainings	2023-02-15 10:28:13 +01:00
Karen	06a93391a2	(quality) remove unnecessary getValue function	2023-02-15 10:28:13 +01:00
Karen	4800d4aee1	(quality) add typing for status filter and settings	2023-02-15 10:28:12 +01:00
Karen	0d508839e5	(feat) machines custom banner frontend and frontend test	2023-02-15 10:28:12 +01:00
Karen	7357ece87f	(bug) show error validation message	2023-02-15 10:28:11 +01:00
Karen	9396c5371e	(feat) create settings for machines banner backend	2023-02-15 10:28:11 +01:00
Sylvain	d58ab30c4e	(bug) fix merge conflict resolution error	2023-02-15 10:28:11 +01:00
Karen	f57df4cc6e	(quality) remove unnecessary getValue function	2023-02-15 10:28:10 +01:00
Karen	82a88aadad	(quality) add typing for status filter and settings	2023-02-15 10:28:09 +01:00
Karen	7047c557cd	(bug) wrong typing on status js model	2023-02-15 10:28:09 +01:00
Karen	a1eaa2eae7	(feat) machines custom banner frontend and frontend test	2023-02-15 10:28:09 +01:00
Karen	4dde127203	(bug) show error validation message	2023-02-15 10:28:08 +01:00
Karen	5658e0aeed	(feat) create settings for machines banner backend	2023-02-15 10:28:08 +01:00
Sylvain	ddc2dd4c6e	(feat) training auto cancel authorization and invalidation rule	2023-02-15 10:28:07 +01:00
Sylvain	78cb8b7854	(quality) isolate auto cancel features in separate service	2023-02-15 10:28:07 +01:00
vincent	7208cd80b0	(quality) Refacto pack-form	2023-02-15 10:28:06 +01:00
Sylvain	a05ef1f0ba	(feat) auto refund after trainings cancelled and notify	2023-02-15 10:28:05 +01:00
Sylvain	71305bbc8f	(wip) notify admin on auto cancel	2023-02-15 10:28:04 +01:00
Sylvain	c804c84113	(feat) per training settings for auto cancel	2023-02-15 10:28:04 +01:00
Sylvain	e2edbb419a	(feat) auto cancel trainings under the threshold	2023-02-15 10:28:04 +01:00
vincent	0dc564a294	(ui) Fix button color	2023-02-15 10:28:03 +01:00
Sylvain	305b5425bc	(ui) display trainings in list	2023-02-15 10:28:03 +01:00
Sylvain	117bd36caa	(ui) reservable machine cannot be disabled	2023-02-15 10:28:02 +01:00
vincent	2ea6f49e35	(ui) Editorial block rwd	2023-02-15 10:28:02 +01:00
vincent	1c38073b1b	(quality) Editorial-block component + clean up	2023-02-15 10:28:01 +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	4f46e62b87	(ui) Add link to agenda	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	d2f650a150	(ui) Fixe order layout	2023-02-15 10:27:58 +01:00
vincent	c12bf45ff8	(ui) Update store layout	2023-02-15 10:27:58 +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	4aba30c5e3	(feat) project statuses api	2023-02-15 10:27:13 +01:00
Karen	7209dfbe7b	(ui) create status project component	2023-02-15 10:27:13 +01:00
Sylvain	63e8a1a4a6	(ui) mark canceled slots as this	2023-02-15 10:27:12 +01:00
Sylvain	28b64f3c6d	(feat) buy a new prepaid pack from the dashboard	2023-02-15 10:27:12 +01:00
Sylvain	4c4ebe3b47	(feat) report status of user's prepaid packs in dashboard	2023-02-15 10:27:08 +01:00
vincent	4650d0e1cb	(ui) Add missing cta	2023-02-15 10:26:15 +01:00
vincent	eb7c4de0ce	(ui) Dashboard inte	2023-02-15 10:26:14 +01:00
Sylvain	34914c1c4d	(bug) fix missing stat subtype	2023-02-14 17:03:54 +01:00
Sylvain	eba0c99ae5	(bug) date shift in event creation/update	2023-02-14 16:47:06 +01:00
Sylvain	04f933f94d	(bug) deal with DST using Time instead of DateTime	2023-02-14 13:10:58 +01:00
Sylvain	dde6782475	(bug) wrong times in admin/event monitoring	2023-02-14 11:37:07 +01:00
Du Peng	e5eb24a9dc	(bug) change event date with wrong timezone	2023-02-13 11:39:36 +01:00
Du Peng	30daed11fd	(bug) unable to get latest payment_gateway_object for plan/machine/training/space	2023-02-07 19:35:33 +01:00
Du Peng	37989aec63	(feat) OpenAPI endpoint to fetch subscription data	2023-02-06 16:46:54 +01:00
Du Peng	74ebad6dc0	(quality) remove unused code	2023-02-06 14:59:11 +01:00
Sylvain	1644bc43db	(bug) invalid date display in negative timezones	2023-02-03 17:25:24 +01:00
Sylvain	4d942b4161	(quality) Optimized statistics fetcher service	2023-02-02 15:43:05 +01:00
Sylvain	193407e0da	(bug) filter statistics by slot date	2023-02-02 11:02:33 +01:00
Sylvain	71579e7465	(wip) slot date in stats	2023-01-31 17:10:07 +01:00
Sylvain	001d024948	(bug) unable to create a non-rolling plan	2023-01-31 13:49:37 +01:00
Sylvain	98d6363525	(bug) unable to create a recurrent event	2023-01-31 11:39:51 +01:00
Sylvain	66311b8761	(bug) invalid month in some date format	2023-01-31 10:44:45 +01:00
Sylvain	65e2f037ab	(bug) invalid plan prices in interface	2023-01-26 09:39:27 +01:00
Sylvain	0ac3caf96a	(bug) admin cannot book an event for himself	2023-01-25 12:37:06 +01:00
Sylvain	c1159b2aed	(bug) update plan prices	2023-01-25 12:08:16 +01:00
Sylvain	029eb90d78	(feat) soft-destroy a reserved event	2023-01-20 08:53:37 +01:00
Sylvain	f204f654c2	(feat) map external id from sso	2023-01-19 17:33:48 +01:00
Sylvain	91dd7b174e	(bug) unable to export accounting if label not defined	2023-01-19 15:25:20 +01:00
Sylvain	921b5eab2f	(bug) invalid event date in negative TZ	2023-01-13 12:15:48 +01:00
Sylvain	f9fc74b2ee	(test) oauth2 providers	2023-01-10 13:09:04 +01:00
vincent	5001098f85	(ui) Move Add machine button	2023-01-09 14:57:38 +01:00
Sylvain	68e5f6dc20	(security) restrict access to stats endpoint	2023-01-09 13:13:24 +01:00
Sylvain	eff829471a	(bug) event in negative timezone	2023-01-09 12:26:43 +01:00
Sylvain	e24fca7f9d	(bug) event is over before the end	2023-01-09 11:37:58 +01:00
Sylvain	048a640197	(bug) updating a ressource removes the image	2023-01-09 10:45:37 +01:00
Sylvain	dd30f79f7c	(bug) unable to build accounting archive	2023-01-09 10:20:19 +01:00
Sylvain	d191712ec0	(bug) unable to update an event category	2023-01-09 09:24:11 +01:00
Sylvain	b14329497b	(test) abuses, age_range, categories	2023-01-06 17:18:44 +01:00
Sylvain	3289073e85	(bug) restore accounting period	2023-01-06 17:15:39 +01:00
Sylvain	d77283dd0a	(bug) failed to create manager cryptic error	2023-01-06 15:14:17 +01:00
Sylvain	5588948bf7	(bug) VAT decimal values	2023-01-06 13:05:51 +01:00
Sylvain	75a4783e43	(bug) canceled reservations in dashboard	2023-01-06 12:51:09 +01:00
Du Peng	045fe18cdd	(bug) unable to filter Show only slots with reservations in public calendar for admin	2023-01-06 11:06:40 +01:00
Sylvain	8863ac7047	(bug) no main item on some invoices	2023-01-06 10:31:20 +01:00
Sylvain	5dae938078	(bug) empty object for some invoice item	2023-01-06 10:15:32 +01:00
Sylvain	7b195ab2ec	(bug) unable to generate avoir label	2023-01-05 12:21:53 +01:00
Sylvain	10f054256e	(feat) payment schedule due in invoices	2023-01-05 12:09:16 +01:00
Sylvain	ac187a986f	(bug) payment schedule by check	2023-01-05 11:45:23 +01:00
Sylvain	cbb7e8cbcf	(bug) unable to return to the statistics tab	2023-01-04 12:14:03 +01:00
Sylvain	8d43db2579	(feat) Report subsription mismatch with user's group	2023-01-04 12:08:37 +01:00
Sylvain	8ce1ceb345	(quality) translate validation messages	2023-01-04 11:12:02 +01:00
Sylvain	7bb97d267d	(feat) build accounting data for yesterday by default	2023-01-04 10:27:14 +01:00
Sylvain	43f45c383f	(feat) cancel subscription	2023-01-03 17:17:39 +01:00
Sylvain	e8649818de	(feat) help about reservable machine switch	2023-01-03 16:27:15 +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	16c24e565c	(feat) custom message on invoice PDF not found	2023-01-03 11:07:41 +01:00
Sylvain	dff0db809d	(bug) unable to sync objects on stripe	2023-01-03 10:41:01 +01:00
Sylvain	3ec88c8f5f	(bug) unable to udpate some settings	2023-01-03 10:36:45 +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
Du Peng	a740d984ee	(bug) unable to update title of availability after admin remove a machine/plan in calendar	2023-01-02 16:08:47 +01:00
vincent	14d649c935	Remove alignment from Summernote editor	2023-01-02 09:57:34 +01:00
Sylvain	7cd689b92c	(bug) product low stock notification	2022-12-28 11:01:05 +01:00
Sylvain	051f182839	(bug) clear date in suscription extend free days	2022-12-27 17:15:49 +01:00
Sylvain	7fc79d44e5	(feat) machines reservable or not	2022-12-27 16:14:29 +01:00
Sylvain	f0d9537182	(feat) default image for events	2022-12-27 15:11:28 +01:00
Sylvain	b9965e54e7	(bug) unable to set product main image	2022-12-27 14:59:24 +01:00
Sylvain	e020c592ec	(bug) rebuild accounting when invoices(0).disabled	2022-12-27 14:39:26 +01:00
Sylvain	751cdd62c6	(bug) feature tour in admin/settings is broken	2022-12-27 13:49:44 +01:00
Sylvain	0fafd30486	(i18n) missing translation	2022-12-27 13:38:09 +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	ed4295b847	(bug) broken notifications if slot cancelled	2022-12-22 15:12:56 +01:00
Sylvain	00d841e2c6	(bug) no method find on undefined planCategories	2022-12-22 14:56:59 +01:00
Sylvain	cde322befe	(bug) unable to add event price	2022-12-22 13:42:41 +01:00
Sylvain	785e80a6f4	(test) PasswordStrength	2022-12-22 12:11:14 +01:00
Sylvain	137b9f3c1b	(feat) improved security when changing password	2022-12-22 11:07:14 +01:00
Sylvain	e7912557eb	(test) UserProfileForm	2022-12-21 14:14:39 +01:00
Sylvain	02a8202f2f	(feat) private note	2022-12-21 14:14:39 +01:00
Sylvain	86756f911b	(bug) api/accounting: amounts expressed in centimes	2022-12-21 14:14:38 +01:00
Sylvain	b552e5e626	(feat) rename client accounts to financial	2022-12-21 14:14:37 +01:00
Sylvain	40dd3f11b8	(api) accounting: invoice.payment_details.payment_mean	2022-12-21 14:14:36 +01:00
Sylvain	4d7e09c98d	(feat) multiple accounting journals	2022-12-21 14:14:36 +01:00
Sylvain	31ba4d3486	(api) accounting: payment details	2022-12-21 14:14:35 +01:00
Sylvain	e3eb8eb516	(api) accounting: report external id for user	2022-12-21 14:14:35 +01:00
Sylvain	90dc38ed10	(feat) move external id to InvoicingProfile	2022-12-21 14:14:34 +01:00
Sylvain	05ba27289b	(quality) reduce deletion delay ... This is safe because AccountingLine does not have any delete dependency	2022-12-21 14:14:34 +01:00
Sylvain	9b5cf8842e	(api) accounting: filter by type	2022-12-21 14:14:34 +01:00
Sylvain	3a05398c8c	(api) accounting: report build status	2022-12-21 14:14:33 +01:00
Sylvain	b7838db648	(feat) clean accounting lines async before rebuilding	2022-12-21 14:14:33 +01:00
Sylvain	0ca7c8fb11	(quality) remove dead code	2022-12-21 14:14:32 +01:00
Sylvain	293ea37293	(quality) lint Profile model	2022-12-21 14:14:32 +01:00
Sylvain	4763014ec8	(api) users: first_name, last_name	2022-12-21 14:14:31 +01:00
Sylvain	fdddb545d9	(feat) OpenAPI/users: gender, organization, address	2022-12-21 14:14:31 +01:00
Sylvain	dcaa5ad28c	(bug) unsupported param[] syntax in OpenAPI	2022-12-21 14:14:30 +01:00
Sylvain	9ac2655256	(feat) OpenAPI/users: filter by created_after	2022-12-21 14:14:30 +01:00
Sylvain	7659597e32	(doc) Updated OpenAPI documentation	2022-12-21 14:14:29 +01:00
Sylvain	4b84963d7f	(feat) optional external id	2022-12-21 14:14:29 +01:00
Sylvain	e246480049	(test) ProductForm	2022-12-21 14:14:28 +01:00
Sylvain	d547660170	(bug) unable to set price on new product	2022-12-21 14:14:28 +01:00
Sylvain	7cd25a68df	(bug) unable to export VAT	2022-12-21 14:14:27 +01:00
Sylvain	ad8e95922f	(bug) machine advanced accouting codes, files attachements, image	2022-12-21 14:14:27 +01:00
Sylvain	c1638ab54d	(test) tiptap & file uploads	2022-12-21 14:14:26 +01:00
Sylvain	b30701ba6f	(test) improved frontend tests	2022-12-21 14:14:25 +01:00
Sylvain	664e42099a	(test) improved settings fixtures	2022-12-21 14:14:24 +01:00
Sylvain	7d83d6454f	(test) Jest + react-testing-library ... This commit aims to put a testing environment in place for frontend react components using the de-facto standards for our stack. An example test file was writter for the component plan-form.tsx. Some fixtures for some API endpoints were written (see __setup__/server.js)	2022-12-21 14:14:22 +01:00
Sylvain	2889fb8e12	(bug) unable to manage stocks on new product	2022-12-21 14:12:16 +01:00
Sylvain	2cf18c277c	(bug) create recurrent event ... Also: (test) test trainings API Also: (test) test create recurrent event	2022-12-21 14:12:16 +01:00
Sylvain	5d1c70a26e	(test) accounting service	2022-12-21 14:12:15 +01:00
Sylvain	13eeff5964	(ui) enable advanced accounting button in separate box	2022-12-21 14:12:15 +01:00
Sylvain	bc5e306091	(bug) training default seats should be null	2022-12-21 14:12:14 +01:00
Sylvain	a55880a0ad	(feat) OpenAPI endpoint for accounting ... Also: (bug) filter by array in openAPI = error	2022-12-21 14:12:14 +01:00
Sylvain	523529228c	(bug) callback renamed by error	2022-12-21 14:12:14 +01:00
Sylvain	749f848034	(feat) rebuild accounting lines on updates	2022-12-21 14:12:13 +01:00
Sylvain	b3072ec444	(feat) auto fix rouding errors on accounting lines ... Also: (ui) added help tooltips on some input fields	2022-12-21 14:12:10 +01:00
Sylvain	af3def0e2e	(feat) save the accounting data in DB ... Previously, the accounting data were built on demand, extracting the data from the invoices on-the-fly. This is intended to be used only once in a while, so there was no performance issue with that. Now, we want those data to be accessed from the OpenAPI, so building them on-the-fly would be very much intensive and resouces heavy. So we build them each nights using a scheduled worker and save them in the database	2022-12-21 14:11:40 +01:00
Sylvain	514a797b64	(wip) accounting endpoint for the OpenAPI	2022-12-21 14:11:39 +01:00
Sylvain	85ec08ae67	(quality) adapt code to New JSX transform	2022-12-21 14:11:36 +01:00
Sylvain	25edbcfbb0	(feat) use advanced accounting codes in accounting export	2022-12-21 14:05:17 +01:00
Sylvain	462a764276	(quality) moved accounting services to a decicated module	2022-12-21 14:05:17 +01:00
Sylvain	37f30e26a9	(feat) enable/disable advanced accounting	2022-12-21 14:05:16 +01:00
Sylvain	bec610458c	(bug) do not create plans for disabled groups ... Also: (bug) unable to create plan without partner (bug) unable to set plan price to a decimal number (bug) unable to create a plan without toggling the partner switch (quality) linted PlansService	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	4a9cbbb227	(feat) advanced accounting for products	2022-12-21 14:05:15 +01:00
Sylvain	7868f31a58	(feat) advanced accounting parameters ... for: machines, spaces, trainings, events	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	bcd76ee6d5	(bug) always show machine availability in calender if machine module is inactive	2022-12-20 18:46:25 +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
Guilherme Chaguri	9b2e1909d9	Allow last minute reservations by admins	2022-12-16 10:48:56 -03:00
Sylvain	380373a16d	Merge branch 'fix/availabitilies_export_reservations' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/availabitilies_export_reservations	2022-12-14 12:30:11 +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
Du Peng	3224daf791	(bug) unable to credit wallet amount	2022-12-12 16:25:29 +01:00
Du Peng	766c08a302	(bug) fix unable to update/delete a space	2022-12-12 14:19:57 +01:00
Sylvain	575c7c7d62	(feat) updated FabAnalytics reports to include new features	2022-12-01 16:34:14 +01:00
Sylvain	7b30086a34	(bug) unable to set amount to 4.85	2022-12-01 15:43:16 +01:00
Sylvain	963d2e93bd	(bug) unable to export statistics	2022-12-01 13:03:19 +01:00
Guilherme Chaguri	be4ea06fdf	(Bug) Fix reservations count from spaces in availabilities export	2022-11-29 18:18:47 -03:00
Guilherme Chaguri	dea9663f37	Added reservation deadline parameter	2022-11-29 17:02:01 -03:00
Sylvain	8eaeb2df39	(bug) soft-destroyed still reported in OpenAPI ... Also: improved testing	2022-11-23 11:59:06 +01:00
Du Peng	1f5808da4a	(quality) use point instant of square brackets in react-form-hook field path	2022-11-22 17:12:39 +01:00
Du Peng	fe0af02ba8	(bug) unable set a main image of product and remove an image of product	2022-11-22 16:31:34 +01:00
Sylvain	509dd0eb5f	(feat) soft destroy machines/spaces	2022-11-22 14:17:25 +01:00
Sylvain	16087d3aa3	(bug) objects not sync on Stripe	2022-11-21 16:56:28 +01:00
Sylvain	b2540a1cd4	(bug) broken display of machines pages	2022-11-21 15:22:23 +01:00
Sylvain	451cd0e915	(test) add admin offer product to himself ... Also: split AdminPayOrderTest in two files	2022-11-17 17:14:31 +01:00
Sylvain	5860466be3	(bug) unable to download existing stats export	2022-11-17 16:35:26 +01:00
Sylvain	c284190253	(quality) lint HistoryValue	2022-11-17 11:47:47 +01:00
Sylvain	eb15e0e5a2	(feat) default sort invoices by date	2022-11-17 11:20:49 +01:00
Sylvain	c6aef07fb4	(bug) unable to reserve a machine with payment on site	2022-11-17 10:56:03 +01:00
Sylvain	d9b3f22366	(bug) unable to export statistics	2022-11-16 16:55:56 +01:00
Sylvain	25606a2642	(bug) unable to merge an SSO account with an existing account	2022-11-15 15:12:08 +01:00
Sylvain	a776b9cc6a	(bug) free disk space not verified in some cases	2022-11-14 09:32:32 +01:00
Du Peng	ef6bc6c046	Merge branch 'product-store' into product-store_dev	2022-11-07 18:58:22 +01:00
Du Peng	ac2de3d22e	(bug) admin cannot pay order by card	2022-11-07 18:51:49 +01:00
Du Peng	42be9ae3e7	(bug) fix cant set payment_method if admin pay a reservation himself in invoice	2022-11-07 16:04:53 +01:00
Sylvain	35656229ad	(bug) should not change group of subscriber	2022-11-07 15:14:33 +01:00
Sylvain	a8623487fd	(bug) admin shop for himself ... Crash if there was no offered product when the admin select himself in the list	2022-11-07 11:56:35 +01:00
Sylvain	d3d285dfbe	(bug) configuring price does not edit the right prices	2022-11-07 11:40:36 +01:00
Sylvain	7c7ec0aa4c	(feature) admin can buy product for himself	2022-11-04 12:18:04 +01:00
Sylvain	60580a2bae	(bug) no plan for the user's group	2022-11-04 09:58:32 +01:00
Sylvain	c9c9ed9a02	(feature) auto validate admins	2022-11-04 09:46:17 +01:00
Sylvain	1f97393a12	(bug) invalid VAT rate	2022-11-04 08:12:13 +01:00
Sylvain	83fb4f11ff	(bug) switch display is broken	2022-11-03 10:07:14 +01:00
Sylvain	20e50bda13	(bug) fix file/image input components	2022-11-03 09:26:21 +01:00
Sylvain	a97e08b43b	(quality) refactored upload components	2022-10-28 14:59:52 +02:00
Sylvain	74f826eef7	(merge) Merge branch 'product-store' into product-store_dev	2022-10-28 14:32:11 +02:00
Sylvain	9f3cbc46a3	(quality) refactor selectOption	2022-10-28 14:30:41 +02:00
Sylvain	46e042fd38	(bug) test on invoice items was not idempotent	2022-10-28 10:25:10 +02:00
Du Peng	65ded9d847	Merge branch 'product-store' into product-store_dev	2022-10-27 18:08:15 +02:00
Sylvain	71d5abdedb	(bug) invalid coupon amount in PDF invoices	2022-10-27 16:45:38 +02:00
Sylvain	a3190115ab	(bug) invoice rounding error using coupons	2022-10-27 16:04:21 +02:00
vincent	feb191ca70	(ui) Fix image bg and list items border	2022-10-27 08:52:21 +02:00
Sylvain	fc2b52c2ca	(bug) invalid accounting export for store orders	2022-10-26 14:32:19 +02:00
Du Peng	6d448e0af2	(merge) merge dev and product-store	2022-10-26 09:37:31 +02:00
Sylvain	0c785aae06	(feat) default image for machines	2022-10-25 17:08:32 +02:00
Sylvain	fcbee960a7	(bug) reload store on category url change	2022-10-25 14:50:09 +02:00
Sylvain	c9901a89e1	(test) test admin reserves for himself	2022-10-25 14:31:31 +02:00
Sylvain	744b811b62	(feat) remove admins group: allow admins to reserve	2022-10-25 11:57:26 +02:00
Sylvain	45129e3e37	(quality) linted code about payment schedules	2022-10-25 10:52:33 +02:00
Sylvain	f9f60cba17	(wip) allow admin to reserve for himself	2022-10-24 17:39:16 +02:00
Sylvain	d4613cdbcc	(quality) refactored EventService to match rubocop rules	2022-10-24 15:56:04 +02:00
Du Peng	0fddd22df8	(bug) admin cannot filter product availble in store	2022-10-24 12:34:20 +02:00
Sylvain	873752172d	(bug) no statistics on trainings and spaces reservations	2022-10-24 12:12:49 +02:00
vincent	b3d9c6b3bf	(i18n) update	2022-10-24 12:10:42 +02:00
Sylvain	fdac8168ef	(quality) refactored SingleSignOnConcern to match rubocop rules	2022-10-24 11:43:30 +02:00
Sylvain	e5fc418ecf	Merge branch 'fix/sso-admin-group-id' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/sso-admin-group-id	2022-10-24 10:53:06 +02:00
Sylvain	50138ece51	(feat) search by username (#401)	2022-10-24 10:17:07 +02:00
Du Peng	ef3a8641d5	(feat) update created at date after paid an order	2022-10-21 19:10:57 +02:00
Du Peng	1f7f9be37d	(feat) if a child category is selected, with every sibling of it, we dont automatically select its parent	2022-10-21 18:57:11 +02:00
Du Peng	b1135f6df0	(feat) save latest product filter when click back button	2022-10-20 19:14:16 +02:00
Du Peng	2f676d1a89	(feat) add loading for save product btn	2022-10-20 19:14:16 +02:00
Du Peng	531b8d4947	(quality) clean code	2022-10-20 19:14:16 +02:00
Du Peng	c43ce2b142	(feat) hidden product count in category config page	2022-10-20 19:14:16 +02:00
Du Peng	5804b6230d	(bug) show product count is only active in category	2022-10-20 19:14:16 +02:00
Du Peng	9eeef449ab	(bug) product category filter	2022-10-20 19:14:16 +02:00
Du Peng	b2ddc48d51	(bug) product search accent letter	2022-10-20 19:14:16 +02:00
Du Peng	de960cf00c	(bug) filter product is available in admin products list	2022-10-20 19:14:16 +02:00
Du Peng	0abb3641df	(bug) product category order in store	2022-10-20 19:14:16 +02:00
Du Peng	0c19c9856f	(bug) filter product is available	2022-10-20 19:14:16 +02:00
vincent	9f32784aec	(ui) add identation for the select sub categories options	2022-10-20 14:25:11 +02:00
vincent	1db8bd8537	(ui) fix product card's status colors	2022-10-20 11:39:44 +02:00
Du Peng	1024b6fdc4	(bug) add fix prepaid pack hours dont count down script	2022-10-19 16:18:17 +02:00
Du Peng	c48956be10	(bug) unable apply a coupon if this coupon has used by an user removed	2022-10-19 11:38:17 +02:00
Du Peng	6bdbe1fe50	(bug) cannot load statistic	2022-10-18 12:46:20 +02:00
Du Peng	1dee7d6f93	(bug) cannot generate order statistic if no set a category	2022-10-18 12:45:54 +02:00
Du Peng	ebbbb47e67	(bug) cannot show order statstic	2022-10-18 12:44:19 +02:00
Du Peng	7155a00870	Merge branch 'product-store_integration' into product-store	2022-10-18 10:31:37 +02:00
Du Peng	3f7b8317e7	(bug) update order status error	2022-10-18 09:56:43 +02:00
vincent	d2338dee6a	(ui) Fix nav-tabs	2022-10-18 08:42:48 +02:00
Du Peng	62a62ec1eb	(bug) fix cannot debit prepaid pack after reservation of machine	2022-10-14 17:00:38 +02:00
Du Peng	48de0f8b9e	(bug) fix product and order error message	2022-10-14 12:57:55 +02:00
Du Peng	b9397388c5	(feat) stock limit if stock <= stock threshold	2022-10-14 11:27:59 +02:00
Du Peng	1b7c4862c5	(quality) refactoring cart add/remove/set_quantity item total compute	2022-10-14 10:52:24 +02:00
Du Peng	6dea7ba6b3	(feat) save operator id in order activity after paid	2022-10-14 10:12:28 +02:00
Du Peng	5a8aa747e5	Merge branch 'product-store_integration' into product-store	2022-10-13 18:39:29 +02:00
Du Peng	e462079754	(bug) product limit stock error	2022-10-13 18:38:42 +02:00
Du Peng	9834faf120	(bug) cant load order withdrawal instructions if no login	2022-10-13 17:57:26 +02:00
Du Peng	ef3b876bd0	(feat) disable create card if store hidden	2022-10-13 17:56:34 +02:00
Du Peng	5d0e170b92	(bug) load content when tabs are clicked in admin store	2022-10-13 17:44:44 +02:00
vincent	90005c2643	(ui) small fixes	2022-10-13 17:28:24 +02:00
vincent	6dcfd4d99e	(i18n) fix placeholder	2022-10-13 16:57:03 +02:00
vincent	c883a27c95	(i18n) fix text	2022-10-13 16:41:23 +02:00
vincent	6383b2ed80	(ui) fix colors	2022-10-13 16:38:32 +02:00
Du Peng	8537a580e9	(feat) dont scroll down to product list after fetch	2022-10-13 14:51:46 +02:00
Du Peng	9ddc21619b	(bug) fix product cannot update low stock alert	2022-10-13 14:42:32 +02:00
Du Peng	5de91acf88	(bug) fix save empty product image and is_main cannot set to new image after remove old main image	2022-10-13 12:38:54 +02:00
Du Peng	7e3cbf7172	(bug) cannot load order withdrawal instructions	2022-10-13 11:23:35 +02:00
Du Peng	11a0f62452	(bug) cannot access store	2022-10-12 19:40:49 +02:00
vincent	bd10f0235b	(ui) fix store settings layout	2022-10-12 18:20:36 +02:00
Sylvain	5be2c79569	(bug) prevent links on nothing in wysiwyg editor	2022-10-12 17:02:02 +02:00
Sylvain	11c8b25357	(feat) hide the store to members/visitors	2022-10-12 16:48:39 +02:00
Sylvain	f80aec1ef2	(merge) Merge branch 'product-store_stats' into product-store	2022-10-12 14:20:38 +02:00
Sylvain	eb0639f7b2	(quality) refactored API::StatisticsController	2022-10-12 14:19:59 +02:00
Sylvain	0016f248d8	(feat) report store orders in the stats	2022-10-12 11:42:15 +02:00
Sylvain	33238e2ea5	(bug) home page tour tries to start after the page was unloaded	2022-10-12 11:07:47 +02:00
Du Peng	ef9a5c22bb	(feat) clone a product	2022-10-11 18:53:12 +02:00
Sylvain	d9e8d0e40d	(wip) report store statistics in UI	2022-10-11 17:23:45 +02:00
Du Peng	7700737cf3	(bug) fix cannot remove product if it has the relation with machines	2022-10-11 16:40:45 +02:00
Sylvain	70f7ef8951	(feat) build stats in elasticsearch	2022-10-11 15:14:53 +02:00
Sylvain	6df9724527	(quality) disable Rails/RedundantPresenceValidationOnBelongsTo ... This setting was disabled in config/application.rb: `config.active_record.belongs_to_required_by_default = false`, so we must configure the linter accordingly. Also: linting some little bit of code	2022-10-11 11:44:08 +02:00
Sylvain	3e6763f14a	(bug) wallet transation not returned if success	2022-10-11 11:41:44 +02:00
Sylvain	da11a592e8	(quality) lint wallet transaction	2022-10-11 10:59:48 +02:00
Sylvain	b4f3f7f737	(wip) building stats to ES	2022-10-10 17:42:25 +02:00
Sylvain	ef502070be	Merge branch 'dev' into product-store	2022-10-10 16:23:08 +02:00
Sylvain	fe419f295a	(bug) erroneous statistics ... The date of the statistics data was using the date of the regenerate command parameter. This was ok for the nightly builds but definitly not for bulk regeneration	2022-10-10 14:46:10 +02:00
Sylvain	6a0b896815	(bug) ArgumentError (comparison of Integer with nil failed) ... this crash occured when creating/updating a product without activating the low stock alert	2022-10-10 10:00:06 +02:00
Sylvain	a63975dd18	(merge) Merge branch 'dev' into product-store	2022-10-05 17:16:04 +02:00
Sylvain	d750885f3b	(feat) filter and paginate stock movements	2022-10-05 16:58:40 +02:00