439 Commits

Author	SHA1	Message	Date
Du Peng	0773e5bc82	product files and images upload	2022-08-23 16:02:14 +02:00
Du Peng	272cbf165c	create/edit product form	2022-08-23 16:02:08 +02:00
Du Peng	69e2b3e111	Product model/controller	2022-08-23 16:02:07 +02:00
Du Peng	4396bb0ca0	store product category create/list/update/delete	2022-08-23 16:01:59 +02:00
Sylvain	f7261043b5	Fix a bug: trainings monitoring is not available	2022-08-23 15:54:37 +02:00
Du Peng	ab800a519f	store cart	2022-08-19 20:03:09 +02:00
Du Peng	16288ae2bd	fablab store page	2022-08-16 19:47:27 +02:00
Du Peng	1cef45e3d7	add product stock mouvements	2022-08-08 18:04:14 +02:00
Du Peng	f345fc2443	add is_main to product image	2022-08-03 20:16:21 +02:00
Du Peng	fc4fd78843	product files and images upload	2022-08-03 10:25:36 +02:00
Du Peng	5e1436eda4	create/edit product form	2022-08-03 10:18:00 +02:00
Du Peng	1e3e7854b2	Product model/controller	2022-08-03 10:16:36 +02:00
Du Peng	432b60ca9a	store product category create/list/update/delete	2022-08-03 10:16:08 +02:00
Du Peng	549a719413	Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev	2022-08-01 18:17:08 +02:00
Nicolas Florentin	a8d0df11d3	projects/index/json.jbuilder : sanitize project description	2022-07-27 17:16:48 +02:00
Nicolas Florentin	e4fb068c12	fix xss vulnerability in projects	2022-07-27 17:16:38 +02:00
Sylvain	be5b6af3f1	Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames ... Add username column to the member list	2022-07-27 09:32:45 +02:00
Sylvain	f67c286497	(bug) prevent same slot booking feature ignores canceled reservations	2022-07-26 13:35:14 +02:00
Sylvain	6937a426c3	(bug) unable to show daily slots on public calendar	2022-07-26 12:12:59 +02:00
Sylvain	7134b8ffac	(bug) fix notification with slots	2022-07-20 16:20:09 +02:00
Sylvain	29b9399ca3	(bug) unable to reserve event	2022-07-20 15:54:04 +02:00
Sylvain	165b3e17b9	(bug) unable to move or cancel reservations	2022-07-20 14:59:42 +02:00
Sylvain	0d072291c7	(bug) 2 people can book the same machine slot ... Also: fix reservation change behavior	2022-07-20 11:22:00 +02:00
Sylvain	06ee1acea5	(bug) fix slot reservation is considered full	2022-07-19 15:40:28 +02:00
Sylvain	d26e2ae313	(bug) fix various issues due to slots behavior refactoring	2022-07-19 11:32:12 +02:00
Nicolas Florentin	b3795e21ec	bug fix canceled_at was called on slot in members/show.json.jbuilder	2022-07-19 08:21:18 +02:00
Sylvain	6a8c441e85	public calendar endpoint refactoring & testing	2022-07-18 17:19:33 +02:00
Sylvain	37b24a8d2f	refactor slots model	2022-07-18 17:18:01 +02:00
Sylvain	5012912edd	(wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService	2022-07-18 17:18:01 +02:00
Sylvain	b2fd2e1b48	build all slots at reservation creation time	2022-07-18 17:18:00 +02:00
Guilherme Chaguri	d63b8d0dfa	Add username column to the member list	2022-07-14 16:11:44 -03:00
Sylvain	a41a22a050	(bug) wrong number of credits + improved text	2022-06-29 15:35:17 +02:00
Sylvain	1b8282fda4	display reservations credits in the dashboard	2022-06-29 15:35:17 +02:00
Sylvain	bcbd3bfb58	(bug) invalid users are reported in search	2022-06-29 15:35:17 +02:00
Sylvain	6ce762f778	(bug) unable to reserve a space	2022-06-29 15:34:47 +02:00
Sylvain	9b601bc438	(feat) show reservations panel	2022-06-29 15:34:04 +02:00
Sylvain	ea1883e406	factorize front-end API params helper	2022-06-29 15:34:04 +02:00
Sylvain	48e1cf782f	(bug) unable to edit an event	2022-06-15 09:42:39 +02:00
vincent	103bf80e81	Standardize card layout	2022-06-14 16:44:26 +02:00
Sylvain	1b5bb662ac	(bug) unable to edit OIDC provider	2022-06-06 11:40:53 +02:00
Du Peng	798941c349	edit organization custom field in member's dashboard profile	2022-05-11 16:57:44 +02:00
Du Peng	3e34b3c7a7	add user validation required setting, user proof of identity upload and organization custom field	2022-05-11 16:57:44 +02:00
Sylvain	302c55755e	(ui) admin edit user: use new user-profile-form component	2022-05-10 10:23:43 +02:00
Sylvain	040858ac1f	(ui) refactored profile-completion screen to use more accurate messages	2022-05-09 14:58:26 +02:00
Sylvain	aae1a5c20e	(api) rename user related models to use the _attributes naming convention	2022-05-04 14:12:48 +02:00
Sylvain	6ec6a8c4c9	(api) save which data is really mapped from the sso	2022-05-04 14:05:36 +02:00
vincent	4c6942eba4	merge	2022-05-04 13:02:40 +02:00
Sylvain	07578b5826	(ui)(api) configure data mapping for openid	2022-05-04 12:28:48 +02:00
Sylvain	c85281b29f	(api) automatically configure the openID response_type	2022-05-04 12:28:48 +02:00
Sylvain	6c46e5ec81	(api) automatically configure some openID parameters: redirect_uri, display, response_mode	2022-05-04 12:28:48 +02:00
Sylvain	2c2f8fdcc5	(api) openid provider configuration api	2022-05-04 12:16:38 +02:00
Sylvain	056a982d68	(bug) return auth provider mappings from the API	2022-05-04 12:16:38 +02:00
Sylvain	b4e53d2039	(db) table to save OpenID connect configuration ... Also refactored OAuth2Mapping to allow usage with any types of providers	2022-05-04 12:16:38 +02:00
vincent	3f4714861b	Add description to plan category	2022-05-04 11:16:51 +02:00
Du Peng	08b072e33c	Fix a bug: unable to show machine availability slot for admin	2022-04-05 14:21:19 +02:00
Sylvain	0c51aff748	(feat) OAuth2 scopes are now configurable from the interface ... Previously, scopes were supported through OAUTH2_SCOPE since v5.3.1. BREAKING CHANGE: update your oauth2 provider configuration if you need scopes support	2022-03-22 16:40:09 +01:00
Sylvain	c031f099a5	Merge branch 'oauth2' into dev	2022-01-17 12:46:07 +01:00
Sylvain	634da414f8	(feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method	2022-01-17 12:38:53 +01:00
Sylvain	051b56b72f	send notifications on payment schedules error/canceled by gateway	2022-01-11 12:37:06 +01:00
Sylvain	af62a8446e	fix wrong file names	2022-01-11 11:32:02 +01:00
Sylvain	9922812111	Ability to select "bank transfer" as the payment mean for a payment schedule	2022-01-05 15:58:33 +01:00
Sylvain	f3f15a2b9d	Ability to cancel a payement schedule from the interface	2022-01-03 17:13:35 +01:00
Sylvain	effe5c7ba9	optimized the load time of the payment schedules list ... From now, we no longer retrieve the client_secret directly from the API/list but from a specialized component which ask API/get_item. This highly decrease the laod time needed to fetch API/list	2022-01-03 11:24:08 +01:00
Sylvain	6091cec82e	api endpoint to create prices	2021-12-21 14:18:03 +01:00
Sylvain	6dc2e8e41e	modelise space object from API in TS	2021-12-21 09:51:40 +01:00
Sylvain	5ebc1017d2	save prices duration in db	2021-12-20 15:47:57 +01:00
Sylvain	3fb9850786	[bug] unable to bind sso to Profile.bithday or Profile.gender	2021-12-20 14:07:25 +01:00
Sylvain	4c56dffc04	remove deprecated code and endpoints	2021-10-18 10:15:48 +02:00
Sylvain	fd39eaf2f1	fix renew subscription API ... TODO: - remove old endpoints - bug in UI (start date invalid) - fix tests - payzen	2021-10-15 17:31:01 +02:00
Sylvain	70f0e21543	move free extend modal to react	2021-10-11 18:50:53 +02:00
Sylvain	e646eb8cb5	extend subscription UI	2021-10-08 19:14:47 +02:00
Du Peng	1c54e54c17	use plant.base_name instands of plan.name	2021-09-21 18:00:48 +02:00
Sylvain	10aaf0042c	integration of packs-summary	2021-06-29 15:59:57 +02:00
Sylvain	baf41588d3	packs summary component	2021-06-29 11:14:36 +02:00
Sylvain	bbb1aca4fb	display validity for each pack	2021-06-28 12:24:31 +02:00
Sylvain	f16cbc44ff	WIP: buy pack modal	2021-06-25 17:24:34 +02:00
Sylvain	0345d22582	delete & disable packs	2021-06-24 17:59:05 +02:00
Sylvain	d54f30e048	WIP: interface to configure packs	2021-06-21 17:39:48 +02:00
Sylvain	99792e8610	WIP: migrate machine card to react	2021-06-15 17:34:12 +02:00
Sylvain	e184bf3d3c	filter plans y duration	2021-06-10 14:06:53 +02:00
Sylvain	a416f8c7ae	transactional bulk update + better error handling while configuring the payment gateway	2021-06-10 10:39:42 +02:00
Sylvain	05882b3743	display list of plans grouped by category	2021-06-09 13:03:58 +02:00
Sylvain	4ca16c2688	associate plan w/ category	2021-06-08 17:26:40 +02:00
Sylvain	e1e446ab3f	API+ interface to CRUD plan categories	2021-06-08 16:43:43 +02:00
Sylvain	68f64cfc5c	update the card for payment schedules	2021-06-04 18:26:20 +02:00
Sylvain	81bc22c494	front-end adaptation for interacting with new object[] API ... Also: [bug] handle not onnected users on subscription page - fix showing an error message when no gateway is selected	2021-06-01 11:01:38 +02:00
Sylvain	d942d46632	WIP: migration to object[] ... TODO: fix running tests, fix front-end	2021-05-28 17:34:20 +02:00
Sylvain	5f5ec8dbb6	remove references to Invoice.invoiced	2021-05-27 15:58:55 +02:00
Sylvain	13f50c0e33	remove references to WalletService.transactable	2021-05-27 13:43:54 +02:00
Sylvain	6bcd9f6fef	Merge branch 'dev' into payzen	2021-05-17 15:07:41 +02:00
Sylvain	7ac119d4cf	[bug] invoices are not generated in test/development if the configured locale is composed ... Eg. If locale is fr-CA, it was crashing. If locale was only fr, is was working. Now, composed locales print the watermark using the base locale and hour_minute format is fetched from the base locale	2021-05-12 17:23:42 +02:00
Sylvain	2a7a7fd614	[bug] the event themes are not kept when editing the event again	2021-05-12 14:54:56 +02:00
Sylvain	5f47624d4e	WIP: create payment schedule w/ payzen	2021-04-29 17:10:02 +02:00
Sylvain	aaf36dcc0a	reserve events w/ payzen ... we cannot use the <cart> directive because the layout is too much different	2021-04-29 16:29:35 +02:00
Sylvain	26dfbef5e1	WIP: refactor models to use payment_gateway_objects	2021-04-21 17:38:06 +02:00
Sylvain	434ec9c205	refactored Invoices to get rid of stripe references	2021-04-20 17:22:53 +02:00
Sylvain	ddd1ac52d6	save reservation|subscription to db after payment	2021-04-14 17:56:10 +02:00
Sylvain	ef7dcd37d8	retreive the formToken from PZ API	2021-04-12 12:16:12 +02:00
Sylvain	23032c405b	WIP: create the formToken server-side	2021-04-09 17:17:58 +02:00
Sylvain	667f6f6229	show recapitulative of payzen settings	2021-04-06 17:47:47 +02:00