7000 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	9623852b21	(doc) updated changelog	2022-10-24 10:52:26 +02:00
Sylvain	ffd4b6b3ba	(security) updated nokogiri to 1.13.9	2022-10-24 10:50:54 +02:00
Sylvain	af0bd6b8ba	Merge pull request #407 from sleede/dependabot/bundler/nokogiri-1.13.9 ... Bump nokogiri from 1.13.8 to 1.13.9	2022-10-24 10:24:22 +02:00
Sylvain	2ba760cc00	(bug) portuguese time formatting (#405)	2022-10-24 10:20:49 +02:00
Sylvain	50138ece51	(feat) search by username (#401)	2022-10-24 10:17:07 +02:00
Sylvain	a3f3251b6b	(bug) mail for shop invoice has wrong object	2022-10-24 10:13:46 +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
vincent	ab796991a6	(i18n) text update	2022-10-20 10:14:51 +02:00
dependabot[bot]	a124a44633	Bump nokogiri from 1.13.8 to 1.13.9 ... Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-19 16:20:52 +00:00
Du Peng	24a47acec7	Merge branch 'dev' for release 5.4.25	2022-10-19 18:20:00 +02:00
Du Peng	7aef6c69cf	Version 5.4.25	2022-10-19 18:20:00 +02:00
Du Peng	cfc2a71c98	(test) add test for prepaid pack	2022-10-19 18:16:54 +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	3fc232ad55	(bug) cannot run seed for create statistic index	2022-10-18 17:29:32 +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	dfea0203a5	Merge branch 'product-store_integration' of git.sleede.com:projets/fab-manager into product-store_integration	2022-10-18 09:10:00 +02:00
vincent	c4930c70f4	(i18n) Fix translation	2022-10-18 09:09:13 +02:00
vincent	b4a59508c7	(i18n) Text update	2022-10-18 08:42:48 +02:00
vincent	d2338dee6a	(ui) Fix nav-tabs	2022-10-18 08:42:48 +02:00
Du Peng	7215b021e5	Merge branch 'dev' for release 5.4.24	2022-10-14 17:26:45 +02:00
Du Peng	b1d0a5aad2	Version 5.4.24	2022-10-14 17:26:44 +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
vincent	ee81ed3434	(i18n) Text update	2022-10-14 09:10:44 +02:00
vincent	d07502f70f	(ui) Fix nav-tabs	2022-10-13 18:50:53 +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