474 Commits

Author	SHA1	Message	Date
Sylvain	cb6a3a00b6	(bug) the switch to enable/disable the VAT does not reflect the current state of the VAT	2022-01-12 15:17:08 +01:00
Sylvain	4dd5bca55c	wip: refactor the payment schedule table to extract the item actions into a separate component	2022-01-11 18:41:04 +01:00
vincent	d54068446a	Display hours for extended prices duration	2022-01-11 17:54:38 +01:00
Sylvain	a38d3e31b1	use explicit payment method for check in paymentSchedules and do not include the payment method in the footprint	2022-01-11 16:15:43 +01:00
Sylvain	8a149bb947	(bug) some links redirect to the home page instead of triggering the requested action	2022-01-11 11:03:27 +01:00
vincent	f15907c405	Merge branch 'dev' into wip-demo-update	2022-01-07 08:23:34 +01:00
Sylvain	f647ebd9e0	When a payment schedule was canceled by the payment gateway, inform the user in the interface ... TODO: send an in-system notification and an email notification + refactor payzen/service and stripe/service to extract notification sending + send notifications on state=error + in the interface: open a modal dialog to allow the admin to choose an action (cancel/continue by check/continue by transfer) + refactor the payment-schedule-tables.ts to extact the item-line logic (the component is getting too big)	2022-01-05 17:16:25 +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	d7ccbdbb52	[bug] do not load Stripe if no keys were defined	2022-01-05 11:31:27 +01:00
Sylvain	e1256ec551	Ability to disable public account creation	2022-01-04 15:27:58 +01:00
Sylvain	9e742cd1b6	Ability to create slots in the past	2022-01-04 10:28:43 +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	00b9bce587	export collected VAT by rate	2021-12-29 17:00:54 +01:00
Sylvain	16242d2127	frontend invoice configuration page uses multiVAT	2021-12-29 12:08:50 +01:00
Du Peng	6019767a3b	update multi VAT	2021-12-28 13:45:29 +01:00
Sylvain	fe96e01b7f	refactor spaces/extended_prices code architecture to match the FM style guide	2021-12-28 11:25:10 +01:00
Sylvain	db4230def1	Revert "Fix classes names" ... This reverts commit c394b3a275.	2021-12-28 09:47:44 +01:00
vincent	c394b3a275	Fix classes names	2021-12-22 17:25:02 +01:00
Vincent	934ac309a1	Merge branch 'dev' into 'spaces_multiprices' ... # Conflicts: # CHANGELOG.md	2021-12-22 14:29:56 +00:00
Sylvain	b864ba66da	Apply 22 suggestion(s) to 6 file(s)	2021-12-22 14:07:48 +00:00
Sylvain	5be06babd7	Apply 1 suggestion(s) to 1 file(s)	2021-12-22 13:51:26 +00:00
vincent	fc83b4d9c3	Create [pricing] sub folders	2021-12-21 20:13:55 +01:00
vincent	0d34bffa6d	Merge branch 'spaces_multiprices_front' into spaces_multiprices	2021-12-21 18:06:25 +01:00
vincent	1d38d6ae50	fix + new icon	2021-12-21 18:02:39 +01:00
Sylvain	61f432914c	optimize payment schedules list loading	2021-12-21 17:27:51 +01:00
vincent	c3cbc26a1e	Merge branch 'spaces_multiprices_front' into spaces_multiprices	2021-12-21 17:14:22 +01:00
vincent	bd781a14e9	Add extended price	2021-12-21 17:13:40 +01:00
Sylvain	ffb0f3e19e	ability to limit extended prices to slots in the same day	2021-12-21 16:32:02 +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	3a787ea2a0	support for JSONPath syntax in oAuth2 mapping	2021-12-20 13:40:55 +01:00
vincent	163e56d2f2	Add minor style adjustments for the demo	2021-12-03 18:25:25 +01:00
vincent	54cb9ab152	fix images' size and ratio	2021-11-24 18:47:07 +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
Du Peng	b5ab52dd64	bug fix stripe 3D payment	2021-07-09 17:54:25 +02:00
Sylvain	e150e13227	[bug] cookies modal buttons are too small	2021-07-02 14:26:35 +02:00
Sylvain	f6889fbfda	linted TSX files	2021-07-01 12:34:10 +02:00
Sylvain	54c933523d	linted TS files	2021-07-01 12:04:48 +02:00
Sylvain	a6043fe81e	linted JS files	2021-07-01 11:23:58 +02:00
Sylvain	fb3bbacaf0	handle no packs available for the customer	2021-06-30 16:58:16 +02:00
Sylvain	19717d1351	use localPaymentModal in cart directive	2021-06-30 16:35:25 +02:00
Sylvain	d43f719038	buy packs using local payment	2021-06-30 15:32:10 +02:00
Sylvain	6c326c7209	compute price according to prepaid hours ... Also: handle prepaid hours decreasing when used	2021-06-30 10:53:05 +02:00
Sylvain	20bd3931d4	[bug] public list of plans fails to render if a group has no plans	2021-06-30 09:18:06 +02:00
Sylvain	9c6a7df0bf	WIP: compute price including prepaid packs	2021-06-29 16:56:40 +02:00
Sylvain	3a741e79e6	[bug] return to the home page when clicking ⟵ on machines/show	2021-06-29 16:24:37 +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	f56b8eae75	admin can configure renew threshold	2021-06-29 09:07:11 +02:00
Sylvain	1aad4891c1	buy prepaid-pack a hours from modal	2021-06-28 18:17:11 +02:00
Sylvain	91d2316280	[bug] two empty categories in the plan creation form	2021-06-28 16:53:39 +02:00
Sylvain	bbb1aca4fb	display validity for each pack	2021-06-28 12:24:31 +02:00
Sylvain	86de1f6253	styled packs	2021-06-28 11:49:51 +02:00