6414 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vincent	874be0bcb6	(wip) user orders dashboard	2022-09-07 09:22:16 +02:00
vincent	3a0248ed98	stock	2022-09-06 12:08:19 +02:00
vincent	f21a68593a	stock (wip)	2022-09-02 18:17:15 +02:00
vincent	a5a45ee1ce	Store settings + update text editor options	2022-09-01 18:02:22 +02:00
vincent	27a3bdc308	Admin orders (tmp)	2022-09-01 16:08:37 +02:00
vincent	539d89cf8e	Fix accordion	2022-08-31 11:15:28 +02:00
vincent	2e696f94fd	(wip) Admin orders list	2022-08-29 19:15:10 +02:00
vincent	78683a31b3	Style cart	2022-08-29 16:32:35 +02:00
vincent	5791e6076d	Merge remote-tracking branch 'origin/product_store-store' into product_store-inte	2022-08-29 10:32:14 +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
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
vincent	29993b0ec9	Cleanup files	2022-08-23 18:55:49 +02:00
vincent	857261ba62	Merge branch 'product_store-store' into product_store-inte	2022-08-22 10:00:09 +02:00
Du Peng	5ec541d854	add checkout controller and refactoring cart controller	2022-08-21 19:08:10 +02:00
Du Peng	73a2e328a5	set operator if admin create cart	2022-08-21 15:34:23 +02:00
Du Peng	396248ed2b	manage cart session when user login or logout	2022-08-20 20:49:51 +02:00
Du Peng	cfd21adb60	cart button	2022-08-20 18:47:15 +02:00
Du Peng	ab800a519f	store cart	2022-08-19 20:03:09 +02:00
Du Peng	16288ae2bd	fablab store page	2022-08-16 19:47:27 +02:00
vincent	605b3ec92c	(wip) drag and drop categories	2022-08-15 14:52:09 +02:00
vincent	5677ef3b6d	Add accordion item component	2022-08-15 14:51:13 +02:00
vincent	7ca3955c1d	Filter and sort products	2022-08-13 19:23:56 +02:00
vincent	ba0a604e40	Merge remote-tracking branch 'origin/product_store' into product_store-inte	2022-08-09 11:45:28 +02:00