162 Commits

Author	SHA1	Message	Date
Sylvain	9aef331596	add textual indications about empty fields in coupon form	2016-09-01 14:54:24 +02:00
Sylvain	670e9371d8	improved machine reservation tag display	2016-09-01 14:34:08 +02:00
Sylvain	434234c235	[Bug] machine slots with tags are not displayed correctly on reservation calendar	2016-09-01 14:31:21 +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	63a9f8bf95	update nummber of free places after event reservation payment	2016-08-30 12:45:35 +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	7de896feb9	display 'pay' button when booking only custom prices tickets	2016-08-30 12:11:51 +02:00
Sylvain	feda4861f2	ability to move reservation with custom fares reservations	2016-08-30 11:27:25 +02:00
Sylvain	8aef50660a	show custom price reservations in admin/events/show reservations	2016-08-29 17:51:11 +02:00
Sylvain	af883ea1ec	show custom price tickets booked in event show	2016-08-29 16:28:26 +02:00
Sylvain	06d65c785a	reserve event with custom prices	2016-08-29 15:43:47 +02:00
Sylvain	12eadb8ceb	interface for booking event custom prices	2016-08-29 11:09:36 +02:00
Sylvain	c6a83e98cb	[ongoing] db architecture for custom prices reservation	2016-08-25 18:41:33 +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	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	8ae3cf25b8	fix display success after admin subscribe plan	2016-08-11 18:30:59 +02:00
Sylvain	ba559d87fb	use coupon in plan subscription	2016-08-11 18:17:28 +02:00
Sylvain	d955f5d3e1	use coupon in event reservation	2016-08-11 12:34:55 +02:00
Sylvain	5af64d1cd0	fix: go to training planning when trying to book not trained machine	2016-08-10 18:07:57 +02:00
Sylvain	e122b99ebb	coupon usage in trainings	2016-08-10 16:53:40 +02:00
Sylvain	6a87467f7c	rebase coupon usage on code instead of id (more secure)	2016-08-10 15:34:47 +02:00
Sylvain	b4e28b94f3	apply coupon in payment modal + fix update user w/o organization	2016-08-09 17:20:38 +02:00
Sylvain	a679bc1638	compute price including coupon discount	2016-08-09 16:36:14 +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	2afd6ade8a	allow user to set his organization on registration	2016-08-02 12:27:45 +02:00
Sylvain	bd54ad8158	ability to share events on social networks twitter & fb	2016-08-01 16:19:50 +02:00
Sylvain	26d5e5e42c	allow social share of projects on twitter & facebook	2016-08-01 15:45:56 +02:00
Sylvain	5f96c9916d	[feature] newsletter : ask conscent + export in xlsx	2016-07-28 12:20:51 +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
Sylvain	3b9d1b398b	Fix i18n for payment dialog	2016-07-25 12:10:10 +02:00
Peng DU	c220678ea5	change some texts in reservation on site	2016-07-21 16:32:58 +02:00