523 Commits

Author	SHA1	Message	Date
Sylvain	1e5f7ea1fd	WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead)	2020-11-24 13:26:15 +01:00
Sylvain	b88c1009db	WIP: create react component to collect card data	2020-11-23 17:36:33 +01:00
Sylvain	b5504d2342	create stripe subscription with all data	2020-11-12 16:44:55 +01:00
Sylvain	21bd1312bc	compute payment schedule + basic display	2020-11-03 16:50:11 +01:00
Sylvain	7084e88d2d	display monthly price for compatible plans	2020-11-02 12:29:08 +01:00
Sylvain	465fe8e913	show link to pdf in component	2020-11-02 11:16:13 +01:00
Sylvain	4f877ab05d	react coponent: plan-card + extracted scss from stylesheet.rb into themes/	2020-10-29 15:53:29 +01:00
Sylvain	5f93e6d3be	plan creation: set if it allows monthly payments	2020-10-27 13:06:37 +01:00
Sylvain	9187132682	fix placeholder logo in notification mailer	2020-10-20 10:18:27 +02:00
Sylvain	c30e096e53	fix loading ui-tour with webpack	2020-10-07 10:25:27 +02:00
Sylvain	4f5f54a66a	moved locales files into the main application pack	2020-10-05 17:42:49 +02:00
Sylvain	6fa9347c75	fix training reservation calendar	2020-10-05 12:54:37 +02:00
Sylvain	d701260fae	fix spaces reservation calendar	2020-10-05 12:12:22 +02:00
Sylvain	5a0185dd48	fix machine reservation calendar	2020-09-30 16:32:01 +02:00
Sylvain	ad2ca33c6f	export Application (shimming)	2020-09-16 15:38:07 +02:00
Sylvain	0cf1b535cd	updated summernote	2020-09-15 17:01:47 +02:00
Sylvain	39682e24e4	fix locales with webpack	2020-09-15 15:00:05 +02:00
Sylvain	b760c10414	fix sass for webpack	2020-09-15 12:57:54 +02:00
Sylvain	6e5713438f	remove useless references to asset_pack_path or equivalents	2020-09-09 15:28:35 +02:00
Sylvain	cd1abb15e8	enable splitchunk	2020-09-09 08:51:53 +02:00
Sylvain	e37e368e90	updated links to html assets to use webpacker	2020-09-09 08:45:48 +02:00
Sylvain	9ee8b3a6ef	migrate from asset pipeline to webpacker ... - migrated images - ongoing stylesheets migration	2020-09-08 16:53:45 +02:00
Sylvain	190e815f73	[bug] unable to export subscriptions	2020-07-22 12:33:35 +02:00
Sylvain	e5cef6e6bf	[bug] unable to export reservations	2020-07-21 17:25:19 +02:00
Sylvain	cce70d33a9	fix GA host configuration + updated doc about default_host	2020-06-29 16:53:13 +02:00
Sylvain	1a6cd356bf	WIP: using postgres for full-text search in projects	2020-06-22 16:28:05 +02:00
Sylvain	40dd39304e	enable/disable statistics module fomr the UI	2020-06-17 12:20:51 +02:00
Sylvain	5e8aeb928c	fix refactoring issue in /api/open_api_clients	2020-06-15 17:07:28 +02:00
Sylvain	42872ab107	configure wallet from UI	2020-06-15 12:44:43 +02:00
Sylvain	f46c78a476	read email_confirmation_required from the UI	2020-06-15 11:57:13 +02:00
Sylvain	4b8504f531	fix tests	2020-06-10 11:52:54 +02:00
Sylvain	dbda82ac9b	notify after members sync on stripe	2020-06-09 15:06:46 +02:00
Sylvain	06b5da9df8	configure online payment from the UI	2020-06-08 17:42:59 +02:00
Sylvain	b44a8da73b	set openlab_default from the UI	2020-06-08 16:15:44 +02:00
Sylvain	f78eb10c75	use openlab_app_secret from db w/ openlab_ruby gem	2020-06-08 15:17:56 +02:00
Sylvain	88f2fb3749	secure the settings API (read) + read the openlab settings from the db	2020-06-08 15:08:07 +02:00
Sylvain	2082f1e11c	fix avatar refresh on update	2020-06-03 10:21:13 +02:00
Sylvain	45013be950	configure default_host & default_protocol from env ... reverts 478a6c40 (partially) & b2434864	2020-06-02 18:29:24 +02:00
Sylvain	075b642cc8	remove useless & broken item_url(...) methods	2020-06-02 11:37:24 +02:00
Sylvain	9a0f36c245	configure disqus_shortname from the UI	2020-06-01 18:31:43 +02:00
Sylvain	478a6c409d	define default_protocol & default_host from the UI + fix email_from + various minor fixes	2020-06-01 17:32:32 +02:00
Sylvain	434c211ccf	configure the features tour display mode from the UI	2020-05-27 18:49:53 +02:00
Sylvain	0d211e2e31	configure google recaptcha from UI	2020-05-27 16:35:30 +02:00
Sylvain	c3846e7080	configure twitter analytics from the UI	2020-05-27 15:39:39 +02:00
Sylvain	628a0f3bc3	configure facebook_app_id from the UI	2020-05-27 12:29:51 +02:00
Sylvain	2d628d8826	disable the invoicing module from the UI config panel	2020-05-26 18:07:07 +02:00
Sylvain	537743a740	configure the plans module from the admin UI	2020-05-26 15:39:28 +02:00
Sylvain	6cc6bba7ce	refactored app to gather spaces module status from the settings	2020-05-26 13:59:40 +02:00
Sylvain	acefc325f6	configure events_in_calendar form the UI panel	2020-05-25 17:36:53 +02:00
Sylvain	3135abcee6	retrieve phone_required directly from the api	2020-05-25 16:02:40 +02:00
Sylvain	ed287884de	retrieve book_overlapping_slots directly from the api	2020-05-25 15:28:06 +02:00
Sylvain	54d9b348e0	retrieve slot_duration directly from the api, in the front-end	2020-05-25 15:16:40 +02:00
Sylvain	ba4c39ca99	use slot duration from the db setting	2020-05-25 12:55:01 +02:00
Sylvain	ddce7f516a	configuration of book concurrent slots through the settings interface	2020-05-25 12:55:00 +02:00
Sylvain	419605e551	configuration of google analytics tracking ID through the settings interface	2020-05-25 12:55:00 +02:00
Sylvain	701d18d501	Improved display of the icons alerting about an outdated version	2020-05-25 12:54:58 +02:00
Sylvain	13bcd9a1f8	use phoneRequired from settings instead of env	2020-05-25 12:54:19 +02:00
Sylvain	f80eb230ca	refactored code to use Setting.get	2020-05-25 12:54:19 +02:00
Sylvain	fdc2f60ff5	[bug] when a new account is created through the sign-up modal, the role is not reported in the StatisticProfile (#196) ... Also: if a member was deleted the /api/members/mapping will raise an error	2020-05-18 16:23:53 +02:00
Sylvain	22e936dda5	refactored notification_mailer for possible bug ... undefined method _t for Class:0x...	2020-05-12 20:30:30 +02:00
Sylvain	7ec7fd0d0d	fix notify_user_role_update	2020-05-05 11:59:52 +02:00
Sylvain	2d8df2c1cd	Ability to promote a user to a higher role (member > manager > admin)	2020-05-05 11:28:04 +02:00
Sylvain	3319e68526	Auto-adjusts text colors based on the selected theme colors	2020-05-04 13:20:57 +02:00
Sylvain	29e7ac2f08	[bug] background image of the profile is not shown and wrong menu hover color	2020-05-04 12:10:13 +02:00
Sylvain	881cc97e8d	The invoices list displays the operator in case of offline payment	2020-05-04 10:56:27 +02:00
Sylvain	69c8d7c678	manager can change existing reservations	2020-04-27 12:58:55 +02:00
Sylvain	5312c13d3f	[manager] manage agenda + book machines for himself&others	2020-04-27 12:12:29 +02:00
Sylvain	e1a8646e5f	inteface to add/remove/edit managers	2020-04-22 10:09:16 +02:00
Sylvain	f88472eeb3	Interface to manage partners	2020-04-21 16:47:35 +02:00
Sylvain	ff75a96ecc	Ability to define, per availability, a custom duration for the reservation slots	2020-04-15 18:08:02 +02:00
Sylvain	44e726bc54	[bug] in-context translation is loading invalid locale for MessageFormat	2020-04-07 14:39:31 +02:00
Sylvain	0b81f957ef	fix testing assets with rails 5	2020-04-01 12:51:46 +02:00
Sylvain	34a59eabe6	upgrade to new assets pipeline api	2020-03-31 17:36:00 +02:00
Sylvain	3d34fd7261	Removed MESSAGEFORMAT_LOCALE as it is now handled by make-plural	2020-03-25 12:35:09 +01:00
Sylvain	2bbce711d9	fix stylesheet view	2020-03-25 12:35:08 +01:00
Sylvain	9069139bc4	fix accounting archive generation	2020-03-25 12:35:08 +01:00
Sylvain	a44bf85014	Merge branch 'slot_is_only_subscriptions' into dev	2020-03-02 16:27:26 +01:00
Sylvain	07b21f5094	Merge branch 'book_slot_at_same_time' into dev	2020-03-02 15:52:05 +01:00
Sylvain	11ccaa73b6	Merge remote-tracking branch 'origin/disable_wallet_option' into dev	2020-03-02 15:47:14 +01:00
Sylvain	f1928c0d4c	refactor the home tour to start after the render	2020-03-02 11:40:00 +01:00
Sylvain	5186d6b22c	behavior of FEATURE_TOUR_DISPLAY	2020-03-02 11:17:28 +01:00
Sylvain	1a7d7258d8	[bug] in some cases, bogus admin notification on profile completed	2020-03-02 10:20:10 +01:00
Sylvain	4e72cd16a1	harmonized Fab-manager typo	2020-03-02 08:59:43 +01:00
Sylvain	d833f6d812	harmonize Fab-manager trademark syntax	2020-02-26 10:19:43 +01:00
Sylvain	4db219b204	[ongoing] FEATURE_TOUR_DISPLAY	2020-02-25 18:02:41 +01:00
Sylvain	9589efa312	fix scroll issues on tours	2020-02-25 10:11:18 +01:00
Sylvain	16ed2fa73a	isolate welcome tour	2020-02-18 17:39:47 +01:00
Sylvain	5b46edd748	welcome tour + save completed tours in database	2020-02-18 17:36:45 +01:00
Du Peng	908275d171	add disable wallet option	2020-02-12 18:15:44 +01:00
Sylvain	fd471be40a	angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message	2020-02-12 17:18:11 +01:00
Du Peng	b559d10b87	improve slot is only subscription	2020-02-12 12:58:17 +01:00
Sylvain	71290420bb	ui-tour 3 steps	2020-02-11 15:49:43 +01:00
Sylvain	528877bc76	poc features-tour	2020-02-11 15:49:43 +01:00
Du Peng	760109de05	fix bug: cant reserve formation slot	2020-02-11 13:21:25 +01:00
Du Peng	74cc69d1bd	Ability to configure reservation slot restrict for plans	2020-02-07 17:37:00 +01:00
Du Peng	7c86adde4b	Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time	2020-02-05 16:53:47 +01:00
Sylvain	656a603d6c	customize home page css	2020-01-27 17:10:29 +01:00
Sylvain	19502c8231	fix display version on home page	2020-01-14 17:39:13 +01:00
Sylvain	1f3d9cf88d	display upgrade infos directly on the interface	2020-01-14 17:12:36 +01:00
Sylvain	3c3e806a29	Merge branch 'user-confirmation' into dev	2020-01-07 10:34:25 +01:00
Sylvain	b6ee4e92a4	change falsy value + updated changelog	2020-01-07 10:34:12 +01:00
Nicolas Florentin	0b899fe183	Merge branch 'dev' into user-confirmation	2019-12-30 09:36:43 +01:00
Sylvain	3412d9e35c	fix checking enable_in_context_translation	2019-12-23 13:49:46 +01:00
Sylvain	f05547e46e	change ach pluralization location	2019-12-23 11:29:02 +01:00
Sylvain	40e8b60a0a	add ach pluralization fonction for messageFormat	2019-12-23 10:28:12 +01:00
Nicolas Florentin	518511ab3b	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2019-12-19 12:06:54 +01:00
Nicolas Florentin	7ea3e5ce32	fix translation key path app.public.projects_list.the_fablab_projects	2019-12-19 12:06:45 +01:00
Sylvain	bcd0e6833d	integrate crowdin in-context translation code	2019-12-18 16:50:16 +01:00
Nicolas Florentin	0a3a6d034a	env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in	2019-12-18 16:02:47 +01:00
Sylvain	6aa3c0caeb	Notify all admins on the creation of a refund invoice	2019-12-09 11:55:31 +01:00
Sylvain	60755a2c2a	Merge remote-tracking branch 'origin/fix-time-now' into dev	2019-12-03 15:51:22 +01:00
Sylvain	5215d0643d	Merge branch 'ics' of git.sleede.com:projets/fab-manager into ics	2019-12-03 09:56:37 +01:00
Sylvain	cca6b14f58	import events asyncronously from icalendar	2019-12-02 15:53:24 +01:00
Nicolas Florentin	77cf8c8218	replaces almost all Time.now by DateTime.current	2019-12-02 11:57:25 +01:00
Sylvain	f72ae98109	do not show title if calendar is configured to hide them	2019-11-27 17:50:38 +01:00
Sylvain	85d17d62f3	fix events endpoint	2019-11-27 17:44:01 +01:00
Sylvain	97d93cd622	added a name to imported calendar	2019-11-27 17:39:19 +01:00
Sylvain	baf8cfb487	iCalendar server api & db model	2019-11-27 17:05:19 +01:00
Sylvain	a9b1eabb2c	[poc] show google agenda events in the public calendar	2019-11-27 13:51:23 +01:00
Sylvain	91008b3df1	improved calendar legend	2019-11-27 11:52:37 +01:00
Sylvain	eb3c78a61d	[poc] show google agenda events in the public calendar	2019-11-26 13:44:43 +01:00
Sylvain	68b17cbe9a	Ability to show the scheduled events in the admin calendar	2019-11-25 14:49:39 +01:00
Sylvain	1182822d8b	show correct seats nb in canceled reservation	2019-11-25 10:45:54 +01:00
Sylvain	ce366beaa2	display that an event reservation was canceled ... also: fixed transtions files	2019-11-21 11:15:05 +01:00
Sylvain	ad928bd4e6	ability to set phone number optional or required ... also: show stars on required fields in new admin form	2019-11-19 11:44:32 +01:00
Sylvain	9ec736e6b5	delete recursive slots	2019-11-18 17:29:51 +01:00
Sylvain	cdc30e0da2	configure the slots duration with an environment variable	2019-10-29 16:52:52 +01:00
Sylvain	1ed3eba129	[feature] export last connection date to members.xlsx	2019-10-29 11:09:17 +01:00
Sylvain	d7aed3fa1f	Improved notification email to the member when a rolling subscription is taken	2019-10-23 11:43:42 +02:00
Sylvain	58821555fe	Ability to set the default view in project gallery: openLab or local	2019-10-22 14:42:45 +02:00
Sylvain	927479733b	migrated links to /users/auth from GET to POST ... see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info	2019-10-02 14:37:47 +02:00
Sylvain	35b069a4db	added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST	2019-10-01 17:14:16 +02:00
Sylvain	0d3cc0fe40	[feature] Ability to disable invoices generation and interfaces	2019-09-30 15:29:20 +02:00
Sylvain	ff5de97c92	import new users from CSV and view results in app ... TODO: - update users though CSV	2019-09-26 17:05:57 +02:00
Sylvain	4deaf1f75a	[ongoing] import members from csv	2019-09-25 16:37:42 +02:00
Sylvain	e7bb41f38d	[ongoing] import users from csv file: admin inteface	2019-09-24 12:21:19 +02:00
Sylvain	588010ac0b	[feature] Optional reCaptcha checkbox in sign-up form	2019-09-23 17:46:46 +02:00
Sylvain	1fa36d4029	renamed avoir_mode to payment_method	2019-09-17 14:48:06 +02:00
Sylvain	aef4cc49f2	fixes accounting codes setting + improved error handling	2019-09-17 13:00:25 +02:00
Sylvain	02d28e0b8c	improved accounting codes settings page (1 click saves all) + improved export file name	2019-09-16 14:39:47 +02:00
Sylvain	224b0d6dee	Merge branch 'sca' into dev	2019-09-12 12:53:56 +02:00
Sylvain	539eb08b89	ability to disable the online payments through an env var	2019-09-11 17:08:00 +02:00
Sylvain	4d0ac9b3ca	using stp_payment_intent_id instead of stp_invoice_id on new invoices	2019-09-10 16:45:45 +02:00
Sylvain	967f539ad9	[ongoing] update to stripe-js:v3 to use strong customer authentication	2019-09-04 17:20:18 +02:00
Sylvain	bebb3354fb	[bug] (#140) VAT rate is erronous in invoices	2019-08-14 10:56:30 +02:00
Sylvain	92d79bc9c7	[bug] (#140) VAT rate is erronous in invoices	2019-08-14 10:54:23 +02:00
Sylvain	fa6a54a422	export notifications	2019-07-31 12:37:31 +02:00
Sylvain	a7f68b59dd	connect the export modal to the api	2019-07-31 12:00:52 +02:00
Sylvain	3d3be70e29	[bug] newly generated refund is displayed as broken	2019-07-29 12:25:46 +02:00
Sylvain	a778b1063a	enhance ruby syntax	2019-07-29 12:17:57 +02:00