2916 Commits

Author	SHA1	Message	Date
Sylvain	a3190115ab	(bug) invoice rounding error using coupons	2022-10-27 16:04: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