522 Commits

Author	SHA1	Message	Date
vincent	e4c0c10ef3	(merge) branch 'origin/product-store_filtering'	2022-09-20 17:36:23 +02:00
vincent	0345476b5f	(merge) branch 'origin/product-store'	2022-09-20 15:25:21 +02:00
Sylvain	586dd5f9b5	(quality) extract filter in separate components	2022-09-20 09:24:35 +02:00
vincent	b7e128a63c	(feat) Add filters	2022-09-20 09:24:04 +02:00
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
vincent	ffafb223f1	(merge) branch 'origin/product-store'	2022-09-16 14:13:29 +02:00
vincent	9a10c992c2	(feat) Add filters	2022-09-16 11:54:58 +02:00
Du Peng	010718d53e	(merge) store manage the orders by admin	2022-09-16 11:45:58 +02:00
Du Peng	b87355bc5a	(feat) orders filter by admin	2022-09-14 19:54:24 +02:00
Sylvain	c4baf89c54	(merge) Merge branch 'product-store_stocks' into product-store	2022-09-14 15:15:47 +02:00
Sylvain	feabded2a0	(feat) update the stock total	2022-09-13 15:01:55 +02:00
Sylvain	f705f71c4f	(feat) display/remove ongoing stocks operations	2022-09-12 15:55:41 +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
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
vincent	23488284e8	(quality) Create state label component	2022-09-07 15:35:46 +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	29993b0ec9	Cleanup files	2022-08-23 18:55:49 +02:00
vincent	7ca3955c1d	Filter and sort products	2022-08-13 19:23:56 +02:00
vincent	86a40bc096	(wip) Products list filters	2022-08-05 18:38:54 +02:00
vincent	d118d045c6	Style list items	2022-08-04 16:24:52 +02:00
vincent	be90d0720b	Product form style	2022-08-03 18:30:29 +02:00
Du Peng	fc4fd78843	product files and images upload	2022-08-03 10:25:36 +02:00
vincent	5b65fb7a54	Remove react-beautiful-dnd	2022-08-03 10:21:01 +02:00
Du Peng	5e1436eda4	create/edit product form	2022-08-03 10:18:00 +02:00
Du Peng	e23e83000d	products page in front	2022-08-03 10:17:58 +02:00
vincent	588ab696ae	Convert product category form to RHF	2022-08-03 10:16:11 +02:00
vincent	c18c17ee62	(wip) Convert product-category to RFH	2022-08-03 10:16:11 +02:00
Du Peng	432b60ca9a	store product category create/list/update/delete	2022-08-03 10:16:08 +02:00
Sylvain	98b1919de2	Make the username column optionnal (#375)	2022-07-27 09:59:23 +02:00
Sylvain	be5b6af3f1	Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames ... Add username column to the member list	2022-07-27 09:32:45 +02:00
Sylvain	06ee1acea5	(bug) fix slot reservation is considered full	2022-07-19 15:40:28 +02:00
Sylvain	d26e2ae313	(bug) fix various issues due to slots behavior refactoring	2022-07-19 11:32:12 +02:00
Guilherme Chaguri	d63b8d0dfa	Add username column to the member list	2022-07-14 16:11:44 -03:00
Sylvain	6719469e76	(doc) add more description about the members import feature #364	2022-06-29 16:41:58 +02:00
Sylvain	d03a34b894	(bug) unable to update the user profile after toggling the organization switch twice	2022-06-22 17:14:19 +02:00
Sylvain	3d2bdaea10	fix missing translation	2022-06-22 15:45:53 +02:00
Sylvain	b25cfe65c1	fix translations	2022-06-22 15:37:41 +02:00
Sylvain	367c05b058	fix <br> tags	2022-06-22 14:53:39 +02:00
Sylvain	521366f616	add missing translation	2022-06-22 14:46:38 +02:00
Sylvain	3307203a47	typo	2022-06-22 14:27:27 +02:00
Sylvain	89c610514d	fix styling issues + rename proof of identity	2022-06-22 14:18:33 +02:00
Sylvain	7f1cc92c43	linted supporting-documents/*	2022-06-22 13:01:22 +02:00
Sylvain	4d6af2c1c0	(wip) linting supporting-documents (ex proof-of-identify) ... remaining: type-form, type-modal, types-list	2022-06-21 17:49:04 +02:00
Sylvain	18aba05f25	linted profile-custom-fields	2022-06-21 14:10:51 +02:00
Sylvain	c0d5da55ce	linted all code expected profile-custom-fields/* and proof-of-identity/*	2022-06-21 12:10:00 +02:00
Sylvain	4a8d8796a3	(wip) lint for scoped-translation	2022-06-20 18:06:15 +02:00
Du Peng	5f8f6a8e6b	update translates	2022-05-12 15:06:06 +02:00
vincent	a3752f36d5	Fix typo	2022-05-12 11:02:03 +02:00
Sylvain	bdf42f7b5d	Merge remote-tracking branch 'origin/user_validation_required' into dev	2022-05-11 18:39:50 +02:00
Du Peng	01191f467c	add ProofOfIdentityFile max size in frontend	2022-05-11 18:14:52 +02:00
Sylvain	3fd20cd57d	(bug) unable to validate account	2022-05-11 18:06:49 +02:00
Du Peng	c719dccd31	add an alert info for modification of fields of organization	2022-05-11 16:57:44 +02:00
Du Peng	3e34b3c7a7	add user validation required setting, user proof of identity upload and organization custom field	2022-05-11 16:57:44 +02:00
Sylvain	e45872956c	(ui) Option to prevent users from changing their group	2022-05-11 15:45:49 +02:00
Sylvain	ac1d518ddc	(ui) option to disable the machines module	2022-05-11 11:54:00 +02:00
Sylvain	0e8230af48	(ui) use user-profile-form in admin/members/new	2022-05-10 11:18:33 +02:00
Sylvain	302c55755e	(ui) admin edit user: use new user-profile-form component	2022-05-10 10:23:43 +02:00
Sylvain	9b22286327	Merge remote-tracking branch 'origin/socials-refacto' into profile-form	2022-05-04 15:53:22 +02:00
vincent	521229b87b	Add form validation	2022-05-04 14:57:31 +02:00
vincent	4c6942eba4	merge	2022-05-04 13:02:40 +02:00
Sylvain	eaae10a9b4	(ui) automatic field mapping configuration for openid	2022-05-04 12:29:19 +02:00
Sylvain	07578b5826	(ui)(api) configure data mapping for openid	2022-05-04 12:28:48 +02:00
Sylvain	161ef0792e	(gui) auto discover scopes	2022-05-04 12:28:48 +02:00
Sylvain	c85281b29f	(api) automatically configure the openID response_type	2022-05-04 12:28:48 +02:00
Sylvain	6c46e5ec81	(api) automatically configure some openID parameters: redirect_uri, display, response_mode	2022-05-04 12:28:48 +02:00
Sylvain	d7a38b491b	(ui) automatically test for discovery endpoint	2022-05-04 12:28:31 +02:00
Sylvain	5013484104	(ui) add profile edition url for openid	2022-05-04 12:28:31 +02:00
Sylvain	3ff416cf8a	(ui) openid connect configuration interface	2022-05-04 12:28:31 +02:00
Sylvain	674abed1d2	(ui) adjust tooltip aspect ... + (bug) do not ignore clipboard.writeText promise + (i18n) fix typo in translation	2022-05-04 12:28:31 +02:00
Sylvain	f9e5e7f2a8	(ui) display authorization callback url directly in interface	2022-05-04 12:28:29 +02:00
Sylvain	63b03568e4	(i18n) reorganize translations per components	2022-05-04 12:27:48 +02:00
Sylvain	e28c8ab2e9	(front) add is-empty class to the calendar-admin-info side panel if no events are selected	2022-05-04 12:16:38 +02:00
vincent	3f4714861b	Add description to plan category	2022-05-04 11:16:51 +02:00
vincent	cb5dd953ea	Edit and display fab's social networks	2022-05-04 10:25:25 +02:00
Sylvain	0dd6f4bff5	Merge branch 'openid' into v5.4	2022-04-25 15:43:03 +02:00
Sylvain	d72de33670	(ui) automatic field mapping configuration for openid	2022-04-20 15:22:07 +02:00
Sylvain	1960c7139f	(ui)(api) configure data mapping for openid	2022-04-20 14:12:22 +02:00
Sylvain	0f183e7af6	(gui) auto discover scopes	2022-04-20 10:28:14 +02:00
Sylvain	007c97969d	(api) automatically configure the openID response_type	2022-04-19 17:39:42 +02:00
Sylvain	9665368755	(api) automatically configure some openID parameters: redirect_uri, display, response_mode	2022-04-19 16:55:48 +02:00
Sylvain	79bb235eaa	(ui) automatically test for discovery endpoint	2022-04-19 14:57:53 +02:00
Sylvain	658ef20bc8	(ui) add profile edition url for openid	2022-04-13 16:23:13 +02:00
Sylvain	0e35616710	(ui) openid connect configuration interface	2022-04-13 15:50:33 +02:00
Sylvain	c77e6c8a65	(front) add is-empty class to the calendar-admin-info side panel if no events are selected	2022-04-12 17:22:47 +02:00
Du Peng	b277022f6f	Set invoice reference is required	2022-04-12 17:17:39 +02:00
Sylvain	9a0de78da7	(ui) adjust tooltip aspect ... + (bug) do not ignore clipboard.writeText promise + (i18n) fix typo in translation	2022-04-12 16:53:31 +02:00
Sylvain	c3f7249242	(ui) display authorization callback url directly in interface	2022-04-12 16:34:44 +02:00
Sylvain	ecc7565346	(i18n) reorganize translations per components	2022-04-12 13:54:47 +02:00
Du Peng	08b072e33c	Fix a bug: unable to show machine availability slot for admin	2022-04-05 14:21:19 +02:00
vincent	f25fdd4091	merge	2022-04-01 17:48:32 +02:00
Sylvain	2fcda8a0ce	(feature) Prepaid-packs purchases are exported to the accounting CSV file	2022-03-23 13:14:34 +01:00
Sylvain	f4395c88b9	(feat) google analytics V4	2022-03-22 11:27:18 +01:00
vincent	9d7c890f63	Remove gender variable use on locales	2022-03-10 10:01:21 +01:00
vincent	719c1abd63	Add description to plan category	2022-02-03 15:32:02 +01:00
Sylvain	86c595ea30	Merge remote-tracking branch 'origin/fix-extended-prices' into dev	2022-01-17 15:42:21 +01:00
Sylvain	634da414f8	(feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method	2022-01-17 12:38:53 +01:00
vincent	d54068446a	Display hours for extended prices duration	2022-01-11 17:54:38 +01:00
Sylvain	9922812111	Ability to select "bank transfer" as the payment mean for a payment schedule	2022-01-05 15:58:33 +01:00
Sylvain	e1256ec551	Ability to disable public account creation	2022-01-04 15:27:58 +01:00
Sylvain	9e742cd1b6	Ability to create slots in the past	2022-01-04 10:28:43 +01:00
Sylvain	00b9bce587	export collected VAT by rate	2021-12-29 17:00:54 +01:00
Sylvain	16242d2127	frontend invoice configuration page uses multiVAT	2021-12-29 12:08:50 +01:00
Du Peng	6019767a3b	update multi VAT	2021-12-28 13:45:29 +01:00
Sylvain	fe96e01b7f	refactor spaces/extended_prices code architecture to match the FM style guide	2021-12-28 11:25:10 +01:00
vincent	a319bf40b4	Fix typo	2021-12-23 14:36:20 +01:00
Sylvain	b864ba66da	Apply 22 suggestion(s) to 6 file(s)	2021-12-22 14:07:48 +00:00
vincent	c3cbc26a1e	Merge branch 'spaces_multiprices_front' into spaces_multiprices	2021-12-21 17:14:22 +01:00
vincent	bd781a14e9	Add extended price	2021-12-21 17:13:40 +01:00
Sylvain	ffb0f3e19e	ability to limit extended prices to slots in the same day	2021-12-21 16:32:02 +01:00
vincent	d6a4675209	wip	2021-12-21 14:37:38 +01:00
Sylvain	affd96ddb3	fix typo	2021-10-22 16:12:43 +02:00
Sylvain	d009381dab	remove unused translations	2021-10-22 16:03:26 +02:00
Sylvain	4a59f6faed	[bug] invalid text shown when a member confirms a free cart	2021-10-22 15:43:33 +02:00
Sylvain	840c536c75	Ability to configure data sources for preventing booking on overlapping slots	2021-10-22 14:50:02 +02:00
Sylvain	2d61dac9cc	refactored admin takes subscription for a member	2021-10-19 12:24:41 +02:00
Sylvain	336a4b789c	proceed with payment on subscription renewal	2021-10-13 17:39:39 +02:00
Sylvain	6cd91d0291	[WIP] refactor renew subscription modal	2021-10-12 17:29:35 +02:00
Sylvain	17a0baac7e	refactored free subscription extending	2021-10-12 14:07:35 +02:00
Sylvain	70f0e21543	move free extend modal to react	2021-10-11 18:50:53 +02:00
Sylvain	e646eb8cb5	extend subscription UI	2021-10-08 19:14:47 +02:00
Sylvain	94634ed825	remove unused tr key	2021-09-30 11:04:00 +02:00
Du Peng	235fd2e58a	Merge branch 'buy_pack_for_plan_option' into dev	2021-09-21 18:01:54 +02:00
Du Peng	2c78ab9cee	fix bug: book overlapping slot setting labal error	2021-09-21 18:01:47 +02:00
Du Peng	f2dd1bbcd2	add an option Subscription valid for purchase and use of a prepaid pack	2021-09-20 19:43:05 +02:00
Sylvain	e2ba4c6f2b	fix typo	2021-07-01 09:01:54 +02:00
Sylvain	89a911c897	fix translation	2021-07-01 08:49:59 +02:00
Sylvain	b6f3fa399a	fix norwegian locale + updated a translation	2021-06-30 17:24:01 +02:00
Sylvain	19717d1351	use localPaymentModal in cart directive	2021-06-30 16:35:25 +02:00
Sylvain	d43f719038	buy packs using local payment	2021-06-30 15:32:10 +02:00
Sylvain	f56b8eae75	admin can configure renew threshold	2021-06-29 09:07:11 +02:00
Sylvain	26f98f30f6	edit pack modal	2021-06-25 09:56:39 +02:00
Sylvain	0345d22582	delete & disable packs	2021-06-24 17:59:05 +02:00
Sylvain	1f8fd47317	pack creation and listing	2021-06-23 17:00:15 +02:00
Sylvain	f81e0910c2	packs popover	2021-06-23 11:33:42 +02:00
Sylvain	d7ba83f6a0	WIP: migrate machine pricing edition interface to react	2021-06-22 11:13:44 +02:00
Sylvain	f88e53708d	[bug] invalid link to the user's manual	2021-06-16 14:58:32 +02:00
Sylvain	11579fede4	ability to disable the public agenda	2021-06-15 11:57:43 +02:00
Sylvain	72be638869	[bug] unable to select no category in plan creation/edition after a category selection ... Also: Display the category in the plans list instead of the plan type	2021-06-15 09:22:41 +02:00
Sylvain	7ba2d58f50	update VCR to 6.0.0 ... Also: - updated cassettes - Automated stripe secrets filtering in cassettes - Improved display when no plan-categories exists	2021-06-11 14:29:30 +02:00
Sylvain	034d883889	remove unused translation	2021-06-10 14:28:55 +02:00
Sylvain	854db568bf	Ability to configure the prefix of the payment-schedules' files	2021-06-10 12:04:00 +02:00
Sylvain	a416f8c7ae	transactional bulk update + better error handling while configuring the payment gateway	2021-06-10 10:39:42 +02:00