393 Commits

Author	SHA1	Message	Date
vincent	bd781a14e9	Add extended price	2021-12-21 17:13:40 +01:00
vincent	af4acc895c	Merge branch 'spaces_multiprices' into spaces_multiprices_front	2021-12-21 15:24:20 +01:00
vincent	d6a4675209	wip	2021-12-21 14:37:38 +01:00
Sylvain	6dc2e8e41e	modelise space object from API in TS	2021-12-21 09:51:40 +01:00
vincent	f8798e28b5	Convert [spaces] to React	2021-12-20 19:12:01 +01:00
Sylvain	4a8fa65e5f	workaround pending for UI	2021-12-20 17:19:43 +01:00
Sylvain	5ebc1017d2	save prices duration in db	2021-12-20 15:47:57 +01:00
Sylvain	94c4be3e61	remove useless code	2021-12-20 15:25:49 +01:00
Sylvain	b74570c778	refactor reserve-button component ... we use "user" everywhere, this is more logical and this may fix an unreproductible issue with prepaid packs	2021-11-22 14:13:39 +01:00
Sylvain	9be0dcddd2	[bug] 3DS confirmation is not asked when an admin is subscribing a user through a payment schedule using PayZen	2021-10-22 17:53:02 +02:00
Sylvain	f273372682	fix function call	2021-10-22 15:55:48 +02:00
Sylvain	4a59f6faed	[bug] invalid text shown when a member confirms a free cart	2021-10-22 15:43:33 +02:00
Sylvain	ab53042f21	fix undefined variable sameTimeReservations	2021-10-22 14:59:57 +02:00
Sylvain	840c536c75	Ability to configure data sources for preventing booking on overlapping slots	2021-10-22 14:50:02 +02:00
Sylvain	36086f93df	[WIP] ability to select categories of slots for computing overlapping slots	2021-10-21 18:09:36 +02:00
Sylvain	9c55b9d61f	[bug] incorrect behavior for the setting 'email confirmation required' ... - when enabled: the user was still logged-in in the backend (F5 and he was logged in the frontend) - when disabled: the user was not logged in the frontend and received a message to confirm his/her email	2021-10-21 15:07:18 +02:00
Sylvain	7ffcd68fb7	[bug] canceled training reservation in admin/edit member	2021-10-21 10:31:21 +02:00
Sylvain	bbf512f674	validate birthday in past	2021-10-21 09:29:29 +02:00
Sylvain	2d61dac9cc	refactored admin takes subscription for a member	2021-10-19 12:24:41 +02:00
Sylvain	6ec7ecca9a	[WIP] create subscription modal	2021-10-18 17:15:06 +02:00
Sylvain	4b41b29b9d	fix using payzen with scheduled subscriptions	2021-10-18 16:34:56 +02:00
Sylvain	a373ea03fc	show good start date in payment schedule ui	2021-10-18 10:34:24 +02: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	315e899540	[WIP] fix tests	2021-10-14 18:20:10 +02:00
Sylvain	336a4b789c	proceed with payment on subscription renewal	2021-10-13 17:39:39 +02:00
Sylvain	6cd91d0291	[WIP] refactor renew subscription modal	2021-10-12 17:29:35 +02:00
Sylvain	17a0baac7e	refactored free subscription extending	2021-10-12 14:07:35 +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
Sylvain	a3f680964c	handle stripe errors while local payments	2021-10-07 16:43:51 +02:00
Sylvain	3663f8ab86	full stripe subscription code refacto ... TODO: test	2021-10-06 17:09:35 +02:00
Sylvain	d494b012d4	[ongoing] refactoring stripe subscription	2021-10-06 09:42:58 +02:00
Sylvain	3769afe431	Merge branch 'editor_xss_vulnerability' into dev	2021-10-04 09:31:34 +02:00
Ismaël Sebbane	2c0b981c90	[machines-edit-view] Replaced a href link by button because more semantically correct + it actually redirects to the homepage (unwanted behaviour)	2021-09-22 19:01:10 +02:00
Du Peng	235fd2e58a	Merge branch 'buy_pack_for_plan_option' into dev	2021-09-21 18:01:54 +02:00
Du Peng	2c78ab9cee	fix bug: book overlapping slot setting labal error	2021-09-21 18:01:47 +02:00
Du Peng	1c54e54c17	use plant.base_name instands of plan.name	2021-09-21 18:00:48 +02:00
Du Peng	f2dd1bbcd2	add an option Subscription valid for purchase and use of a prepaid pack	2021-09-20 19:43:05 +02:00
Du Peng	f4ed3ca391	fix bug: admin takes a subscription with a payment schedule by stipe	2021-09-10 18:32:39 +02:00
Du Peng	65ba3a686b	disable monthly payment for 1 month of subscription	2021-09-10 15:34:49 +02:00
Du Peng	6b763cc1c9	improve code for stripe subscription payment	2021-09-10 15:19:04 +02:00
Du Peng	c9f20ddc03	fix bug: plans page show an error if admin dont create any plans	2021-09-09 18:46:23 +02:00
Du Peng	334d8ce055	check event event_theme_ids if exist	2021-09-09 18:25:26 +02:00
Du Peng	238d7af1ee	disable monthly payment if interval count == 1	2021-09-08 19:21:44 +02:00
Du Peng	2973dec6a7	rewrite payment schedule workflow by stripe	2021-09-08 18:57:10 +02:00
Du Peng	a910e8999b	fix bug: editor xss vulerability, disable code view in new/edit project	2021-08-31 11:30:23 +02:00
Du Peng	a2a32ef3c6	fix bug: error in plans list page	2021-08-24 11:01:21 +02:00
Du Peng	51ec220a3e	fix manager cant reserve training for user	2021-08-06 11:12:14 +02:00
Du Peng	1fdf3d35b5	adjuste packs pricing popover position	2021-08-03 17:03:03 +02:00