338 Commits

Author	SHA1	Message	Date
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	6aa3c0caeb	Notify all admins on the creation of a refund invoice	2019-12-09 11:55:31 +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
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	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	9ec736e6b5	delete recursive slots	2019-11-18 17:29:51 +01: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	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	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	4d0ac9b3ca	using stp_payment_intent_id instead of stp_invoice_id on new invoices	2019-09-10 16:45:45 +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	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
Sylvain	0714878bca	[bug] unable to generate a refund	2019-07-29 12:07:22 +02:00
Sylvain	ddbb492ace	[bug] abuses reports are not notified to admins	2019-06-26 12:55:38 +02:00
Sylvain	d0cd5a90d2	handle deleted users in notifications	2019-06-12 15:49:35 +02:00
Sylvain	ddce997e12	display data collection purpose on each input field + fix notifications on deleted user	2019-06-12 15:34:03 +02:00
Sylvain	a53c6e80e7	move invoice->operator to invoicing_profile + minor fixes to handle user deletion	2019-06-12 12:22:38 +02:00
Sylvain	cfd33c3a52	migrate projects to statistic_profile	2019-06-06 16:34:53 +02:00
Sylvain	fe2a6f7120	migrate trainings to statistic_profile and adjust code	2019-06-06 12:00:21 +02:00
Sylvain	660a8abe8b	fix statistic_profile	2019-06-05 12:24:01 +02:00
Sylvain	17fbd6b465	multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription	2019-06-05 12:11:51 +02:00
Sylvain	4c033614ae	[ongoing] migrate subscriptions & reservations to statistic_profile	2019-06-04 16:50:23 +02:00
Sylvain	52992ac9d5	move gender & birthday to statistic_profile	2019-06-04 13:33:00 +02:00
Sylvain	9ef2f142bd	link HistoryValue to InvoicingProfile + improved invoices tests	2019-06-03 16:51:43 +02:00
Sylvain	7ed97ef35a	link wallet & its transactions to invoicingprofile	2019-06-03 16:00:09 +02:00
Sylvain	6011f27268	finish moving organization & address to invoiving profile: fix create & edit user	2019-06-03 12:06:01 +02:00
Sylvain	a211ad39ff	moving organization & address to invoicingProfile + refactored doc about postgre	2019-05-29 14:28:14 +02:00
Sylvain	142e07f3c9	update code to use invoicingprofile	2019-05-29 12:01:24 +02:00
Sylvain	ffbca98276	[ongoing] fix api to use the invoicing_profile	2019-05-28 16:49:36 +02:00
Sylvain	7bbea22e76	display reports in interface	2019-05-21 11:49:50 +02:00
Sylvain	dd4b6e2cb1	[ongoing] abuses management interface	2019-05-09 18:27:19 +02:00
Sylvain	26b901ebb5	[bug#131] Availabilities export report an erroneous number of reservations for machine availabilities	2019-05-07 12:24:51 +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	7a2fc7c42e	[ongoing] save as draft or publish	2019-04-18 15:57:56 +02:00
Sylvain	43ff06c35d	fixed and improved translations	2019-04-18 11:35:09 +02:00
Sylvain	9f8d24ec4f	paginate list of coupons	2019-04-04 17:28:29 +02:00
Sylvain	c223bd99ea	add loader while archive is not ready	2019-04-04 12:55:21 +02:00
Sylvain	c786ba6edb	notify user about archiving	2019-04-04 11:37:23 +02:00
Sylvain	93ff761e64	[bug] Error :syntax when using quote in event category name	2019-04-02 16:19:23 +02:00
Sylvain	7a317b7e45	[bug] unable to add a file attachment to an event	2019-03-28 11:30:25 +01:00
Sylvain	2ac0336adb	Merge branch 'dev' into host	2019-03-25 16:17:23 +01:00
Sylvain	5cdaa014ef	[security] updated devise + updated rails	2019-03-25 14:57:48 +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	7b0824a4a3	notify admins when no accounting period closed for 1 year	2019-03-18 14:33:30 +01:00
Sylvain	b940ae0327	display complete info set on accounting archives	2019-03-11 16:11:49 +01:00
Sylvain	9854a4b965	prevent memory saturation with periodic checks	2019-02-26 15:18:19 +01:00
Sylvain	cf23fae73c	Merge branch 'dev' into host	2019-02-14 16:35:38 +01:00
Sylvain	7b573dd37f	restored deprecated notification	2019-02-14 13:05:09 +01:00
Sylvain	2ba3890325	display records integrity status	2019-02-12 16:00:36 +01:00
Sylvain	da672ea8b6	Merge branch 'dev' into host	2019-01-21 16:34:06 +01:00
Sylvain	75eaf4d4d0	improved member autocompletion with multiple words + refactored members controller	2019-01-21 15:17:56 +01:00
Sylvain	d2c4773ac9	[bug] unable to delete an admin who has changed a setting	2019-01-16 17:09:27 +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	a1ba272538	Merge branch 'dev' into host	2019-01-14 13:00:24 +01:00
Sylvain	f6e236aeb5	refactored roles methods to match ruby conventions	2019-01-14 12:57:31 +01:00
Sylvain	a2eb10331e	[ongoing] remove invoicing disabled per user	2019-01-10 16:50:54 +01:00
Sylvain	5e8172af35	Merge branch 'dev' into us78	2019-01-09 16:28:36 +01:00
Sylvain	5ab0333176	rubocop invoice & avoir	2019-01-09 16:28:23 +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	f2eaf4e4e1	improved tests and bug fixes	2018-12-11 17:27:25 +01:00
Sylvain	6794b12555	force gawk during elastic upgrade & rubocop	2018-12-03 15:10:04 +01:00
Sylvain	7afe62522f	refactor User.as_json to use jbuilder template	2018-07-04 14:05:44 +02:00
Sylvain	639610dc7a	[bug] unable to display profiles of users whom any reservation is associated with a deleted object	2017-11-13 11:15:33 +01:00
Sylvain	1c8d362f11	ability to disable space	2017-10-11 14:58:38 +02:00
Sylvain	c67360771a	ability to disable machine	2017-10-11 12:10:05 +02:00
Sylvain	4752fce762	disable required training modal for machines associated with disabled trainings	2017-10-10 18:12:07 +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	c5f0501df2	enable/disable group	2017-10-05 16:48:18 +02:00
Sylvain	26d79e5b12	disable a plan	2017-10-04 18:56:39 +02:00
Sylvain	d092a1c5ea	admin can lock and unlock availbilities	2017-09-06 15:01:41 +02:00
Sylvain	dcf55d8351	[bug] invalid notification text when sending amount coupon	2017-08-29 16:10:16 +02:00
Sylvain	295dc3749b	[bug] filename too long on events&prices API + updated axlsx	2017-08-16 12:05:04 +02:00
Sylvain	00d157dc3b	[bug] filename too long error on GET api/groups	2017-07-26 10:15:47 +02:00
Sylvain	3e44d62aac	[bug] filename too long error on GET api/trainings	2017-07-18 10:55:41 +02:00
Peng DU	1d53e3b5b7	fix json template of training reservation	2017-03-28 19:53:48 +02:00
Sylvain	c9d6df13f9	disable space projects	2017-03-01 14:30:53 +01:00
Sylvain	c936b283f7	display spaces status in client calendar	2017-02-28 16:51:56 +01:00
Sylvain	0e94f8c3d4	Redo "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 4cbfbdc4e0.	2017-02-28 13:23:31 +01:00
Sylvain	4cbfbdc4e0	Revert "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 03d922e214.	2017-02-28 12:36:50 +01:00
Sylvain	a0e7e7951f	[ongoing] display spaces in public calendar	2017-02-28 11:59:48 +01:00
Sylvain	847a0ba140	display correct slot status in space reservation calendar	2017-02-27 16:15:27 +01:00
Sylvain	03d922e214	change DB model to allow many_to_many relationship between Slot and Reservation	2017-02-27 13:15:31 +01:00
Sylvain	8e86c4b212	[ongoing] spaces reservation calendar	2017-02-23 17:45:55 +01:00
Sylvain	8ea611882b	fix training reservation	2017-02-23 11:13:25 +01:00
Sylvain	03758d336c	fix move & cancel training reservation + fix display after cancel for machines & training	2017-02-22 17:45:22 +01:00
Sylvain	1959856235	use the cart directive in training reservation	2017-02-22 16:45:13 +01:00
Sylvain	5a41424579	fixed & improved js routing	2017-02-21 15:41:45 +01:00
Sylvain	1855935322	interface to create space availabilities	2017-02-15 11:32:29 +01:00
Sylvain	0adb9e29c6	space edition interface	2017-02-14 13:36:10 +01:00
Sylvain	73a5689140	inteface to display spaces	2017-02-14 12:41:51 +01:00
Sylvain	05d4b7b3c5	spaces api	2017-02-13 16:10:12 +01:00
Sylvain	c479502dd0	[bug] too many unread notifications cause system memory overflow	2017-01-05 15:06:54 +01:00
Sylvain	a7fdc4d741	fix potentital issue with sso + enterprise profile	2016-12-14 15:55:12 +01:00
Sylvain	0a08c4c32d	check cash coupons does not exceed cart amount for subscriptions	2016-11-24 16:38:22 +01:00
Sylvain	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	c13f640e81	remove rails find_by_* helpers	2016-11-23 16:30:19 +01:00
Sylvain	cc06bcab85	fix cash coupon creation on stripe + store amount in centimes	2016-11-23 15:44:59 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Peng DU	9dca65786a	fix project step images height bug	2016-11-03 11:26:01 +01:00
Peng DU	ba5e5752a4	allow add more picture for project step	2016-11-02 14:58:06 +01: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
cyril	a0fef8d046	bug fix: not to force https in env production for root_url helper	2016-09-28 13:58:22 +02:00
Sylvain	60d60fdd65	use slugs in projects URL opened from notifications	2016-09-27 16:58:57 +02:00
Sylvain	e48bb88f1f	use slug in traning show url	2016-09-27 16:00:22 +02:00
Sylvain	bf9ea40648	[feature #40] project images will show in full-size on a click	2016-09-27 11:50:05 +02:00
Peng DU	5d6aa163b5	change groups cache key name	2016-09-20 11:39:49 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	ec0f597067	[sso] display strategy name in providers list	2016-09-13 12:06:25 +02:00
Sylvain	9d599a14e5	display custom aggregations in front statistics	2016-09-06 16:53:04 +02:00
Sylvain	b9411366c2	update nb of free places after moving an event reservation with custom prices	2016-08-30 12:34:36 +02:00
Sylvain	feda4861f2	ability to move reservation with custom fares reservations	2016-08-30 11:27:25 +02:00
Sylvain	f175b4b28e	display custom prices places names in reservation summary after booking an event	2016-08-30 10:17:52 +02:00
Sylvain	8aef50660a	show custom price reservations in admin/events/show reservations	2016-08-29 17:51:11 +02:00
Sylvain	3d1c852576	show custom prices bookings in admin/editMember	2016-08-29 16:54:10 +02:00
Sylvain	af883ea1ec	show custom price tickets booked in event show	2016-08-29 16:28:26 +02:00
Sylvain	4fd31c3e9b	display custom prices in event show	2016-08-25 15:36:52 +02:00
Sylvain	5d91756ace	ability to edit event with custom prices	2016-08-25 13:56:07 +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	cc1d6e4f21	[not tested] send reminder notification every hours for upcoming reservations	2016-08-17 17:39:12 +02:00
Sylvain	428b2db0ea	send a coupon to a user	2016-08-16 18:12:13 +02:00
Sylvain	a63c1830cd	better fix for events categories	2016-08-11 11:33:55 +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	7c434db09a	interface to create new coupons	2016-08-04 18:13:19 +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	ce31c1412b	coupons usages are counted with invoices	2016-08-04 09:45:00 +02:00