77 Commits

Author	SHA1	Message	Date
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
Sylvain	d1a9a69d14	[bug taiga#20] group change not propagated	2016-04-12 10:10:16 +02:00
Sylvain	563266f160	[bug taiga#20] group change not propagated (partial fix)	2016-04-11 19:26:40 +02:00
Sylvain	4b6f3c5ea7	[bug taiga#22] display problem in stats for gender=woman	2016-04-11 18:47:16 +02:00
Sylvain	f9628b4989	prevent subscription creation/modification if card_token is invalid	2016-04-11 18:37:15 +02:00
Sylvain	fb2aee7cc5	[bug] fix VAT row and HT total row on invoices	2016-04-11 17:17:33 +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
Nicolas Florentin	b46ee9177c	adds comments to service UsersCredits::Manager	2016-04-08 11:26:31 +02:00
Nicolas Florentin	d104403af0	little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine	2016-04-08 11:17:52 +02:00
Nicolas Florentin	c78e010888	refacto method generate_invoice_items using UsersCredits::Manager service	2016-04-08 11:12:03 +02:00
Nicolas Florentin	d22574dae4	UsersCredits::Manager is more strict about arguments that have to be passed	2016-04-08 11:11:42 +02:00
Nicolas Florentin	aee8146040	users_credits/manager service: initializing service, you can pass a plan to simulate that user have that plan	2016-04-08 10:33:50 +02:00
Nicolas Florentin	7649e953e4	refacto subscription extension with first training using a service	2016-04-07 17:57:48 +02:00
Nicolas Florentin	8c3f2d2862	implements a service to handle subscription extension after reservation, comes with tests	2016-04-07 17:55:36 +02:00
Nicolas Florentin	7748d601f8	uses users_credits/manager service in models reservation and subscription, and adds integration tests	2016-04-07 16:02:09 +02:00
Nicolas Florentin	02b56ed6a7	users_credits/manager service, handle the case if user does not have a plan	2016-04-07 16:01:31 +02:00
Nicolas Florentin	2ab8d04a68	adds comment to model invoice_item	2016-04-07 16:00:12 +02:00
Nicolas Florentin	6004dd409c	Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests	2016-04-07 12:57:15 +02:00
Nicolas Florentin	823b4c5e1d	updates users_credits module and manager and adds tests	2016-04-07 12:57:08 +02:00
Sylvain	b72609c072	test and validation from plan group	2016-04-07 12:28:25 +02:00
Nicolas Florentin	28fcd121b4	renames service of users credits manager	2016-04-06 18:26:02 +02:00
Nicolas Florentin	752f40a951	Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests	2016-04-06 18:24:51 +02:00
Nicolas Florentin	44fcb2e089	draft a service to handle users credits	2016-04-06 18:24:26 +02:00
Nicolas Florentin	f12646aaf9	adds integration tests for reservation	2016-04-06 18:23:32 +02:00
Sylvain	6027fb5f38	Merge branch 'hotfix' into tests	2016-04-06 17:47:10 +02:00
Sylvain	929e756b10	[bug] fix incorrect VAT rate on invoices	2016-04-06 17:46:24 +02:00
Sylvain	150e58d47f	test invalid abuse	2016-04-06 14:58:53 +02:00
Sylvain	773e87ecd4	abuses test	2016-04-06 14:45:39 +02:00
Nicolas Florentin	3e112c13eb	removes model and migrations relative to old model machines_pricings	2016-04-05 10:52:29 +02:00
Nicolas Florentin	5d38f1e3a5	does not validate length of availability if start_at or end_at are blank and already missing	2016-04-05 09:57:09 +02:00
Nicolas Florentin	fafec2153c	setup test environment and add the first test	2016-04-04 17:42:45 +02:00
Sylvain	66a37dc692	fix french typo	2016-03-31 14:08:33 +02:00
Sylvain	32d5184164	[fix taiga#15] empty workshop attachment not added	2016-03-31 14:02:16 +02:00
Sylvain	9bf6025b53	Revert "ask for user agreement to CGV on signup" ... This reverts commit 2bf5a60ab5.	2016-03-31 13:00:54 +02:00
Sylvain	2587eaf3cc	[feature] link to CGV in about page	2016-03-31 12:59:29 +02:00
Sylvain	2bf5a60ab5	ask for user agreement to CGV on signup	2016-03-31 12:18:07 +02:00
Sylvain	d97c336512	[#16] add email field to reservations export	2016-03-31 11:52:49 +02:00
Sylvain	fe9fea2748	fix typo + remove wrong todo	2016-03-30 17:31:12 +02:00
Sylvain	9a4eff08d0	[bug] invalid link in migration email	2016-03-30 16:48:47 +02:00
Sylvain	232bdbd102	bug fixes ... - [bug] credits not reset on new plan subscription - [bug] admin notification (user merged his account) never sent	2016-03-30 15:37:33 +02:00
Sylvain	d83e44d26f	i18n authentication provider type	2016-03-30 10:05:50 +02:00