7965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Sylvain	b74d59014d	Version 5.4.18	2022-09-12 13:02:21 +02:00
Sylvain	5d15934ab3	Merge branch 'dev' of github.com:sleede/fab-manager into dev	2022-09-12 13:00:48 +02:00
Sylvain	2790b07ac7	Merge pull request #398 from sleede/l10n_dev ... New Crowdin updates	2022-09-12 12:59:24 +02:00
Sylvain	36704be01d	(bug) do not verify group change when no initial group	2022-09-12 12:19:31 +02:00
Sylvain	3bf08973fb	(bug) can't complete profile if phone has hyphens or spaces	2022-09-12 11:51:28 +02:00
Sylvain	e3b62df7d4	(bug) admin can't move/cancel event reservation	2022-09-12 09:57:54 +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
vincent	0bb4f47b99	(feat) Add actions dropdown	2022-09-07 17:14:06 +02:00
Du Peng	d98082a2c4	(fix) cart's operator_id has rename to operator_profile_id	2022-09-07 16:57:07 +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
Sylvain	8238fc3661	New translations app.admin.en.yml (Portuguese)	2022-09-07 14:27:21 +02:00
Sylvain	44b5f6bff5	New translations app.admin.en.yml (French)	2022-09-07 14:27:21 +02:00
Sylvain	507420f96c	(i18n) updated translations	2022-09-07 14:02:04 +02:00
Sylvain	9fbd908b56	(dev) Script to download translations from Crowdin	2022-09-07 12:57:02 +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
Du Peng	93be370912	fix confilt	2022-09-06 20:06:01 +02:00