388 Commits

Author	SHA1	Message	Date
Sylvain	f8904dfb9c	(feat) customize VAT name	2022-12-27 12:13:24 +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	137b9f3c1b	(feat) improved security when changing password	2022-12-22 11:07:14 +01:00
Sylvain	4d7e09c98d	(feat) multiple accounting journals	2022-12-21 14:14:36 +01:00
Sylvain	d547660170	(bug) unable to set price on new product	2022-12-21 14:14:28 +01:00
Sylvain	13eeff5964	(ui) enable advanced accounting button in separate box	2022-12-21 14:12:15 +01:00
Sylvain	37f30e26a9	(feat) enable/disable advanced accounting	2022-12-21 14:05:16 +01:00
Sylvain	be8ae01ba4	(ui) refactor plan form ... Also: add advanced accounting to plans	2022-12-21 14:05:16 +01:00
Sylvain	85fcc71d6b	(wip) refactor plan form	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
Sylvain	4cc6574f58	(ui) refactor machine edition form	2022-12-21 14:05:09 +01:00
Du Peng	f47440c85a	(feat) add machine category	2022-12-20 18:45:53 +01:00
Sylvain	83fb4f11ff	(bug) switch display is broken	2022-11-03 10:07:14 +01:00
Sylvain	20e50bda13	(bug) fix file/image input components	2022-11-03 09:26:21 +01:00
Du Peng	65ded9d847	Merge branch 'product-store' into product-store_dev	2022-10-27 18:08:15 +02:00
vincent	feb191ca70	(ui) Fix image bg and list items border	2022-10-27 08:52:21 +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
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	d2338dee6a	(ui) Fix nav-tabs	2022-10-18 08:42:48 +02:00
Du Peng	b9397388c5	(feat) stock limit if stock <= stock threshold	2022-10-14 11:27:59 +02:00
vincent	90005c2643	(ui) small fixes	2022-10-13 17:28:24 +02:00
vincent	6383b2ed80	(ui) fix colors	2022-10-13 16:38:32 +02:00
vincent	bd10f0235b	(ui) fix store settings layout	2022-10-12 18:20:36 +02:00
Sylvain	11c8b25357	(feat) hide the store to members/visitors	2022-10-12 16:48:39 +02:00
Sylvain	a63975dd18	(merge) Merge branch 'dev' into product-store	2022-10-05 17:16:04 +02:00
Sylvain	185b4f1459	(merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store	2022-10-05 10:21:35 +02:00
Sylvain	43fbf2ac8d	(feat) withdrawal instructions in order ready email	2022-10-04 16:59:51 +02:00
Sylvain	72d55a6a0b	(feat) display withdrawal instructions on the show-order page	2022-10-04 15:30:20 +02:00
vincent	a6173147ca	(ui) fix layout	2022-10-04 15:21:01 +02:00
Sylvain	b283e89235	(merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store	2022-10-04 14:48:01 +02:00
vincent	4f58ea64d1	(i18n) improve product category delete message	2022-10-04 10:56:12 +02:00
vincent	50e4b2ba0c	(merge) branch 'origin/product-store'	2022-10-04 10:53:36 +02:00
Sylvain	4f231c0647	(bug) do not buzz the list in member-select	2022-10-04 10:52:53 +02:00
Sylvain	a10e75844a	(feat) visual indicator if no user selected	2022-10-04 10:51:32 +02:00
Sylvain	51aa967001	(feat) dismiss a user to a lower privileged role	2022-10-03 14:22:15 +02:00
vincent	1425e39183	(ui) Fix order-item layout	2022-09-29 11:36:56 +02:00
vincent	05e729fa26	(inte) cart item error message + responsive	2022-09-28 17:48:55 +02:00
Du Peng	ac671ea26d	(feat) check cart item amount/available/quantity_min/stock before checkout	2022-09-27 19:44:39 +02:00
Sylvain	040f74a2fe	(merge) Merge branch 'product-store_integration' into product-store	2022-09-26 17:29:12 +02:00
vincent	6aaabe5b05	(i18n) Add missing translations	2022-09-22 11:23:26 +02:00
vincent	4fe2679808	(quality) refacto item quantity input	2022-09-21 12:27:20 +02:00
vincent	e4c0c10ef3	(merge) branch 'origin/product-store_filtering'	2022-09-20 17:36:23 +02:00
vincent	75d327f410	(quality) Improve responsive	2022-09-20 15:21:44 +02:00
Sylvain	586dd5f9b5	(quality) extract filter in separate components	2022-09-20 09:24:35 +02:00
vincent	945428e71c	(quality) Refacto tooltip	2022-09-20 09:24:05 +02:00
vincent	b7e128a63c	(feat) Add filters	2022-09-20 09:24:04 +02:00
vincent	2e1784b291	(quality) Refacto tooltip	2022-09-16 17:58:19 +02:00
vincent	ffafb223f1	(merge) branch 'origin/product-store'	2022-09-16 14:13:29 +02:00
vincent	9a10c992c2	(feat) Add filters	2022-09-16 11:54:58 +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	9b3a1c0634	(feat) add cart status color	2022-09-14 09:37:14 +02:00
Sylvain	f705f71c4f	(feat) display/remove ongoing stocks operations	2022-09-12 15:55:41 +02:00
vincent	6678412cd6	(feat) pagination	2022-09-09 13:48:20 +02:00
vincent	d5d8a972cf	(quality) Refacto orders views	2022-09-08 12:04:37 +02:00
vincent	157134f4ef	(feat) Add period filter	2022-09-07 18:36:54 +02:00
vincent	23488284e8	(quality) Create state label component	2022-09-07 15:35:46 +02:00
vincent	874be0bcb6	(wip) user orders dashboard	2022-09-07 09:22:16 +02:00
vincent	3a0248ed98	stock	2022-09-06 12:08:19 +02:00
vincent	f21a68593a	stock (wip)	2022-09-02 18:17:15 +02:00
vincent	a5a45ee1ce	Store settings + update text editor options	2022-09-01 18:02:22 +02:00
vincent	27a3bdc308	Admin orders (tmp)	2022-09-01 16:08:37 +02:00
vincent	539d89cf8e	Fix accordion	2022-08-31 11:15:28 +02:00
vincent	2e696f94fd	(wip) Admin orders list	2022-08-29 19:15:10 +02:00
vincent	78683a31b3	Style cart	2022-08-29 16:32:35 +02:00
vincent	42c38a0dd7	Remove filters logic from the front-end	2022-08-26 09:46:35 +02:00
vincent	4e76396dee	Store ad on machines list	2022-08-25 18:46:55 +02:00
vincent	d602087710	Clients' store categories	2022-08-25 17:08:43 +02:00
vincent	e0dc008d4c	Client side product list + product view	2022-08-24 18:34:34 +02:00
vincent	29993b0ec9	Cleanup files	2022-08-23 18:55:49 +02:00
vincent	857261ba62	Merge branch 'product_store-store' into product_store-inte	2022-08-22 10:00:09 +02:00
Du Peng	16288ae2bd	fablab store page	2022-08-16 19:47:27 +02:00
vincent	605b3ec92c	(wip) drag and drop categories	2022-08-15 14:52:09 +02:00
vincent	5677ef3b6d	Add accordion item component	2022-08-15 14:51:13 +02:00
vincent	7ca3955c1d	Filter and sort products	2022-08-13 19:23:56 +02:00
vincent	0ee6521d3c	Filter by machines	2022-08-09 11:36:52 +02:00
vincent	86a40bc096	(wip) Products list filters	2022-08-05 18:38:54 +02:00
vincent	d118d045c6	Style list items	2022-08-04 16:24:52 +02:00
vincent	dc67d08395	Update color variables' names	2022-08-04 15:19:34 +02:00
vincent	927aa40182	Update image upload	2022-08-04 10:44:31 +02:00
vincent	ac46314532	Merge remote-tracking branch 'origin/product_store' into product_store-inte	2022-08-04 09:51:41 +02:00
Du Peng	640a428198	add size medium to product image	2022-08-04 09:41:53 +02:00
vincent	be90d0720b	Product form style	2022-08-03 18:30:29 +02:00
Du Peng	fc4fd78843	product files and images upload	2022-08-03 10:25:36 +02:00
vincent	c8559c603c	(wip) drag and drop	2022-08-03 10:24:26 +02:00
vincent	400f832313	(wip) Style products list and form	2022-08-03 10:23:41 +02:00
vincent	8c62853395	Fix button color + standardise class names	2022-08-03 10:23:41 +02:00
vincent	1cb94e6c3d	Fix save-btn color	2022-08-03 10:23:40 +02:00
vincent	d3d4fdf84d	(wip) Style product's components	2022-08-03 10:23:40 +02:00
Sylvain	bd96622d37	(quality) rename check-list to checklist and added an uncheck all button	2022-08-03 10:23:40 +02:00
vincent	57ef555943	Temporary broken drag and drop	2022-08-03 10:23:38 +02:00
Du Peng	5e1436eda4	create/edit product form	2022-08-03 10:18:00 +02:00
vincent	bd2cbd55d2	Add subfolder in store	2022-08-03 10:16:11 +02:00