520 Commits

Author	SHA1	Message	Date
Sylvain	622a14909a	(feat) save new limitations	2023-03-13 14:19:49 +01:00
Sylvain	0f142680b8	(wip) configure usage limits for plans	2023-03-13 14:19:46 +01:00
Sylvain	9b4c47d733	(feat) usage history of prepaid packs	2023-03-09 13:23:42 +01:00
Sylvain	06c66d896b	(bug) members can't change/cancel their reservations	2023-03-02 09:27:06 +01:00
Sylvain	4dd7b1345f	(bug) members can change/cancel their reservations	2023-02-24 15:24:09 +01:00
Sylvain	ee2cbc332f	(bug) invalid border color for slots	2023-02-24 15:16:57 +01:00
Sylvain	ed072184bf	(feat) notify_admin_order_is_paid	2023-02-16 11:22:42 +01:00
Sylvain	1205cb925c	(bug) event image update not shown	2023-02-15 16:30:47 +01:00
Sylvain	a179601b97	(quality) lint code	2023-02-15 16:02:49 +01:00
Sylvain	892ffbe138	(quality) rename proof-of-identity to supporting-document	2023-02-15 10:30:13 +01:00
Sylvain	979042078d	(quality) rename proof-of-identity to supporting-documents in notifications	2023-02-15 10:30:13 +01:00
Karen	10473182d4	(feat) Admin can control its notifications preferences	2023-02-15 10:30:08 +01:00
Sylvain	23ba44bc57	(bug) auto cancel trainings ... - Wrong trainings sessions was cancelled (in the past instead of in the futur) - Notifications about auto refunds was incorrect	2023-02-15 10:30:01 +01:00
Sylvain	e5b199f8ed	(quality) improved calendar loading time	2023-02-15 10:29:57 +01:00
Sylvain	fea26285d6	(feat) improved calendars loading time ... + (feat) ability to choose a machine in the public calendar	2023-02-15 10:29:55 +01:00
Sylvain	d0239a0e25	(wip) move slot status request	2023-02-15 10:29:55 +01:00
Sylvain	986a663c40	(feat) places cache for slots	2023-02-15 10:29:54 +01:00
Sylvain	473aedbdcb	(feat) add reservations in cart/order	2023-02-15 10:29:53 +01:00
Sylvain	bbaac2c122	(wip) use cartitem from order api	2023-02-15 10:29:51 +01:00
Sylvain	48a44ff4f3	(feat) create cart items from the api	2023-02-15 10:29:50 +01:00
Sylvain	2b42858229	(feat) display special style if a training override general settings	2023-02-15 10:28:16 +01:00
Sylvain	ddc2dd4c6e	(feat) training auto cancel authorization and invalidation rule	2023-02-15 10:28:07 +01:00
Sylvain	a05ef1f0ba	(feat) auto refund after trainings cancelled and notify	2023-02-15 10:28:05 +01:00
Sylvain	71305bbc8f	(wip) notify admin on auto cancel	2023-02-15 10:28:04 +01:00
Sylvain	c804c84113	(feat) per training settings for auto cancel	2023-02-15 10:28:04 +01:00
Karen	b9d86aecdc	(quality) status property :label is now :name for better coherence	2023-02-15 10:27:54 +01:00
Karen	d80cc4769a	(feat) filter for status in project gallery	2023-02-15 10:27:49 +01:00
Karen	4aba30c5e3	(feat) project statuses api	2023-02-15 10:27:13 +01:00
Sylvain	4c4ebe3b47	(feat) report status of user's prepaid packs in dashboard	2023-02-15 10:27:08 +01:00
Sylvain	71579e7465	(wip) slot date in stats	2023-01-31 17:10:07 +01:00
Sylvain	b14329497b	(test) abuses, age_range, categories	2023-01-06 17:18:44 +01:00
Sylvain	7fc79d44e5	(feat) machines reservable or not	2022-12-27 16:14:29 +01:00
Sylvain	574974c239	(merge) Merge branch 'machine_category' into staging	2022-12-27 10:59:36 +01:00
Sylvain	e139067954	(feat) prevent generate invoices at 0	2022-12-23 14:14:42 +01:00
Sylvain	ed4295b847	(bug) broken notifications if slot cancelled	2022-12-22 15:12:56 +01:00
Sylvain	02a8202f2f	(feat) private note	2022-12-21 14:14:39 +01:00
Sylvain	90dc38ed10	(feat) move external id to InvoicingProfile	2022-12-21 14:14:34 +01:00
Sylvain	4b84963d7f	(feat) optional external id	2022-12-21 14:14:29 +01:00
Sylvain	ad8e95922f	(bug) machine advanced accouting codes, files attachements, image	2022-12-21 14:14:27 +01:00
Sylvain	be8ae01ba4	(ui) refactor plan form ... Also: add advanced accounting to plans	2022-12-21 14:05:16 +01:00
Sylvain	4a9cbbb227	(feat) advanced accounting for products	2022-12-21 14:05:15 +01:00
Sylvain	7868f31a58	(feat) advanced accounting parameters ... for: machines, spaces, trainings, events	2022-12-21 14:05:15 +01:00
Sylvain	3d796549f2	(ui) refactor event form	2022-12-21 14:05:14 +01:00
Sylvain	8df60a8712	(ui) refactor space form	2022-12-21 14:05:14 +01:00
Sylvain	3d88266fe6	(ui) refactor training form	2022-12-21 14:05:13 +01:00
Du Peng	f47440c85a	(feat) add machine category	2022-12-20 18:45:53 +01:00
Du Peng	fe0af02ba8	(bug) unable set a main image of product and remove an image of product	2022-11-22 16:31:34 +01:00
Sylvain	b2540a1cd4	(bug) broken display of machines pages	2022-11-21 15:22:23 +01:00
Sylvain	20e50bda13	(bug) fix file/image input components	2022-11-03 09:26:21 +01:00
Du Peng	ef9a5c22bb	(feat) clone a product	2022-10-11 18:53:12 +02:00
Sylvain	a63975dd18	(merge) Merge branch 'dev' into product-store	2022-10-05 17:16:04 +02:00
Sylvain	d750885f3b	(feat) filter and paginate stock movements	2022-10-05 16:58:40 +02:00
Sylvain	8dd4463a14	(feat) alert on low stock threshold	2022-10-05 15:51:33 +02:00
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	9856450aac	(bug) broken daily view of the public agenda ... When the daily view contains trainings or events, the agenda cannot be filled with the slots because of an 500 error	2022-09-27 16:01:21 +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