915 Commits

Author	SHA1	Message	Date
vincent	23488284e8	(quality) Create state label component	2022-09-07 15:35:46 +02:00
Du Peng	79182fb8c1	Merge branch 'product_store-store' into product-store	2022-09-07 15:00:27 +02:00
Du Peng	e0e8fc9ec2	(fix) checkout button cant click	2022-09-07 09:59:37 +02:00
Du Peng	79f01d4f78	Merge branch 'product_store-inte' into product_store-store	2022-09-07 09:27:57 +02:00
vincent	874be0bcb6	(wip) user orders dashboard	2022-09-07 09:22:16 +02:00
Du Peng	4387c05200	Merge branch 'product_store' into product_store-store	2022-09-06 20:06:59 +02:00
vincent	3a0248ed98	stock	2022-09-06 12:08:19 +02:00
Sylvain	8055de38b8	(bug) the events times are not displayed	2022-09-05 12:21:07 +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	5791e6076d	Merge remote-tracking branch 'origin/product_store-store' into product_store-inte	2022-08-29 10:32:14 +02:00
Du Peng	b669316e43	request user login when checkout a cart	2022-08-28 23:31:43 +02:00
Du Peng	c80198603e	set customer of cart dont save before payment	2022-08-27 18:01:25 +02:00
Du Peng	0f7b99c8a9	add a function return the currency symbol	2022-08-26 20:14:15 +02:00
Du Peng	981cffa27d	pay cart with coupon code	2022-08-26 20:10:21 +02:00
Du Peng	5030f5e1bc	fix bug: user cant pay order by wallet	2022-08-26 13:37:23 +02:00
vincent	e339cc18e7	merge product_store-store	2022-08-26 12:12:35 +02:00
Du Peng	e7d5cbfb2e	show an error if payment success but payment_state != paid	2022-08-26 12:04:19 +02:00
Du Peng	ded92dfb89	show error if cart update failed	2022-08-26 11:57:53 +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
vincent	42c38a0dd7	Remove filters logic from the front-end	2022-08-26 09:46:35 +02:00
Du Peng	885db68b51	add coupon component	2022-08-25 20:50:15 +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
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
vincent	e0dc008d4c	Client side product list + product view	2022-08-24 18:34:34 +02:00
Sylvain	9caf401412	(bug) disabling/removing groups ... When disabling a group, another unrelated group maybe disabled/enabled; When deleting a group, another unrelated group may be deleted, instead of the requested one	2022-08-24 12:21:52 +02:00
vincent	29993b0ec9	Cleanup files	2022-08-23 18:55:49 +02:00
Sylvain	a31f3555a1	(Bug) password verification during setup	2022-08-23 17:35:12 +02:00
Sylvain	428867bb6d	(Bug) Invalid password length verification	2022-08-23 16:43:10 +02:00
Du Peng	f62244fcdb	add product stock mouvements	2022-08-23 16:02:17 +02:00
Du Peng	851294e8d9	add size medium to product image	2022-08-23 16:02:16 +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
vincent	ea1171ba0f	Remove test text	2022-08-23 16:02:14 +02:00
vincent	ecb7f6d640	(wip) drag and drop	2022-08-23 16:02:13 +02:00
vincent	debe8a6a52	(wip) Style products list and form	2022-08-23 16:02:13 +02:00
vincent	be6ba8deff	Fix button color + standardise class names	2022-08-23 16:02:12 +02:00
vincent	5e61e9c409	Fix save-btn color	2022-08-23 16:02:12 +02:00
vincent	4e65396e7e	(wip) Style product's components	2022-08-23 16:02:11 +02:00
Sylvain	ab6d91fd12	(quality) rename check-list to checklist and added an uncheck all button	2022-08-23 16:02:11 +02:00
vincent	1d5141d073	Temporary broken drag and drop	2022-08-23 16:02:10 +02:00
vincent	81cc8db0f5	Remove react-beautiful-dnd	2022-08-23 16:02:10 +02:00
Du Peng	4f90cb5d80	update edit product comment	2022-08-23 16:02:09 +02:00
Du Peng	272cbf165c	create/edit product form	2022-08-23 16:02:08 +02:00
Du Peng	6b805f15f1	products page in front	2022-08-23 16:02:08 +02:00
vincent	59748356fc	Add subfolder in store	2022-08-23 16:02:06 +02:00
vincent	bf1700e43a	Convert product category form to RHF	2022-08-23 16:02:05 +02:00
vincent	39c8ec3c3e	(wip) Convert product-category to RFH	2022-08-23 16:02:05 +02:00
Du Peng	778f98bd9a	product category update position api	2022-08-23 16:02:04 +02:00
vincent	235c0cb7d5	Fix plan-category button's colors	2022-08-23 16:02:03 +02:00
Du Peng	4396bb0ca0	store product category create/list/update/delete	2022-08-23 16:01:59 +02:00
Sylvain	faae719fef	Removed unused imports	2022-08-23 15:15:49 +02:00
Sylvain	055b588ffc	Use union type instead of enum for SettingName	2022-08-23 13:12:13 +02:00
Nicolas Florentin	27dcc5f593	password length check in password-input.tsx file	2022-08-22 16:00:55 +02:00
vincent	5f8a15bcbb	Fix [form-rich-text] focus	2022-08-22 15:25:00 +02:00
vincent	857261ba62	Merge branch 'product_store-store' into product_store-inte	2022-08-22 10:00:09 +02:00
Du Peng	396248ed2b	manage cart session when user login or logout	2022-08-20 20:49:51 +02:00
Du Peng	cfd21adb60	cart button	2022-08-20 18:47:15 +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
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	ba0a604e40	Merge remote-tracking branch 'origin/product_store' into product_store-inte	2022-08-09 11:45:28 +02:00
vincent	0ee6521d3c	Filter by machines	2022-08-09 11:36:52 +02:00
Du Peng	1cef45e3d7	add product stock mouvements	2022-08-08 18:04:14 +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	82fab4dd4f	Merge remote-tracking branch 'origin/product_store' into product_store-inte	2022-08-04 09:15:27 +02:00
Du Peng	f345fc2443	add is_main to product image	2022-08-03 20:16:21 +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	c5f2b2587e	Remove test text	2022-08-03 10:24:27 +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
vincent	5b65fb7a54	Remove react-beautiful-dnd	2022-08-03 10:21:01 +02:00
Du Peng	a53c68d6b4	update edit product comment	2022-08-03 10:18:00 +02:00
Du Peng	5e1436eda4	create/edit product form	2022-08-03 10:18:00 +02:00
Du Peng	e23e83000d	products page in front	2022-08-03 10:17:58 +02:00
vincent	bd2cbd55d2	Add subfolder in store	2022-08-03 10:16:11 +02:00
vincent	588ab696ae	Convert product category form to RHF	2022-08-03 10:16:11 +02:00
vincent	c18c17ee62	(wip) Convert product-category to RFH	2022-08-03 10:16:11 +02:00
Du Peng	11fc251557	product category update position api	2022-08-03 10:16:11 +02:00
vincent	571e7c7612	Fix plan-category button's colors	2022-08-03 10:16:11 +02:00