6576 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Du Peng	8c75b5fdd4	(bug) product stock status and quantity min to cart	2022-09-16 16:50:05 +02:00
Du Peng	6fc0b935d9	(bug) change product stock movement type	2022-09-16 12:08:07 +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	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
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
Du Peng	dff0cb26be	(bug) product pagination in store	2022-09-09 17:14:22 +02:00
Du Peng	9bfeaf3ef3	Merge branch 'product-store-invoice' into product-store	2022-09-09 16:37:33 +02:00
Du Peng	185589407f	(feat) order invoice	2022-09-09 16:35:49 +02:00
vincent	a1c6757cc3	(quality) Increase products per page count	2022-09-09 14:00:53 +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
Du Peng	2840c93823	(bug) fix invoice reference	2022-09-09 10:43:44 +02:00
Du Peng	50276f5b41	(feat) VAT for store's product and Accounting code/label	2022-09-09 09:31:00 +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	334f365c2c	(feat) change store cart back url	2022-09-08 16:46:26 +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
Du Peng	85720c31fa	(feat) order items order by created date	2022-09-08 12:13:34 +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
Du Peng	6d2239bc15	(fix) cant pay order with coupon	2022-09-07 17:24:14 +02:00