356 Commits

Author	SHA1	Message	Date
Sylvain	21c7484396	notify admin about notifications sent	2019-04-25 12:04:16 +02:00
Sylvain	8369e2e78e	fix: restore current policy on dropdown selection	2019-04-25 11:58:42 +02:00
Sylvain	162a56250a	notify users after privacy policy update + hide undefined content	2019-04-25 11:40:26 +02:00
Sylvain	c0c9b2a980	privacy policy: fixed admin view after update + display last update date	2019-04-23 12:58:01 +02:00
Sylvain	d0f0a293f3	save as draft or publish	2019-04-18 16:55:50 +02:00
Sylvain	caf6054e66	convert es6 to es5 in erb file	2019-04-18 16:01:58 +02:00
Sylvain	d9ce766f42	using ruby interpretation for SettingsController	2019-04-18 15:58:45 +02:00
Sylvain	7a2fc7c42e	[ongoing] save as draft or publish	2019-04-18 15:57:56 +02:00
Sylvain	8fae8b104d	admin interface to customize privacy policy page	2019-04-18 12:30:00 +02:00
Sylvain	43ff06c35d	fixed and improved translations	2019-04-18 11:35:09 +02:00
Sylvain	44479b5597	allow filtering coupons list	2019-04-04 18:00:19 +02:00
Sylvain	9f8d24ec4f	paginate list of coupons	2019-04-04 17:28:29 +02:00
Sylvain	79c3cfaa27	prevent the user to close the modal modal while closing a period	2019-04-03 14:31:39 +02:00
Sylvain	722d5d36e7	check server-side that periods match length requirements + explain requirements to user before closing	2019-04-03 13:04:19 +02:00
Sylvain	a50bb63b64	prevent double validation while closing period	2019-03-27 17:37:36 +01:00
Sylvain	fc04886e89	prevent generate refund before first accounting period	2019-03-27 16:46:08 +01:00
Sylvain	be6b82fda1	improved VAT history + updated changelog + added instruction on watermark localisation	2019-03-27 15:50:38 +01:00
Sylvain	8530a6f655	superadmin + fixed free space notification	2019-03-20 16:49:38 +01:00
Sylvain	03c0c0d4fb	close periods at 1 year minus 1 day + fix alert reminder transalation	2019-03-18 14:45:21 +01:00
Sylvain	4f418cc3fb	compute total without taxes + fix close period date pickers + improved archived % number format	2019-03-12 13:36:10 +01:00
Sylvain	4e7a62bc2b	[ongoing] close period for max 1 year + force contiguous periods + fix totals	2019-03-12 09:14:20 +01:00
Sylvain	279a958e46	download accounting period archive through interface	2019-02-25 17:22:54 +01:00
Sylvain	ffe5516d10	prevent closing an accounting period if any checksum error in period	2019-02-12 17:38:44 +01:00
Sylvain	eb69822ce0	Merge branch 'dev' into host	2019-01-14 15:00:55 +01:00
Sylvain	77797db2f1	display VAT rates history	2019-01-14 15:00:33 +01:00
Sylvain	1db5e76bc9	tests on accounting periods + force reload periods when opening periods/avoir modal	2019-01-10 15:12:22 +01:00
Sylvain	2f17d90054	remove button 'generate refund' for invoices within closed periods	2019-01-09 17:07:15 +01:00
Sylvain	9fac706da8	validates accounting periods on creation + prevent refunding on closed periods (client only)	2019-01-08 17:32:45 +01:00
Sylvain	84aa0c75ff	fix date on period closing + improved confirmation msg	2019-01-08 11:58:37 +01:00
Sylvain	ccff40b226	handle dates default values and limits in close period modal	2019-01-08 11:19:07 +01:00
Sylvain	12c25389fa	Merge branch 'dev' into us78	2019-01-08 09:56:22 +01:00
Sylvain	859544565b	[bug] first day of week is ignored in statistics custom filter	2019-01-08 09:38:35 +01:00
Sylvain	d8c8e4f72f	set default dates in close modal pickers	2019-01-07 17:21:32 +01:00
Sylvain	5b13c59496	list existing closings in close period modal	2019-01-07 16:45:31 +01:00
Sylvain	d89f9e9301	close an accounting period from interface to db through api	2019-01-07 15:33:09 +01:00
Sylvain	4af3e19cd0	accounting periods API	2019-01-07 12:47:53 +01:00
Sylvain	0a59dc6b5d	display previous closings in modal	2019-01-07 10:50:10 +01:00
Sylvain	3fda7562d4	Merge branch 'dev' into us78	2019-01-03 17:40:04 +01:00
Sylvain	6637832d00	refactored frontend invoices translations	2019-01-03 17:39:50 +01:00
Sylvain	bd6584f529	code improvement	2019-01-03 16:50:50 +01:00
Sylvain	105bcf6236	[ongoing] interface to close an accounting period	2019-01-03 16:48:52 +01:00
Sylvain	ad3105cbc9	migrate to angular 1.4	2018-11-27 13:57:41 +01:00
Sylvain	2801ab0039	fix controllers imports issues due es6 convertion	2018-11-21 15:29:35 +01:00
Sylvain	f528b2021d	added semicolons	2018-11-21 11:08:53 +01:00
Sylvain	8cd533b5a6	eslint problems autofixes	2018-11-21 10:59:07 +01:00
Sylvain	d250dfa1d3	convert coffeescript comments to valid jsdoc	2018-11-21 09:42:31 +01:00
Sylvain	74b6afd166	fix ERB JS controllers	2018-11-20 12:26:06 +01:00
Sylvain	6352087f70	fix comments in erb files	2018-11-19 16:17:49 +01:00
Sylvain	e7031c90d5	restablished erb files	2018-10-25 17:08:13 +02:00
decaffeinate	5da4bf6317	decaffeinate: Run post-processing cleanups on about.coffee and 95 other files	2018-10-25 16:51:20 +02:00
decaffeinate	2c4dd31869	decaffeinate: Convert about.coffee and 95 other files to JS	2018-10-25 16:50:16 +02:00
decaffeinate	c4a2635cd9	decaffeinate: Rename about.coffee and 95 other files from .coffee to .js	2018-10-25 16:49:04 +02:00
Sylvain	41847d75a2	removed erb suffixes	2018-10-25 13:06:09 +02:00
Sylvain	8d4b354199	[bug] change group button overflow	2018-10-15 16:51:44 +02:00
Sylvain	1e3066f6f4	Ability to parametrize machines order on the booking page	2018-09-18 15:30:54 +02:00
Sylvain	1b33f3c865	display the machine reservation user name to other members	2018-07-24 12:24:51 +02:00
Sylvain	05bd65dfb2	migrate es api: top 10 aggregations	2018-07-12 11:26:13 +02:00
Sylvain	17b7e96b67	[ongoing] fix top 10 aggregation	2018-06-12 12:59:23 +02:00
Sylvain	38551e8ac2	[ongoing] migrate es api: graphs (see FIXME)	2018-06-08 17:22:03 +02:00
Sylvain	f66ca9165e	migrate es api: statistics	2018-06-08 12:27:11 +02:00
Sylvain	697ea87e37	[bug] unable to filter statistics from age 0	2018-06-08 12:06:22 +02:00
Sylvain	e091b81187	fix events pagination	2017-12-13 15:20:51 +01:00
Sylvain	cc94a19ba6	hide disabled spaces in admin pricing area	2017-10-11 15:50:18 +02:00
Sylvain	02a155e7af	prevent create availability for disabled space	2017-10-11 15:23:42 +02:00
Sylvain	02baf9097e	hide disabled machine in admin pricing zone + prevent creating negative credits	2017-10-11 14:48:03 +02:00
Sylvain	ad288628cc	hide disabled trainings in pricing admin zone	2017-10-11 13:09:52 +02:00
Sylvain	0ab01091cd	prevent create availabilities for disabled machines	2017-10-11 13:02:54 +02:00
Sylvain	41eef71ead	fix c/p issue + prevent link disabled training to user	2017-10-11 11:40:21 +02:00
Sylvain	4d7a317315	prevent create new availability with disabled training	2017-10-10 18:17:22 +02:00
Sylvain	4090fe2119	filter trainings list by status	2017-10-10 17:38:01 +02:00
Sylvain	05d9e62dd2	ability to disabled training	2017-10-10 17:16:43 +02:00
Sylvain	189665e53b	[ongoing] prevent disable group with users + [ongoing] hide disabled groups	2017-10-05 17:54:44 +02:00
Sylvain	fb092afc8c	filter enabled/disabled groups	2017-10-05 17:12:22 +02:00
Sylvain	c5f0501df2	enable/disable group	2017-10-05 16:48:18 +02:00
Sylvain	a9cce55855	plan disabling: hide everywhere + filter in admin filter	2017-10-05 15:32:20 +02:00
Sylvain	26d79e5b12	disable a plan	2017-10-04 18:56:39 +02:00
Sylvain	ce0887e2ec	add missing jsdoc	2017-09-25 15:58:45 +02:00
Sylvain	f874748f74	[bug] fix events monitoring pagination	2017-09-25 15:48:21 +02:00
Sylvain	8d92f8492a	removed full-calendar hack, improved remove slot precess	2017-09-18 12:42:45 +02:00
Sylvain	404101ccd4	english and portuguese translations	2017-09-07 10:47:18 +02:00
Sylvain	273ec5317d	disallow locking availabilities if it has any non-cancelled reservations	2017-09-06 18:07:56 +02:00
Sylvain	d092a1c5ea	admin can lock and unlock availbilities	2017-09-06 15:01:41 +02:00
Sylvain	3d4260a3f7	[bug] unable to delete standard group	2017-08-30 14:57:06 +02:00
Sylvain	cf6afb817d	[feature] configuration of max visibility for reservations	2017-08-24 18:34:18 +02:00
Sylvain	7ff46db808	[bug] confirmation message after admin creation	2017-06-13 19:26:32 +02:00
Sylvain	54154b1713	[feature] ability for admins to create users or organizations	2017-05-16 10:23:25 +02:00
Sylvain	2c1b65eab9	Merge branch 'hotfix' into dev	2017-03-15 13:07:28 +01:00
Sylvain	8d5966396d	[bug] editing a plan remove the rolling attribute	2017-03-15 12:50:19 +01:00
Sylvain	796f0a87ae	ability to remove an unused custom price for an event (#61)	2017-03-02 18:36:54 +01:00
Sylvain	504fe49964	export machines availabilities	2017-03-02 12:34:28 +01:00
Sylvain	185084f244	prevent admin from creating space availabilities that are not multiples of 1h	2017-03-01 14:27:01 +01:00
Sylvain	fd2d18bf94	fix message on delete availability error	2017-02-27 10:14:19 +01:00
Sylvain	23b9851218	allow enable/disable spaces -> disabled by default	2017-02-15 15:41:25 +01:00
Sylvain	d463d4dd5a	display spaces in admin calendar	2017-02-15 13:18:03 +01:00
Sylvain	1855935322	interface to create space availabilities	2017-02-15 11:32:29 +01:00
Sylvain	30454c4262	manage space info message + refactor settings translations mapping	2017-02-15 09:48:27 +01:00
Sylvain	36a0eafef3	interface to set credits for spaces	2017-02-14 17:29:52 +01:00
Sylvain	ec4a06a0e4	interface to configure space price per plan + refactored plans interface code	2017-02-14 17:06:42 +01:00
Sylvain	1554cfe65d	refactor plan translations mapping	2017-02-14 16:09:07 +01:00
Sylvain	93bceb5517	define spaces prices for non-subscribers	2017-02-14 15:25:28 +01:00
Sylvain	334201e551	refactor admin pricing translations mapping	2017-02-14 14:58:16 +01:00
Sylvain	8119f54e4c	Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type	2017-01-03 17:07:23 +01:00
Sylvain	76c1412177	Merge branch 'wallet_avoir' into dev	2016-12-13 15:33:56 +01:00
Sylvain	ecbe8a58a2	coupon edition: display internationalized errors	2016-12-13 12:46:00 +01:00
Sylvain	85ee73f0e0	ability to edit coupon expiration	2016-12-13 12:01:54 +01:00
Sylvain	b44089a33d	interface & api to build avoir for a wallet credit	2016-12-12 14:20:26 +01:00
Sylvain	c2f638934e	added info notice about operation's time of admin delete	2016-12-12 11:18:24 +01:00
Sylvain	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	cf11f6afcf	factorize currency symbol into	2016-11-23 14:27:11 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Sylvain	6c9fdaaf83	[bug] fix machine hours stats graph	2016-11-21 11:35:56 +01:00
Sylvain	91f70e2c47	[bug] statistics graphs not working	2016-10-24 09:31:29 +02:00
Sylvain	7d54341d98	Merge remote-tracking branch 'github/master' into dev	2016-10-11 15:37:35 +02:00
Kenneth Lim	18bc37749b	locale: informations --> information ... Not sure if this helps but information does not require an `s`. :) Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>	2016-10-07 17:11:58 +08:00
Sylvain	611652ccb5	[bug] many fixes on admin calendar ... - [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated - [bug] deleting an element have an erronous confirmation message - [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console	2016-10-05 11:06:58 +02:00
Sylvain	785e9a42f8	test fix asset:precompile	2016-09-28 10:52:25 +02:00
Sylvain	9a71dc5ea2	trainings monitoring: open current year/month by default on training selection	2016-09-27 14:56:57 +02:00
Sylvain	1195451863	[bug] embedded video not working in tranings/machines descriptions	2016-09-27 10:45:07 +02:00
Sylvain	3c277428bf	[SSO] field data mapping transformation on data reception	2016-09-15 17:10:41 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	77626aa674	[SSO] interface for transforming boolean and dates datatypes	2016-09-14 18:52:18 +02:00
Sylvain	a0fb6fb683	[sso] show mapping datatype in provider edition	2016-09-14 17:32:11 +02:00
Sylvain	dc4c4b678f	[sso] fix create mapping w/ datatype display	2016-09-14 17:13:07 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	c2533c0590	add custom aggs for machine & trainings stats: available bookings	2016-09-06 17:17:15 +02:00
Sylvain	9d599a14e5	display custom aggregations in front statistics	2016-09-06 16:53:04 +02:00
Sylvain	53dd54b175	working custom aggs w/ result tidy in stats query	2016-09-06 16:32:41 +02:00
Sylvain	1fec50accf	ability to run custom aggregation with query and append result to query	2016-09-06 14:21:52 +02:00
Sylvain	cb42b46790	[Bug] machine name is not shown in plan edition	2016-08-31 17:01:01 +02:00
Sylvain	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +02:00
Sylvain	5d91756ace	ability to edit event with custom prices	2016-08-25 13:56:07 +02:00
Sylvain	7dc359e4ee	associate custom price categories to an event	2016-08-25 13:16:47 +02:00
Sylvain	bca77559ed	ability to delete a price category	2016-08-24 17:09:00 +02:00
Sylvain	77db2b2326	ability to edit price category	2016-08-24 16:52:37 +02:00
Sylvain	500a466371	full ability to create price categories	2016-08-24 16:21:43 +02:00
Sylvain	6c3dfab0a9	API for price categories management	2016-08-24 12:30:48 +02:00
Sylvain	26aed7a1b5	ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message	2016-08-17 12:49:52 +02:00
Sylvain	428b2db0ea	send a coupon to a user	2016-08-16 18:12:13 +02:00
Sylvain	3253290860	[ongoing] send a coupon to a user	2016-08-16 11:33:10 +02:00
Sylvain	e2ea64cf9c	coupon edition + refactored coupon status	2016-08-08 15:21:33 +02:00
Sylvain	a6ded12ee9	create/delete coupons on stripe + adjust schema to match stripe requirements	2016-08-08 14:42:17 +02:00
Sylvain	35b324e108	coupon safe destroy	2016-08-08 12:25:27 +02:00
Sylvain	23320104c5	ability to edit coupons	2016-08-08 12:08:09 +02:00
Sylvain	01b77b3179	fixed delete coupon + fixed coupon status	2016-08-08 10:11:36 +02:00
Sylvain	7c434db09a	interface to create new coupons	2016-08-04 18:13:19 +02:00
Sylvain	ee03f1a79c	admin interface to list coupons	2016-08-04 14:26:07 +02:00
Sylvain	0eaa81b0ba	extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list	2016-08-04 12:08:33 +02:00
Sylvain	5cacb1d34a	notify admin when users exports are running	2016-07-28 10:28:43 +02:00
Sylvain	b3f56cefd4	alert user about ongoing running export	2016-07-27 15:42:29 +02:00
Sylvain	74154cf1f3	Merge branch 'xls' into dev ... Conflicts: CHANGELOG.md app/helpers/application_helper.rb config/locales/en.yml config/locales/fr.yml	2016-07-25 16:56:22 +02:00
Sylvain	32d239f723	[Bug #28] Event type disappear when editing the event	2016-07-25 16:16:25 +02:00
Peng DU	773c1adf4a	edit invoice reference	2016-07-21 16:32:56 +02:00
Peng DU	2c49285740	avoir by wallet	2016-07-21 16:32:56 +02:00
Peng DU	fc7eaaab94	add notification and alert when user wallet credit	2016-07-21 16:32:54 +02:00
Peng DU	d0956bb0aa	show wallet transactions of user	2016-07-21 16:32:54 +02:00
Peng DU	db8a6e8a32	application can show user wallet	2016-07-21 16:32:53 +02:00
Peng DU	79ef7f4188	refactoring show training controller and add a new action avaibilities	2016-07-19 12:16:41 +02:00
Peng DU	fb26a2e358	add public calendar menu, view, controller, routes and refactoring calldendar config	2016-07-14 12:20:02 +02:00
Peng DU	0af0cc7878	update angular-ui-calendar and ajax load availabilites	2016-07-14 12:20:01 +02:00
Sylvain	6839e8db38	Merge branch 'events' into dev ... Conflicts: CHANGELOG.md config/locales/app.shared.en.yml config/locales/app.shared.fr.yml	2016-07-13 18:32:30 +02:00
Sylvain	90142ae3bb	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00
Sylvain	c863975e9c	statistics tables: sort by date	2016-07-13 11:12:16 +02:00
Sylvain	ad19bfbd79	fix custom filter CA=0	2016-07-13 10:19:43 +02:00
Sylvain	d84238b331	statistics: global export to excel	2016-07-12 12:03:38 +02:00
Sylvain	8e968f7813	fix type key transmission	2016-07-07 16:57:23 +02:00
Sylvain	8e8bd3f9eb	full subscriptions export	2016-07-07 15:31:22 +02:00
Sylvain	e8b1c99d2a	Alleluia git add . Downloading xls from front is working	2016-07-06 15:53:09 +02:00
Sylvain	d307f91983	use an hidden form to post export data	2016-07-05 17:23:14 +02:00
Sylvain	b26bbd18ef	API accessing service & conforming server-side access points	2016-07-05 12:21:55 +02:00
Sylvain	38c00391fc	basic UI and API for exporting stats to excel	2016-07-04 17:15:37 +02:00
Sylvain	683bc835df	[bug] statistics: sum of stats does not work	2016-07-04 12:53:56 +02:00
Sylvain	fda619e422	add info message on categories management + fix existing categories slugs	2016-06-30 16:12:24 +02:00
Sylvain	0557cb991f	rake task for correct event statistics mapping in elastic	2016-06-30 14:14:46 +02:00
Sylvain	e36df94f0f	server-side protection against deleting used filters	2016-06-30 11:39:56 +02:00
Sylvain	c8b42f1b7f	add slugs to event filters + add categories into statistics + prevent remove linked elements in front	2016-06-30 11:24:57 +02:00
Sylvain	bb6295c487	prevent from removing the last category	2016-06-30 09:51:06 +02:00
Sylvain	859960ce3e	confirmation on event filter deletion	2016-06-30 09:34:26 +02:00
Sylvain	e13870555b	ability to link filters to events	2016-06-29 17:05:42 +02:00
Sylvain	79b97eb113	[feature] manage event's age range	2016-06-29 11:21:21 +02:00
Sylvain	51cce7bbc3	[feature] manage event themes	2016-06-29 10:38:04 +02:00
Sylvain	9adc219edb	[feature] manage events categories	2016-06-28 17:06:33 +02:00
Sylvain	7d02fa9d9a	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Peng DU	df8dbfae8c	fix conflt of changelog	2016-06-27 12:42:57 +02:00
Peng DU	60f504c660	event categoriy is required	2016-06-22 18:56:45 +02:00
Peng DU	85a40db603	price cache	2016-06-21 16:04:44 +02:00
Peng DU	4d0d3d6af0	optimise load plans json	2016-06-21 14:49:39 +02:00
Sylvain	3e24d328a9	[feature] statistics: username link leads to admin edition	2016-06-21 14:46:00 +02:00
Sylvain	24f963645b	optimize usernames mapping in statistics	2016-06-21 14:39:44 +02:00
Sylvain	4639a15e2f	[feature] paginate statistics	2016-06-21 13:16:42 +02:00
Sylvain	cb3cd8ee11	[ongoing] paginate statistics results	2016-06-20 17:13:39 +02:00
Sylvain	08244d53dc	improve trainings load times ... - do not eager load trainings availabilities in INDEX action if not requsted - in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities	2016-06-15 12:01:09 +02:00
Sylvain	e503d6edd8	optimize trainings API	2016-06-14 15:42:28 +02:00
Sylvain	70ff027792	fix AdminMembersController init	2016-06-01 08:55:54 +02:00
Sylvain	fae013d973	members & invoices lists: display 20 items by default + do not display 'load more' button if all items were initially loaded	2016-05-31 17:01:26 +02:00
Sylvain	3593f293ce	[feature] partial load of invoices list	2016-05-31 10:02:27 +02:00
Sylvain	c8e9c6dae5	[feature] partial load of users list	2016-05-30 15:39:19 +02:00
Sylvain	a66b314e7b	[feature] background picture of profile banner customization	2016-05-18 16:15:54 +02:00
Nicolas Florentin	e7590997fc	rm dead code	2016-05-10 09:32:09 +02:00
Nicolas Florentin	2c70903dfd	admin open_api_client managing	2016-05-09 18:15:04 +02:00