71 Commits

Author	SHA1	Message	Date
Peng DU	50ba15b5bf	fix bug: dont update wallet amount if invoice disable, cant update wallet amount when user only subscribe subscription	2016-07-21 16:32:56 +02:00
Peng DU	f2010e752d	show pay by wallet in invoice	2016-07-21 16:32:56 +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	38fafb7a70	wallet credit amount can be a float	2016-07-21 16:32:55 +02:00
Peng DU	2dbc026db1	pay subscription by wallet	2016-07-21 16:32:55 +02:00
Peng DU	31d5c6d3b3	pay totalement/partialement reservation by wallet	2016-07-21 16:32:54 +02:00
Peng DU	fc7eaaab94	add notification and alert when user wallet credit	2016-07-21 16:32:54 +02:00
Peng DU	1dab903054	refactoring wallet amount to concern	2016-07-21 16:32:54 +02:00
Peng DU	9116e8c04a	wallet transaction type must be credit/debit	2016-07-21 16:32:54 +02:00
Peng DU	b22bae1d8f	wallet amount convert auto to float	2016-07-21 16:32:54 +02:00
Peng DU	cac9e16c17	cant debit/credit a negative	2016-07-21 16:32:53 +02:00
Peng DU	363fd73bc4	add model WalletTransaction	2016-07-21 16:32:53 +02:00
Peng DU	db8a6e8a32	application can show user wallet	2016-07-21 16:32:53 +02:00
Peng DU	70d623f65a	filter calendar by machine/formation/event or disponible	2016-07-14 18:36:52 +02:00
Peng DU	49ee5011c1	show availability with reservation state	2016-07-14 12:20:02 +02:00
Peng DU	e9c1584968	availability public api	2016-07-14 12:20:02 +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	e930e04ed6	add age&theme filters to statistics	2016-06-30 12:48: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	812d7a3c05	server-side protection against last category deletion	2016-06-30 09:57:40 +02:00
Sylvain	eb7ee6300e	remove associations with events on filter deletion	2016-06-29 17:26:41 +02:00
Sylvain	cbbd697d38	age_range & theme for event model	2016-06-28 15:56:37 +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	702e35650f	event cache	2016-06-24 18:26:11 +02:00
Peng DU	60f504c660	event categoriy is required	2016-06-22 18:56:45 +02:00
Peng DU	4dff74827b	optimise machine/training availabilities query	2016-06-22 12:54:12 +02:00
Sylvain	1a8d2db53c	[feature][UI][profile banner] set default picture	2016-05-18 16:53:10 +02:00
Sylvain	a66b314e7b	[feature] background picture of profile banner customization	2016-05-18 16:15:54 +02:00
Sylvain	0061c3dca6	reorganize profile header zone	2016-05-17 16:41:32 +02:00
Sylvain	93edd6eaa8	[ongoing] UI refactoring of public profile	2016-05-16 18:20:22 +02:00
Nicolas Florentin	7f032526cb	implements open_api various endpoints	2016-05-04 18:17:50 +02:00
Nicolas Florentin	92b3471032	creates models open_api client and calls_count_tracing, adds worker to trace calls count	2016-05-04 11:48:14 +02:00
Nicolas Florentin	1a446bf646	frontend openlab search view, ctrl, services	2016-04-22 18:17:55 +02:00
Nicolas Florentin	5ee27da51e	index updated_at, created_at, published_at datetimes	2016-04-21 18:19:55 +02:00
Nicolas Florentin	ec203a8ef8	adds minimal validation to projects	2016-04-21 17:10:50 +02:00
Nicolas Florentin	f65bb95575	almost finishes synchro with openlab system	2016-04-21 11:42:43 +02:00
Nicolas Florentin	711b18f6cd	initial commit	2016-04-20 18:13:36 +02:00
Nicolas Florentin	ed478f95c7	UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox	2016-04-20 11:24:28 +02:00
Sylvain	d880a8f0f4	fix unable to reserve Event	2016-04-13 18:21:01 +02:00
Sylvain	eb2bc54cec	Merge branch '2-0-rc1' into tests	2016-04-13 14:03:28 +02:00
Sylvain	a0397a2c15	[bug taiga#25] allow event update if changing ng_places	2016-04-13 13:37:05 +02:00
Sylvain	e1567ba7c5	[bug taiga#25] allow event update if removing nb places	2016-04-13 13:05:16 +02:00
Sylvain	11b43afc9a	[bug taiga#25] allow event update if no places nb was set	2016-04-13 12:09:00 +02:00
Sylvain	ef72d07a9e	[bug taiga#21] undefined method[] on notify_admin_profile_complete	2016-04-12 14:18:07 +02:00
Nicolas Florentin	1344e09f96	adds comments to model reservation	2016-04-08 16:59:09 +02:00
Nicolas Florentin	fa64fd7a2e	remove useless method	2016-04-08 16:58:46 +02:00