7956 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	eebf2bcb43	Merge branch 'product-store_order' into product-store	2022-09-19 19:32:36 +02:00
Du Peng	ded9b4a1e8	(bug) product slug isn't unique	2022-09-19 19:31:43 +02:00
Du Peng	1aa058f3d6	(feat) allow product price = 0	2022-09-19 19:27:11 +02:00
Du Peng	906931f40f	(bug) save double product image when creation of product	2022-09-19 19:09:54 +02:00
Du Peng	b5ffae1fb6	(bug) form input cannot save a float	2022-09-19 19:08:52 +02:00
Du Peng	c424e80f8b	(feat) check order's item amount and quantity min before checkout	2022-09-19 16:51:50 +02:00
Du Peng	e2b6267924	(feat) cannot delete a product if it is used in order	2022-09-19 15:20:42 +02:00
Du Peng	74bf28abec	Merge branch 'product-store_order' into product-store	2022-09-16 19:13:28 +02:00
Du Peng	034b6b478e	(feat) order avoir reference	2022-09-16 19:12:53 +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
Du Peng	8769244a33	(feat) update change order action locale	2022-09-16 17:30:28 +02:00
Du Peng	a67d6264b3	(feat) cancel order can't create product stock movement	2022-09-16 17:19:26 +02:00
Du Peng	be96e42f26	(bug) client can add product to cart with a out of stock quantity	2022-09-16 17:10:13 +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
Du Peng	6fc0b935d9	(bug) change product stock movement type	2022-09-16 12:08:07 +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	850076f79a	(bug) undefined method due to merge conflict ... undefined method `amount_multiplied_by_hundred' for ProductService:Class	2022-09-14 15:19:32 +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	9b3a1c0634	(feat) add cart status color	2022-09-14 09:37:14 +02:00
Du Peng	007f7d55ba	(bug) add product to cart button quantity min error	2022-09-14 09:26:29 +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	b542cbab11	(bug) can't save product's price < 1	2022-09-13 16:56:36 +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	7673c1f814	(feat) sort order lists by created at date	2022-09-13 16:11:27 +02:00
Du Peng	7cb691f6f9	(feat) update order's invoice object	2022-09-13 16:10:17 +02:00
Sylvain	feabded2a0	(feat) update the stock total	2022-09-13 15:01:55 +02:00
Du Peng	ae9f7dcc40	Merge branch 'dev' for release 5.4.19	2022-09-13 14:08:17 +02:00
Du Peng	1d1e839e83	Version 5.4.19	2022-09-13 14:08:16 +02:00
Du Peng	42f7320e63	(feat) show payment info in order	2022-09-13 14:05:31 +02:00
Du Peng	0ee45f8404	(bug) fix comput the wallet amount that dont apply coupon	2022-09-13 12:36:18 +02:00
Peng	d491384326	(bug) fix comput the wallet amount that dont apply coupon	2022-09-13 10:27:46 +00: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	d03cfcc4f1	Merge branch 'dev' for release 5.4.18	2022-09-12 13:02:28 +02:00