67 Commits

Author	SHA1	Message	Date
Sylvain	c2c400107d	improved tag management in cart	2017-02-22 11:23:32 +01:00
Sylvain	ce087ae778	refacto wording to make cart reservableType agnostic	2017-02-22 10:51:07 +01:00
Sylvain	7a21a907a8	offer slot from cart + [ongoing] refacto cart translations	2017-02-22 09:44:15 +01:00
Sylvain	a463ad6a2a	[ongoing] refacto cart translations	2017-02-21 17:45:53 +01:00
Sylvain	42819b18cb	refactor plan form translations mapping	2017-02-14 16:19:10 +01:00
Sylvain	0adb9e29c6	space edition interface	2017-02-14 13:36:10 +01:00
Sylvain	da95e6e0d8	space creation interface	2017-02-14 11:28:07 +01:00
Sylvain	b44089a33d	interface & api to build avoir for a wallet credit	2016-12-12 14:20:26 +01:00
Sylvain	3ce41f0c5c	[to test] send cash coupon to user by mail	2016-11-24 18:17:49 +01:00
Sylvain	ce6877b484	success message when applying cash coupon	2016-11-24 18:05:16 +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	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +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
Sylvain	fc747c55c7	wallet credit confirmation	2016-09-29 13:02:24 +02:00
Sylvain	36524d4cd9	display list of allowed extensions in project's CAD attachments	2016-09-27 14:08:04 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	ee333df53f	improved transformation interface	2016-09-14 18:54:53 +02:00
Sylvain	77626aa674	[SSO] interface for transforming boolean and dates datatypes	2016-09-14 18:52:18 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	9aef331596	add textual indications about empty fields in coupon form	2016-09-01 14:54:24 +02:00
Sylvain	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +02:00
Sylvain	60a8f60be8	display custom prices in events index	2016-08-29 17:33:21 +02:00
Sylvain	8aa5d5e4f5	allow dashes in coupon codes	2016-08-17 09:53:58 +02:00
Sylvain	428b2db0ea	send a coupon to a user	2016-08-16 18:12:13 +02:00
Sylvain	def5384a38	validation of validity_per_user on coupon usage	2016-08-10 11:08:01 +02:00
Sylvain	2f2099b723	fix EN translations	2016-08-09 11:41:40 +02:00
Sylvain	d1c1a614a9	i18n coupon directive	2016-08-09 10:22:01 +02:00
Sylvain	a6ded12ee9	create/delete coupons on stripe + adjust schema to match stripe requirements	2016-08-08 14:42:17 +02:00
Sylvain	13e84f434d	i18n english	2016-08-08 12:14:10 +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	33358c2fb5	ability to edit organization in profile & ablity to link its params from an sso	2016-08-02 15:11:26 +02:00
Sylvain	bd54ad8158	ability to share events on social networks twitter & fb	2016-08-01 16:19:50 +02:00
Sylvain	5cacb1d34a	notify admin when users exports are running	2016-07-28 10:28:43 +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
Peng DU	5d84dcb666	update locale	2016-07-21 16:32:57 +02:00
Peng DU	4f42253d3d	wallet transaction list operation locale	2016-07-21 16:32:55 +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	f26e211acb	update locale	2016-07-14 12:20:03 +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	1529e4b14e	allow active/disactive a training to show in training lists	2016-07-14 12:18:24 +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	68f9324725	Merge branch 'steps' into dev ... Conflicts: app/assets/javascripts/controllers/projects.coffee.erb db/schema.rb	2016-07-13 16:10:18 +02:00
Sylvain	2c8001f38f	Merge branch 'projects' into dev ... Conflicts: app/views/api/members/show.json.jbuilder	2016-07-13 15:57:45 +02:00
Sylvain	e13870555b	ability to link filters to events	2016-06-29 17:05:42 +02:00
Sylvain	bdda4cd7b0	[feature] ability to filter events by category, theme and age	2016-06-29 16:09:27 +02:00