630 Commits

Author	SHA1	Message	Date
Sylvain	768acf3c28	(bug) do not display product sku if no set	2022-09-27 12:33:13 +02:00
Sylvain	18dc24e366	(feat) use thumbnail version of product images	2022-09-27 12:21:35 +02:00
Sylvain	040f74a2fe	(merge) Merge branch 'product-store_integration' into product-store	2022-09-26 17:29:12 +02:00
Sylvain	75a4038a60	(feat) save/restore filters in admin/store/products	2022-09-26 17:18:52 +02:00
Sylvain	af81f10a4e	(bug) div cannot appear as a descendant of p	2022-09-26 16:44:14 +02:00
Sylvain	bc09450418	(bug) product store filtering ... - Do not reset the category when reseting the filters - Prevent filtering by internal stock when user is not privileged	2022-09-26 15:45:52 +02:00
Sylvain	46d1127efc	(bug) div cannot appear as a descendant of p	2022-09-26 15:31:57 +02:00
Sylvain	498ed0d115	(bug) cannot render the machine filters ... if a default machines list was not provided to the machines-filters component, the component rendering is broken	2022-09-26 15:25:15 +02:00
Sylvain	1b930d2005	(feat) restore the filters from the URL	2022-09-26 15:23:07 +02:00
Sylvain	6b7daade5f	(feat) save filters to the URL	2022-09-26 12:41:20 +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
Sylvain	57e3dda2cd	(feat) products filtering in public store	2022-09-21 11:51:41 +02:00
vincent	e4c0c10ef3	(merge) branch 'origin/product-store_filtering'	2022-09-20 17:36:23 +02:00
Sylvain	c23b57131b	(bug) fix admin/orders & public/store due to refactoring	2022-09-20 17:12:45 +02:00
Sylvain	117c9bb1dd	(feat) products list ordering	2022-09-20 15:47:15 +02:00
Sylvain	a41e5a93e5	(feat) products filtering for admin view	2022-09-20 15:30:44 +02:00
vincent	0345476b5f	(merge) branch 'origin/product-store'	2022-09-20 15:25:21 +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	9742558cfa	(feat) Save product categories' positions	2022-09-20 09:24:05 +02:00
vincent	b5c924a8e0	(bug) Fix filter name	2022-09-20 09:24:05 +02:00
vincent	d0e68fbf21	(quality) Refacto/style active orders list's filters	2022-09-20 09:24:04 +02:00
vincent	b7e128a63c	(feat) Add filters	2022-09-20 09:24:04 +02:00
Sylvain	5d2bd250a8	(quality) improved comments	2022-09-20 09:24:03 +02:00
Du Peng	1aa058f3d6	(feat) allow product price = 0	2022-09-19 19:27:11 +02:00
Du Peng	b5ffae1fb6	(bug) form input cannot save a float	2022-09-19 19:08:52 +02:00
Du Peng	cbed318c3f	(feat) refund an order by admin	2022-09-16 18:31:20 +02:00
vincent	2e1784b291	(quality) Refacto tooltip	2022-09-16 17:58:19 +02:00
Du Peng	b635113843	(bug) all orders is shown in my orders of admin	2022-09-16 17:58:02 +02:00
Du Peng	96a0f10747	(feat) add delivered state to order	2022-09-16 17:54:41 +02:00
vincent	154d2c5565	(feat) Save product categories' positions	2022-09-16 17:01:56 +02:00
Du Peng	8c75b5fdd4	(bug) product stock status and quantity min to cart	2022-09-16 16:50:05 +02:00
vincent	22cb169778	(bug) Fix filter name	2022-09-16 16:06:58 +02:00
vincent	b1cea8f2dd	(quality) Refacto/style active orders list's filters	2022-09-16 15:58:18 +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	53004767bf	(feat) add order action ready/in_progress/canceled	2022-09-16 11:38:11 +02:00
Du Peng	f015e23a85	(wip) change order state by admin	2022-09-15 20:19:19 +02:00
Du Peng	947c69c4ed	(feat) improve orders filter	2022-09-15 12:38:34 +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
Sylvain	6b224d7db1	(feat) alert unsaved changes ... if the user tries to quit the product form, he will be alerted about unsaved changes, if any	2022-09-14 14:51:54 +02:00
Du Peng	32b19ed4f7	(feat) manage orders in admin dashbaord	2022-09-13 19:47:19 +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
Sylvain	c381c985d2	(wip) unsaved form alert	2022-09-13 17:18:35 +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
Sylvain	f705f71c4f	(feat) display/remove ongoing stocks operations	2022-09-12 15:55:41 +02:00
Sylvain	3bf08973fb	(bug) can't complete profile if phone has hyphens or spaces	2022-09-12 11:51:28 +02:00
Du Peng	dff0cb26be	(bug) product pagination in store	2022-09-09 17:14:22 +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	cd1bfe976c	Merge branch 'product-store-payment' into product-store	2022-09-08 16:49:24 +02:00
Du Peng	5d243d3be6	(feat) change store cart url	2022-09-08 16:41:10 +02:00
Du Peng	aeae5f7aa0	(feat) add product to cart in product page	2022-09-08 16:27:34 +02:00
Du Peng	8d414a3172	(feat) admin can set offer for product in cart	2022-09-08 15:10:56 +02:00
vincent	9e4d6028c5	(merge) branch 'product-store_integration'	2022-09-08 14:06:38 +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
Du Peng	75b3295f65	(feat) allow to apply coupon in cart without login	2022-09-07 17:52:23 +02:00
Sylvain	45bac88b26	(quality) refactored categories sorting + fix ts issues	2022-09-07 17:30:21 +02:00
vincent	0bb4f47b99	(feat) Add actions dropdown	2022-09-07 17:14:06 +02:00
vincent	3f08d831b9	(merge) branch 'product_store-inte'	2022-09-07 15:54:29 +02:00
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
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	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
vincent	29993b0ec9	Cleanup files	2022-08-23 18:55:49 +02:00