6662 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	6d39e4a6ee	Merge branch 'product_store-payment' into product_store-store	2022-08-29 08:57:21 +02:00
Du Peng	b669316e43	request user login when checkout a cart	2022-08-28 23:31:43 +02:00
Du Peng	631d5889c0	refactoring create cart service	2022-08-28 23:23:58 +02:00
Du Peng	ea535d86b2	add checkout policy	2022-08-27 18:59:59 +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	3a669109b5	order extends to payment document	2022-08-26 15:56:20 +02:00
Du Peng	453954e2b9	save payment gateway object after pay an order	2022-08-26 15:30:51 +02:00
Du Peng	e3dfe4935a	set default value of order_item_id in update_stock	2022-08-26 14:08:20 +02:00
Du Peng	8d52768031	set operator_profile_id after payment	2022-08-26 14:07:18 +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	218a9cbddc	Merge branch 'product_store-payment' into product_store-store	2022-08-26 12:04:45 +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	7c59d44785	add payment method in order after payment	2022-08-26 11:24:42 +02:00
Du Peng	939927fb73	add wallet transaction id to order	2022-08-26 11:19:09 +02:00
Du Peng	8059512f19	add order item id to product stock movement for sold	2022-08-26 11:06:09 +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	8a8ce607b7	check product is valid and in stock before payment	2022-08-25 11:46:14 +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	a49b702bd1	(doc) updated changelog	2022-08-24 17:31:07 +02:00
Sylvain	e98776d51f	Merge branch 'dev' for release 5.4.16	2022-08-24 17:10:10 +02:00
Sylvain	c8110368b7	Version 5.4.16	2022-08-24 17:10:00 +02:00
Sylvain	69e1889462	(bug) allow version/merge commit messages	2022-08-24 17:09:23 +02:00
Sylvain	c9b97c4205	(doc) updated FR user's guide to v5.4	2022-08-24 16:12:48 +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
Sylvain	9674c4cddf	(doc) Minimum RAM required #385	2022-08-24 11:13:41 +02:00
Sylvain	2aeac8b5ed	(doc) Clarified documentation about default values	2022-08-24 11:07:07 +02:00
Sylvain	e5df3ae633	(bug) current env values not shown	2022-08-24 11:05:36 +02:00
Sylvain	19e76d700f	(style) check commit message rules ... enabled rule to check commit prefixing and disabled CapitalizedSubject	2022-08-24 10:53:13 +02:00
Sylvain	cbefb702a5	(Bug) setup cannot chown installation folder	2022-08-24 10:29:11 +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	ec62931a78	fix bug: product amount cannot update	2022-08-23 16:02:16 +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	9561e61f5a	update locale fr	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