416 Commits

Author	SHA1	Message	Date
Du Peng	134d8147b6	(feat) add product url in order item	2022-10-04 18:50:29 +02:00
Sylvain	4cfb1a1253	(bug) create a category result in error	2022-10-04 10:28:37 +02:00
Sylvain	e51592061a	(feat) count products in categories	2022-10-03 15:56:46 +02:00
Sylvain	18dc24e366	(feat) use thumbnail version of product images	2022-09-27 12:21:35 +02:00
Sylvain	a41e5a93e5	(feat) products filtering for admin view	2022-09-20 15:30:44 +02:00
Du Peng	cbed318c3f	(feat) refund an order by admin	2022-09-16 18:31:20 +02:00
Du Peng	8c75b5fdd4	(bug) product stock status and quantity min to cart	2022-09-16 16:50:05 +02:00
Du Peng	010718d53e	(merge) store manage the orders by admin	2022-09-16 11:45:58 +02:00
Du Peng	f015e23a85	(wip) change order state by admin	2022-09-15 20:19:19 +02:00
Du Peng	b87355bc5a	(feat) orders filter by admin	2022-09-14 19:54:24 +02:00
Sylvain	c4baf89c54	(merge) Merge branch 'product-store_stocks' into product-store	2022-09-14 15:15:47 +02:00
Du Peng	f130ba46c1	(feat) show product sku in cart and order detail	2022-09-13 18:55:08 +02:00
Du Peng	522b559ced	(feat) add payment status to order	2022-09-13 18:43:37 +02:00
Du Peng	b76c7889ac	(bug) fix add to cart button can't apply a quantity min	2022-09-13 16:36:44 +02:00
Du Peng	42f7320e63	(feat) show payment info in order	2022-09-13 14:05:31 +02:00
Du Peng	dbe4570c30	(feat) client can show orders in dashbaord	2022-09-12 19:44:13 +02:00
vincent	dd26a1d9af	(merge) 'origin/product-store'	2022-09-09 13:54:42 +02:00
vincent	6678412cd6	(feat) pagination	2022-09-09 13:48:20 +02:00
Sylvain	c968f7b1aa	(feat) stock management: create/show	2022-09-08 17:51:48 +02:00
Du Peng	85720c31fa	(feat) order items order by created date	2022-09-08 12:13:34 +02:00
Du Peng	4387c05200	Merge branch 'product_store' into product_store-store	2022-09-06 20:06:59 +02:00
Du Peng	49aa54193d	rename operator id to operator_profile_id in order	2022-08-26 11:55:35 +02:00
Du Peng	97ee15cf78	rename order amount to total	2022-08-26 10:46:30 +02:00
Du Peng	d9687a007b	fix various bugs for cart	2022-08-25 16:23:00 +02:00
Du Peng	193c21a583	payment of cart by stripe/payzen/local	2022-08-25 08:52:17 +02:00
Du Peng	f62244fcdb	add product stock mouvements	2022-08-23 16:02:17 +02:00
Du Peng	350275d31b	add is_main to product image	2022-08-23 16:02:15 +02:00
Du Peng	0773e5bc82	product files and images upload	2022-08-23 16:02:14 +02:00
Du Peng	272cbf165c	create/edit product form	2022-08-23 16:02:08 +02:00
Du Peng	69e2b3e111	Product model/controller	2022-08-23 16:02:07 +02:00
Du Peng	4396bb0ca0	store product category create/list/update/delete	2022-08-23 16:01:59 +02:00
Sylvain	f7261043b5	Fix a bug: trainings monitoring is not available	2022-08-23 15:54:37 +02:00
Du Peng	ab800a519f	store cart	2022-08-19 20:03:09 +02:00
Du Peng	16288ae2bd	fablab store page	2022-08-16 19:47:27 +02:00
Du Peng	1cef45e3d7	add product stock mouvements	2022-08-08 18:04:14 +02:00
Du Peng	f345fc2443	add is_main to product image	2022-08-03 20:16:21 +02:00
Du Peng	fc4fd78843	product files and images upload	2022-08-03 10:25:36 +02:00
Du Peng	5e1436eda4	create/edit product form	2022-08-03 10:18:00 +02:00
Du Peng	1e3e7854b2	Product model/controller	2022-08-03 10:16:36 +02:00
Du Peng	432b60ca9a	store product category create/list/update/delete	2022-08-03 10:16:08 +02:00
Du Peng	549a719413	Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev	2022-08-01 18:17:08 +02:00
Nicolas Florentin	a8d0df11d3	projects/index/json.jbuilder : sanitize project description	2022-07-27 17:16:48 +02:00
Nicolas Florentin	e4fb068c12	fix xss vulnerability in projects	2022-07-27 17:16:38 +02:00
Sylvain	be5b6af3f1	Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames ... Add username column to the member list	2022-07-27 09:32:45 +02:00
Sylvain	f67c286497	(bug) prevent same slot booking feature ignores canceled reservations	2022-07-26 13:35:14 +02:00
Sylvain	6937a426c3	(bug) unable to show daily slots on public calendar	2022-07-26 12:12:59 +02:00
Sylvain	7134b8ffac	(bug) fix notification with slots	2022-07-20 16:20:09 +02:00
Sylvain	29b9399ca3	(bug) unable to reserve event	2022-07-20 15:54:04 +02:00
Sylvain	165b3e17b9	(bug) unable to move or cancel reservations	2022-07-20 14:59:42 +02:00
Sylvain	0d072291c7	(bug) 2 people can book the same machine slot ... Also: fix reservation change behavior	2022-07-20 11:22:00 +02:00