6433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Du Peng	29a84acf2e	Merge branch 'product_store-payment' into product_store-store	2022-09-06 19:22:22 +02:00
Du Peng	fd97d23208	(feat) set order reference after create order	2022-09-06 19:16:29 +02:00
Du Peng	59d2b8c990	(feat) order reference	2022-09-06 19:12:06 +02:00
Du Peng	e86b143c5e	(quality) refactroing find or create service	2022-09-06 18:17:11 +02:00
Sylvain	b52a59fb42	improved comments	2022-09-06 17:01:20 +02:00
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
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
Du Peng	885db68b51	add coupon component	2022-08-25 20:50:15 +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
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
vincent	ecb7f6d640	(wip) drag and drop	2022-08-23 16:02:13 +02:00
vincent	debe8a6a52	(wip) Style products list and form	2022-08-23 16:02:13 +02:00
vincent	be6ba8deff	Fix button color + standardise class names	2022-08-23 16:02:12 +02:00
vincent	5e61e9c409	Fix save-btn color	2022-08-23 16:02:12 +02:00
vincent	4e65396e7e	(wip) Style product's components	2022-08-23 16:02:11 +02:00
Sylvain	ab6d91fd12	(quality) rename check-list to checklist and added an uncheck all button	2022-08-23 16:02:11 +02:00
vincent	1d5141d073	Temporary broken drag and drop	2022-08-23 16:02:10 +02:00
vincent	81cc8db0f5	Remove react-beautiful-dnd	2022-08-23 16:02:10 +02:00
Du Peng	4f90cb5d80	update edit product comment	2022-08-23 16:02:09 +02:00
Du Peng	e096d95dcc	reset product_category_id to nil if product_category is removed	2022-08-23 16:02:09 +02:00
Du Peng	19e3921dc4	add products relation in product's category	2022-08-23 16:02:08 +02:00
Du Peng	272cbf165c	create/edit product form	2022-08-23 16:02:08 +02:00