2013 Commits

Author	SHA1	Message	Date
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	132ccebde7	fix syntax error for theme style	2021-09-22 13:27:12 +02:00
Ismaël Sebbane	caa66f26ab	Chained selectors .profile-top and about-picture to share the background image using the profile image file option	2021-09-22 13:23:12 +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	5d8a1367a6	update test	2021-09-13 14:25:30 +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	2f7325fee4	fix bug: statistics dont show in nav menu after login	2021-09-09 17:36:04 +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	d3bc26794c	fix bug: cant generate avoir for wallet	2021-08-06 11:12:22 +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	524b2c97bb	fix bug: statistic service cant run	2021-08-02 17:10:20 +02:00
Du Peng	b5ab52dd64	bug fix stripe 3D payment	2021-07-09 17:54:25 +02:00
Sylvain	920a97f40f	fix computing reservation price	2021-07-02 15:45:52 +02:00
Sylvain	95d8f1d204	[bug] do not include fully used packs in user's packs	2021-07-02 14:27:30 +02:00
Sylvain	e150e13227	[bug] cookies modal buttons are too small	2021-07-02 14:26:35 +02:00
Sylvain	28c707bcc5	[bug] missing invoice watermark for norwegian	2021-07-02 12:54:13 +02:00
Sylvain	02870659e0	[bug] prepaid hours not used if bought slot is longer than remaining prepaid time	2021-07-02 12:39:34 +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	520d3e0a74	remove warning duplicate constant declaration	2021-07-01 10:05:04 +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
Sylvain	4e030300cb	[bug] unable to filter by multiple user IDs in OpenAPI ... Also: tests for OpenAPI user trainings	2021-06-28 10:17:26 +02:00
Sylvain	4126e05d4a	Merge branch 'dev' into prepaid	2021-06-28 09:58:07 +02:00
Sylvain	66ba8e565c	Full test coverage of the OpenAPI ... Also: fix related bugs	2021-06-28 09:50:37 +02:00