150 Commits

Author	SHA1	Message	Date
Sylvain	76c1412177	Merge branch 'wallet_avoir' into dev	2016-12-13 15:33:56 +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	4c8b661750	display coupon application result in inline message instead of growl notification	2016-11-30 10:17:05 +01:00
Sylvain	b75cbc17d7	fix training reservation calendar witch shows all trainings slots	2016-11-29 15:48:39 +01:00
Sylvain	82fa5416ce	fix creation of prices with float values	2016-11-29 15:23:36 +01:00
Peng DU	f487133825	fix bug: user cant debit his wallet when admin pay a plan for this user with invoice disabled	2016-11-29 11:39:41 +01:00
Sylvain	ff11694e05	check cash coupons does not exceed cart amount for events	2016-11-24 15:01:35 +01:00
Sylvain	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	8419efc7f5	handle unconfigured twitter's keys	2016-11-24 09:38:42 +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
Sylvain	52ad1b2c13	fix trainings, users, events graphs	2016-11-21 11:45:48 +01:00
Sylvain	da71ba783c	[bug] exports for events reservation always have seats=1 (fixes #54)	2016-11-09 15:01:58 +01:00
Peng DU	ba5e5752a4	allow add more picture for project step	2016-11-02 14:58:06 +01:00
Sylvain	34ad1c9056	move RSS code into separate folders	2016-09-29 10:53:20 +02: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	e48bb88f1f	use slug in traning show url	2016-09-27 16:00:22 +02:00
Sylvain	36524d4cd9	display list of allowed extensions in project's CAD attachments	2016-09-27 14:08:04 +02:00
Sylvain	a1fd69f309	auth provider safe destroy	2016-09-26 12:41:59 +02:00
Peng DU	972a5e0a89	fix bug: admin cant pay a plan with code promo by wallet	2016-09-22 18:04:13 +02:00
Sylvain	6401b321ef	[feature] display fab-manager's version, when logged as admin	2016-09-22 16:46:14 +02:00
Peng DU	270b279ffb	user can use a code promo for pay le plan by wallet and carte visa	2016-09-21 16:19:04 +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	627073f2be	[SSO] updated user's documentation	2016-09-12 17:29:44 +02:00
Sylvain	d233297469	check coupon code server side + integration test for wrong copon	2016-09-08 15:19:12 +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	ea671d03a4	database structure for custom aggregations in statistics	2016-09-05 17:16:23 +02:00
Sylvain	ea73b9a88b	fix create event without custom price + fix test fixtures	2016-08-30 14:48:22 +02:00
Sylvain	06d65c785a	reserve event with custom prices	2016-08-29 15:43:47 +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	05b010b83f	fix ability to edit custom prices	2016-08-25 14:13:30 +02:00
Sylvain	7dc359e4ee	associate custom price categories to an event	2016-08-25 13:16:47 +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	b166d6abc6	renamed FlowWorkers to more consistant name (Processors)	2016-08-17 15:43:13 +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	ba559d87fb	use coupon in plan subscription	2016-08-11 18:17:28 +02:00
Sylvain	0c3a2a7832	fix events categories	2016-08-11 11:07:49 +02:00
Sylvain	6a87467f7c	rebase coupon usage on code instead of id (more secure)	2016-08-10 15:34:47 +02:00
Sylvain	def5384a38	validation of validity_per_user on coupon usage	2016-08-10 11:08:01 +02:00
Sylvain	a679bc1638	compute price including coupon discount	2016-08-09 16:36:14 +02:00
Sylvain	c23b6fa3e0	fix coupons test	2016-08-08 15:43:02 +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